Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123525/?format=api
{ "id": 123525, "url": "https://patches.dpdk.org/api/patches/123525/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230209091710.485512-5-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230209091710.485512-5-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230209091710.485512-5-maxime.coquelin@redhat.com", "date": "2023-02-09T09:16:53", "name": "[04/21] net/virtio: remove port ID info from Rx queue", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "6ec9d6ab0eb6f5370d05bf1512c8d7853c12f7d5", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230209091710.485512-5-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 26913, "url": "https://patches.dpdk.org/api/series/26913/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=26913", "date": "2023-02-09T09:16:49", "name": "Add control queue & MQ support to Virtio-user vDPA", "version": 1, "mbox": "https://patches.dpdk.org/series/26913/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/123525/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/123525/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id B09C441C4D;\n\tThu, 9 Feb 2023 10:17:53 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CD77442D10;\n\tThu, 9 Feb 2023 10:17:28 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by mails.dpdk.org (Postfix) with ESMTP id B95A24067B\n for <dev@dpdk.org>; Thu, 9 Feb 2023 10:17:24 +0100 (CET)", "from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com\n [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-675-pByYLbZ7O_eJcFcmBrqjAQ-1; Thu, 09 Feb 2023 04:17:21 -0500", "from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com\n [10.11.54.9])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id ED6C63815EE0;\n Thu, 9 Feb 2023 09:17:20 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.26])\n by smtp.corp.redhat.com (Postfix) with ESMTP id A1885492B00;\n Thu, 9 Feb 2023 09:17:19 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1675934244;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=1F/o0AoGNpZc0FeHDAygaD/84TT/5gZlozIApPqflyU=;\n b=GKaSZ58hxPT1RoJjPivLmgR1CCLrGdymcbwP1wSQJF6KWaYxLcR1/XNYsBnS2OflwZ+cJo\n cWBPXrzNiaQptQS8x/+ib1CcppuVJSckI4q45RY0mT92XdmFJ/ZRFSTMC/JS9vHrnL7LWF\n Z/0wYICe7RGyCC8TgiOBiMzYFfSGTVU=", "X-MC-Unique": "pByYLbZ7O_eJcFcmBrqjAQ-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com,\n eperezma@redhat.com, stephen@networkplumber.org", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[PATCH 04/21] net/virtio: remove port ID info from Rx queue", "Date": "Thu, 9 Feb 2023 10:16:53 +0100", "Message-Id": "<20230209091710.485512-5-maxime.coquelin@redhat.com>", "In-Reply-To": "<20230209091710.485512-1-maxime.coquelin@redhat.com>", "References": "<20230209091710.485512-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.9", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "The port ID information is duplicated in several places.\nThis patch removes it from the virtnet_rx struct as it can\nbe found in virtio_hw struct.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 1 -\n drivers/net/virtio/virtio_rxtx.c | 25 ++++++++++---------------\n drivers/net/virtio/virtio_rxtx.h | 1 -\n drivers/net/virtio/virtio_rxtx_packed.c | 3 +--\n drivers/net/virtio/virtio_rxtx_simple.c | 3 ++-\n drivers/net/virtio/virtio_rxtx_simple.h | 5 +++--\n 6 files changed, 16 insertions(+), 22 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 057388cfaf..1c10c16ca7 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -462,7 +462,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \n \t\tvq->sw_ring = sw_ring;\n \t\trxvq = &vq->rxq;\n-\t\trxvq->port_id = dev->data->port_id;\n \t\trxvq->mz = mz;\n \t\trxvq->fake_mbuf = fake_mbuf;\n \t} else if (queue_type == VTNET_TQ) {\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex bd95e8ceb5..45c04aa3f8 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -1024,7 +1024,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\tcontinue;\n \t\t}\n \n-\t\trxm->port = rxvq->port_id;\n+\t\trxm->port = hw->port_id;\n \t\trxm->data_off = RTE_PKTMBUF_HEADROOM;\n \t\trxm->ol_flags = 0;\n \t\trxm->vlan_tci = 0;\n@@ -1066,8 +1066,7 @@ virtio_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \t\t\t}\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\n@@ -1127,7 +1126,7 @@ virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\tcontinue;\n \t\t}\n \n-\t\trxm->port = rxvq->port_id;\n+\t\trxm->port = hw->port_id;\n \t\trxm->data_off = RTE_PKTMBUF_HEADROOM;\n \t\trxm->ol_flags = 0;\n \t\trxm->vlan_tci = 0;\n@@ -1169,8 +1168,7 @@ virtio_recv_pkts_packed(void *rx_queue, struct rte_mbuf **rx_pkts,\n \t\t\t}\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\n@@ -1258,7 +1256,7 @@ virtio_recv_pkts_inorder(void *rx_queue,\n \t\trxm->pkt_len = (uint32_t)(len[i] - hdr_size);\n \t\trxm->data_len = (uint16_t)(len[i] - hdr_size);\n \n-\t\trxm->port = rxvq->port_id;\n+\t\trxm->port = hw->port_id;\n \n \t\trx_pkts[nb_rx] = rxm;\n \t\tprev = rxm;\n@@ -1352,8 +1350,7 @@ virtio_recv_pkts_inorder(void *rx_queue,\n \t\t\t}\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\n@@ -1437,7 +1434,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\trxm->pkt_len = (uint32_t)(len[i] - hdr_size);\n \t\trxm->data_len = (uint16_t)(len[i] - hdr_size);\n \n-\t\trxm->port = rxvq->port_id;\n+\t\trxm->port = hw->port_id;\n \n \t\trx_pkts[nb_rx] = rxm;\n \t\tprev = rxm;\n@@ -1530,8 +1527,7 @@ virtio_recv_mergeable_pkts(void *rx_queue,\n \t\t\t}\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\n@@ -1610,7 +1606,7 @@ virtio_recv_mergeable_pkts_packed(void *rx_queue,\n \t\trxm->pkt_len = (uint32_t)(len[i] - hdr_size);\n \t\trxm->data_len = (uint16_t)(len[i] - hdr_size);\n \n-\t\trxm->port = rxvq->port_id;\n+\t\trxm->port = hw->port_id;\n \t\trx_pkts[nb_rx] = rxm;\n \t\tprev = rxm;\n \n@@ -1699,8 +1695,7 @@ virtio_recv_mergeable_pkts_packed(void *rx_queue,\n \t\t\t}\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\ndiff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h\nindex 226c722d64..97de9eb0a3 100644\n--- a/drivers/net/virtio/virtio_rxtx.h\n+++ b/drivers/net/virtio/virtio_rxtx.h\n@@ -24,7 +24,6 @@ struct virtnet_rx {\n \tstruct rte_mempool *mpool; /**< mempool for mbuf allocation */\n \n \tuint16_t queue_id; /**< DPDK queue index. */\n-\tuint16_t port_id; /**< Device port identifier. */\n \n \t/* Statistics */\n \tstruct virtnet_stats stats;\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed.c b/drivers/net/virtio/virtio_rxtx_packed.c\nindex 45cf39df22..5f7d4903bc 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed.c\n+++ b/drivers/net/virtio/virtio_rxtx_packed.c\n@@ -124,8 +124,7 @@ virtio_recv_pkts_packed_vec(void *rx_queue,\n \t\t\t\t\tfree_cnt);\n \t\t\tnb_enqueued += free_cnt;\n \t\t} else {\n-\t\t\tstruct rte_eth_dev *dev =\n-\t\t\t\t&rte_eth_devices[rxvq->port_id];\n+\t\t\tstruct rte_eth_dev *dev = &rte_eth_devices[hw->port_id];\n \t\t\tdev->data->rx_mbuf_alloc_failed += free_cnt;\n \t\t}\n \t}\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.c b/drivers/net/virtio/virtio_rxtx_simple.c\nindex f248869a8f..438256970d 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple.c\n@@ -30,12 +30,13 @@\n int __rte_cold\n virtio_rxq_vec_setup(struct virtnet_rx *rxq)\n {\n+\tstruct virtqueue *vq = virtnet_rxq_to_vq(rxq);\n \tuintptr_t p;\n \tstruct rte_mbuf mb_def = { .buf_addr = 0 }; /* zeroed mbuf */\n \n \tmb_def.nb_segs = 1;\n \tmb_def.data_off = RTE_PKTMBUF_HEADROOM;\n-\tmb_def.port = rxq->port_id;\n+\tmb_def.port = vq->hw->port_id;\n \trte_mbuf_refcnt_set(&mb_def, 1);\n \n \t/* prevent compiler reordering: rearm_data covers previous fields */\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex d8f96e0434..8e235f4dbc 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -32,8 +32,9 @@ virtio_rxq_rearm_vec(struct virtnet_rx *rxvq)\n \tret = rte_mempool_get_bulk(rxvq->mpool, (void **)sw_ring,\n \t\tRTE_VIRTIO_VPMD_RX_REARM_THRESH);\n \tif (unlikely(ret)) {\n-\t\trte_eth_devices[rxvq->port_id].data->rx_mbuf_alloc_failed +=\n-\t\t\tRTE_VIRTIO_VPMD_RX_REARM_THRESH;\n+\t\tstruct rte_eth_dev *dev = &rte_eth_devices[vq->hw->port_id];\n+\n+\t\tdev->data->rx_mbuf_alloc_failed += RTE_VIRTIO_VPMD_RX_REARM_THRESH;\n \t\treturn;\n \t}\n \n", "prefixes": [ "04/21" ] }