Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120368/?format=api
{ "id": 120368, "url": "http://patches.dpdk.org/api/patches/120368/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20221130155639.150553-11-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "http://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": "<20221130155639.150553-11-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221130155639.150553-11-maxime.coquelin@redhat.com", "date": "2022-11-30T15:56:28", "name": "[v1,10/21] net/virtio: alloc Rx SW ring only if vectorized path", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "d925b04efbb15e6e5975c0febf635435e926cd9c", "submitter": { "id": 512, "url": "http://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20221130155639.150553-11-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 25958, "url": "http://patches.dpdk.org/api/series/25958/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=25958", "date": "2022-11-30T15:56:18", "name": "Add control queue & MQ support to Virtio-user vDPA", "version": 1, "mbox": "http://patches.dpdk.org/series/25958/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/120368/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/120368/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 9A5C5A00C2;\n\tWed, 30 Nov 2022 16:58:02 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 92FAB42D43;\n\tWed, 30 Nov 2022 16:57:09 +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 D0F8742D4D\n for <dev@dpdk.org>; Wed, 30 Nov 2022 16:57:07 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) 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-645-DuaMuTNdMUWHd4n4iIDXHw-1; Wed, 30 Nov 2022 10:57:06 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\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 1A64E101A56D;\n Wed, 30 Nov 2022 15:57:03 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.22])\n by smtp.corp.redhat.com (Postfix) with ESMTP id EE6E040C83D9;\n Wed, 30 Nov 2022 15:57:01 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1669823827;\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=/gJPDWlQCViJUoL/W5Xgk1gvMo2EfFgckJRoxSjRf2s=;\n b=LuCkeXCUyredeb7fTnb86ovqEey85Yww/owABSsI8LltalpZgJn5bJdPP0tmS6kYwCCpr3\n 1ivKVFqJH28T+dkomoLWDjaPrtsd0zOKIHtse7UqsiAd61Vp1ExVd3NQZmEnfg+g8oX/PY\n tAu0aoWQaUnD13C2KwqdREiQv4ieO0s=", "X-MC-Unique": "DuaMuTNdMUWHd4n4iIDXHw-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com,\n eperezma@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[PATCH v1 10/21] net/virtio: alloc Rx SW ring only if vectorized path", "Date": "Wed, 30 Nov 2022 16:56:28 +0100", "Message-Id": "<20221130155639.150553-11-maxime.coquelin@redhat.com>", "In-Reply-To": "<20221130155639.150553-1-maxime.coquelin@redhat.com>", "References": "<20221130155639.150553-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.1", "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": "This patch only allocates the SW ring when vectorized\ndatapath is used. It also moves the SW ring and fake mbuf\nin the virtnet_rx struct since this is Rx-only.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 88 ++++++++++++-------\n drivers/net/virtio/virtio_rxtx.c | 8 +-\n drivers/net/virtio/virtio_rxtx.h | 4 +-\n drivers/net/virtio/virtio_rxtx_simple.h | 2 +-\n .../net/virtio/virtio_rxtx_simple_altivec.c | 4 +-\n drivers/net/virtio/virtio_rxtx_simple_neon.c | 4 +-\n drivers/net/virtio/virtio_rxtx_simple_sse.c | 4 +-\n drivers/net/virtio/virtqueue.c | 6 +-\n drivers/net/virtio/virtqueue.h | 1 -\n 9 files changed, 72 insertions(+), 49 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 8b17b450ec..46dd5606f6 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -339,6 +339,47 @@ virtio_free_queue_headers(struct virtqueue *vq)\n \t*hdr_mem = 0;\n }\n \n+static int\n+virtio_rxq_sw_ring_alloc(struct virtqueue *vq, int numa_node)\n+{\n+\tvoid *sw_ring;\n+\tstruct rte_mbuf *mbuf;\n+\tsize_t size;\n+\n+\t/* SW ring is only used with vectorized datapath */\n+\tif (!vq->hw->use_vec_rx)\n+\t\treturn 0;\n+\n+\tsize = (RTE_PMD_VIRTIO_RX_MAX_BURST + vq->vq_nentries) * sizeof(vq->rxq.sw_ring[0]);\n+\n+\tsw_ring = rte_zmalloc_socket(\"sw_ring\", size, RTE_CACHE_LINE_SIZE, numa_node);\n+\tif (!sw_ring) {\n+\t\tPMD_INIT_LOG(ERR, \"can not allocate RX soft ring\");\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tmbuf = rte_zmalloc_socket(\"sw_ring\", sizeof(*mbuf), RTE_CACHE_LINE_SIZE, numa_node);\n+\tif (!mbuf) {\n+\t\tPMD_INIT_LOG(ERR, \"can not allocate fake mbuf\");\n+\t\trte_free(sw_ring);\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tvq->rxq.sw_ring = sw_ring;\n+\tvq->rxq.fake_mbuf = mbuf;\n+\n+\treturn 0;\n+}\n+\n+static void\n+virtio_rxq_sw_ring_free(struct virtqueue *vq)\n+{\n+\trte_free(vq->rxq.fake_mbuf);\n+\tvq->rxq.fake_mbuf = NULL;\n+\trte_free(vq->rxq.sw_ring);\n+\tvq->rxq.sw_ring = NULL;\n+}\n+\n static int\n virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n {\n@@ -346,14 +387,11 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \tconst struct rte_memzone *mz = NULL;\n \tunsigned int vq_size, size;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n-\tstruct virtnet_rx *rxvq = NULL;\n \tstruct virtnet_ctl *cvq = NULL;\n \tstruct virtqueue *vq;\n-\tvoid *sw_ring = NULL;\n \tint queue_type = virtio_get_queue_type(hw, queue_idx);\n \tint ret;\n \tint numa_node = dev->device->numa_node;\n-\tstruct rte_mbuf *fake_mbuf = NULL;\n \n \tPMD_INIT_LOG(INFO, \"setting up queue: %u on NUMA node %d\",\n \t\t\tqueue_idx, numa_node);\n@@ -441,28 +479,9 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t}\n \n \tif (queue_type == VTNET_RQ) {\n-\t\tsize_t sz_sw = (RTE_PMD_VIRTIO_RX_MAX_BURST + vq_size) *\n-\t\t\t sizeof(vq->sw_ring[0]);\n-\n-\t\tsw_ring = rte_zmalloc_socket(\"sw_ring\", sz_sw,\n-\t\t\t\tRTE_CACHE_LINE_SIZE, numa_node);\n-\t\tif (!sw_ring) {\n-\t\t\tPMD_INIT_LOG(ERR, \"can not allocate RX soft ring\");\n-\t\t\tret = -ENOMEM;\n+\t\tret = virtio_rxq_sw_ring_alloc(vq, numa_node);\n+\t\tif (ret)\n \t\t\tgoto free_hdr_mz;\n-\t\t}\n-\n-\t\tfake_mbuf = rte_zmalloc_socket(\"sw_ring\", sizeof(*fake_mbuf),\n-\t\t\t\tRTE_CACHE_LINE_SIZE, numa_node);\n-\t\tif (!fake_mbuf) {\n-\t\t\tPMD_INIT_LOG(ERR, \"can not allocate fake mbuf\");\n-\t\t\tret = -ENOMEM;\n-\t\t\tgoto free_sw_ring;\n-\t\t}\n-\n-\t\tvq->sw_ring = sw_ring;\n-\t\trxvq = &vq->rxq;\n-\t\trxvq->fake_mbuf = fake_mbuf;\n \t} else if (queue_type == VTNET_TQ) {\n \t\tvirtqueue_txq_indirect_headers_init(vq);\n \t} else if (queue_type == VTNET_CQ) {\n@@ -486,9 +505,8 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \n clean_vq:\n \thw->cvq = NULL;\n-\trte_free(fake_mbuf);\n-free_sw_ring:\n-\trte_free(sw_ring);\n+\tif (queue_type == VTNET_RQ)\n+\t\tvirtio_rxq_sw_ring_free(vq);\n free_hdr_mz:\n \tvirtio_free_queue_headers(vq);\n free_mz:\n@@ -519,7 +537,7 @@ virtio_free_queues(struct virtio_hw *hw)\n \t\tqueue_type = virtio_get_queue_type(hw, i);\n \t\tif (queue_type == VTNET_RQ) {\n \t\t\trte_free(vq->rxq.fake_mbuf);\n-\t\t\trte_free(vq->sw_ring);\n+\t\t\trte_free(vq->rxq.sw_ring);\n \t\t}\n \n \t\tvirtio_free_queue_headers(vq);\n@@ -2195,6 +2213,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \n \trte_spinlock_init(&hw->state_lock);\n \n+\tif (vectorized) {\n+\t\thw->use_vec_rx = 1;\n+\t\thw->use_vec_tx = 1;\n+\t}\n+\n \t/* reset device and negotiate default features */\n \tret = virtio_init_device(eth_dev, VIRTIO_PMD_DEFAULT_GUEST_FEATURES);\n \tif (ret < 0)\n@@ -2202,12 +2225,11 @@ eth_virtio_dev_init(struct rte_eth_dev *eth_dev)\n \n \tif (vectorized) {\n \t\tif (!virtio_with_packed_queue(hw)) {\n-\t\t\thw->use_vec_rx = 1;\n+\t\t\thw->use_vec_tx = 0;\n \t\t} else {\n-#if defined(CC_AVX512_SUPPORT) || defined(RTE_ARCH_ARM)\n-\t\t\thw->use_vec_rx = 1;\n-\t\t\thw->use_vec_tx = 1;\n-#else\n+#if !defined(CC_AVX512_SUPPORT) && !defined(RTE_ARCH_ARM)\n+\t\t\thw->use_vec_rx = 0;\n+\t\t\thw->use_vec_tx = 0;\n \t\t\tPMD_DRV_LOG(INFO,\n \t\t\t\t\"building environment do not support packed ring vectorized\");\n #endif\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 4f69b97f41..2d0afd3302 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -737,9 +737,11 @@ virtio_dev_rx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\tvirtio_rxq_vec_setup(rxvq);\n \t}\n \n-\tmemset(rxvq->fake_mbuf, 0, sizeof(*rxvq->fake_mbuf));\n-\tfor (desc_idx = 0; desc_idx < RTE_PMD_VIRTIO_RX_MAX_BURST; desc_idx++)\n-\t\tvq->sw_ring[vq->vq_nentries + desc_idx] = rxvq->fake_mbuf;\n+\tif (hw->use_vec_rx) {\n+\t\tmemset(rxvq->fake_mbuf, 0, sizeof(*rxvq->fake_mbuf));\n+\t\tfor (desc_idx = 0; desc_idx < RTE_PMD_VIRTIO_RX_MAX_BURST; desc_idx++)\n+\t\t\tvq->rxq.sw_ring[vq->vq_nentries + desc_idx] = rxvq->fake_mbuf;\n+\t}\n \n \tif (hw->use_vec_rx && !virtio_with_packed_queue(hw)) {\n \t\twhile (vq->vq_free_cnt >= RTE_VIRTIO_VPMD_RX_REARM_THRESH) {\ndiff --git a/drivers/net/virtio/virtio_rxtx.h b/drivers/net/virtio/virtio_rxtx.h\nindex 57af630110..afc4b74534 100644\n--- a/drivers/net/virtio/virtio_rxtx.h\n+++ b/drivers/net/virtio/virtio_rxtx.h\n@@ -18,8 +18,8 @@ struct virtnet_stats {\n };\n \n struct virtnet_rx {\n-\t/* dummy mbuf, for wraparound when processing RX ring. */\n-\tstruct rte_mbuf *fake_mbuf;\n+\tstruct rte_mbuf **sw_ring; /**< RX software ring. */\n+\tstruct rte_mbuf *fake_mbuf; /**< dummy mbuf, for wraparound when processing RX ring. */\n \tuint64_t mbuf_initializer; /**< value to init mbufs. */\n \tstruct rte_mempool *mpool; /**< mempool for mbuf allocation */\n \ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex 8e235f4dbc..79196ed86e 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -26,7 +26,7 @@ virtio_rxq_rearm_vec(struct virtnet_rx *rxvq)\n \tstruct virtqueue *vq = virtnet_rxq_to_vq(rxvq);\n \n \tdesc_idx = vq->vq_avail_idx & (vq->vq_nentries - 1);\n-\tsw_ring = &vq->sw_ring[desc_idx];\n+\tsw_ring = &vq->rxq.sw_ring[desc_idx];\n \tstart_dp = &vq->vq_split.ring.desc[desc_idx];\n \n \tret = rte_mempool_get_bulk(rxvq->mpool, (void **)sw_ring,\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_altivec.c b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\nindex e7f0ed6068..7910efc153 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_altivec.c\n@@ -103,8 +103,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n \n \tdesc_idx = (uint16_t)(vq->vq_used_cons_idx & (vq->vq_nentries - 1));\n \trused = &vq->vq_split.ring.used->ring[desc_idx];\n-\tsw_ring = &vq->sw_ring[desc_idx];\n-\tsw_ring_end = &vq->sw_ring[vq->vq_nentries];\n+\tsw_ring = &vq->rxq.sw_ring[desc_idx];\n+\tsw_ring_end = &vq->rxq.sw_ring[vq->vq_nentries];\n \n \trte_prefetch0(rused);\n \ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_neon.c b/drivers/net/virtio/virtio_rxtx_simple_neon.c\nindex 7fd92d1b0c..ffaa139bd6 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_neon.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_neon.c\n@@ -101,8 +101,8 @@ virtio_recv_pkts_vec(void *rx_queue,\n \n \tdesc_idx = (uint16_t)(vq->vq_used_cons_idx & (vq->vq_nentries - 1));\n \trused = &vq->vq_split.ring.used->ring[desc_idx];\n-\tsw_ring = &vq->sw_ring[desc_idx];\n-\tsw_ring_end = &vq->sw_ring[vq->vq_nentries];\n+\tsw_ring = &vq->rxq.sw_ring[desc_idx];\n+\tsw_ring_end = &vq->rxq.sw_ring[vq->vq_nentries];\n \n \trte_prefetch_non_temporal(rused);\n \ndiff --git a/drivers/net/virtio/virtio_rxtx_simple_sse.c b/drivers/net/virtio/virtio_rxtx_simple_sse.c\nindex 7577f5e86d..ed608fbf2e 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple_sse.c\n+++ b/drivers/net/virtio/virtio_rxtx_simple_sse.c\n@@ -101,8 +101,8 @@ virtio_recv_pkts_vec(void *rx_queue, struct rte_mbuf **rx_pkts,\n \n \tdesc_idx = (uint16_t)(vq->vq_used_cons_idx & (vq->vq_nentries - 1));\n \trused = &vq->vq_split.ring.used->ring[desc_idx];\n-\tsw_ring = &vq->sw_ring[desc_idx];\n-\tsw_ring_end = &vq->sw_ring[vq->vq_nentries];\n+\tsw_ring = &vq->rxq.sw_ring[desc_idx];\n+\tsw_ring_end = &vq->rxq.sw_ring[vq->vq_nentries];\n \n \trte_prefetch0(rused);\n \ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex fb651a4ca3..7a84796513 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -38,9 +38,9 @@ virtqueue_detach_unused(struct virtqueue *vq)\n \t\t\t\tcontinue;\n \t\t\tif (start > end && (idx >= start || idx < end))\n \t\t\t\tcontinue;\n-\t\t\tcookie = vq->sw_ring[idx];\n+\t\t\tcookie = vq->rxq.sw_ring[idx];\n \t\t\tif (cookie != NULL) {\n-\t\t\t\tvq->sw_ring[idx] = NULL;\n+\t\t\t\tvq->rxq.sw_ring[idx] = NULL;\n \t\t\t\treturn cookie;\n \t\t\t}\n \t\t} else {\n@@ -100,7 +100,7 @@ virtqueue_rxvq_flush_split(struct virtqueue *vq)\n \t\tuep = &vq->vq_split.ring.used->ring[used_idx];\n \t\tif (hw->use_vec_rx) {\n \t\t\tdesc_idx = used_idx;\n-\t\t\trte_pktmbuf_free(vq->sw_ring[desc_idx]);\n+\t\t\trte_pktmbuf_free(vq->rxq.sw_ring[desc_idx]);\n \t\t\tvq->vq_free_cnt++;\n \t\t} else if (hw->use_inorder_rx) {\n \t\t\tdesc_idx = (uint16_t)uep->id;\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex d453c3ec26..d7f8ee79bb 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -206,7 +206,6 @@ struct virtqueue {\n \t * or virtual address for virtio_user. */\n \n \tuint16_t *notify_addr;\n-\tstruct rte_mbuf **sw_ring; /**< RX software ring. */\n \tstruct vq_desc_extra vq_descx[];\n };\n \n", "prefixes": [ "v1", "10/21" ] }