Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/94689/?format=api
{ "id": 94689, "url": "https://patches.dpdk.org/api/patches/94689/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210623150014.1015484-2-wenwux.ma@intel.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": "<20210623150014.1015484-2-wenwux.ma@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210623150014.1015484-2-wenwux.ma@intel.com", "date": "2021-06-23T15:00:11", "name": "[v3,1/4] examples/vhost: refactor vhost enqueue and dequeue datapaths.", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "107574a1d09cf35bceafe4a675d9ff061fc8a0b3", "submitter": { "id": 2163, "url": "https://patches.dpdk.org/api/people/2163/?format=api", "name": "Ma, WenwuX", "email": "wenwux.ma@intel.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/20210623150014.1015484-2-wenwux.ma@intel.com/mbox/", "series": [ { "id": 17447, "url": "https://patches.dpdk.org/api/series/17447/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=17447", "date": "2021-06-23T15:00:10", "name": "vhost: support async dequeue for split ring", "version": 3, "mbox": "https://patches.dpdk.org/series/17447/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/94689/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/94689/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 F1D0EA0C41;\n\tWed, 23 Jun 2021 05:07:13 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id A725D4069C;\n\tWed, 23 Jun 2021 05:07:12 +0200 (CEST)", "from mga06.intel.com (mga06.intel.com [134.134.136.31])\n by mails.dpdk.org (Postfix) with ESMTP id B9DEE4003E\n for <dev@dpdk.org>; Wed, 23 Jun 2021 05:07:06 +0200 (CEST)", "from orsmga001.jf.intel.com ([10.7.209.18])\n by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Jun 2021 20:07:04 -0700", "from unknown (HELO localhost.localdomain) ([10.240.183.109])\n by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 22 Jun 2021 20:07:02 -0700" ], "IronPort-SDR": [ "\n DGA6SHAecLquuG7QeWhl14D5lpcc0sDTpUXYON4fjZcbMg2p+UHMStiaS+4kh+A6EAfW7vGAUp\n W/8+ZxsdzpxA==", "\n bRDminYpEKshItlVO65h2HBLH2wuhJrPQrKYh4n6Lbf/ioInxNs4Daeqplvrun6uQGJATSAmMx\n 2sXwYd5Pib4A==" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10023\"; a=\"268322036\"", "E=Sophos;i=\"5.83,293,1616482800\"; d=\"scan'208\";a=\"268322036\"", "E=Sophos;i=\"5.83,293,1616482800\"; d=\"scan'208\";a=\"487141331\"" ], "From": "Wenwu Ma <wenwux.ma@intel.com>", "To": "dev@dpdk.org", "Cc": "maxime.coquelin@redhat.com, chenbo.xia@intel.com, cheng1.jiang@intel.com,\n Wenwu Ma <wenwux.ma@intel.com>", "Date": "Wed, 23 Jun 2021 15:00:11 +0000", "Message-Id": "<20210623150014.1015484-2-wenwux.ma@intel.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20210623150014.1015484-1-wenwux.ma@intel.com>", "References": "<20210602083110.5530-1-yuanx.wang@intel.com>\n <20210623150014.1015484-1-wenwux.ma@intel.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v3 1/4] examples/vhost: refactor vhost enqueue\n and dequeue datapaths.", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Previously, by judging the flag, we call different enqueue/dequeue\nfunctions in data path.\n\nNow, we use an ops that was initialized when Vhost was created,\nso that we can call ops directly in Vhost data path without any more\nflag judgment.\n\nSigned-off-by: Wenwu Ma <wenwux.ma@intel.com>\n---\n examples/vhost/main.c | 112 ++++++++++++++++++++----------------\n examples/vhost/main.h | 33 +++++++++--\n examples/vhost/virtio_net.c | 16 +++++-\n 3 files changed, 105 insertions(+), 56 deletions(-)", "diff": "diff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex d2179eadb9..aebdc3a566 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -106,6 +106,8 @@ static uint32_t burst_rx_retry_num = BURST_RX_RETRIES;\n static char *socket_files;\n static int nb_sockets;\n \n+static struct vhost_queue_ops vdev_queue_ops[MAX_VHOST_DEVICE];\n+\n /* empty vmdq configuration structure. Filled in programatically */\n static struct rte_eth_conf vmdq_conf_default = {\n \t.rxmode = {\n@@ -885,27 +887,8 @@ drain_vhost(struct vhost_dev *vdev)\n \tuint16_t nr_xmit = vhost_txbuff[buff_idx]->len;\n \tstruct rte_mbuf **m = vhost_txbuff[buff_idx]->m_table;\n \n-\tif (builtin_net_driver) {\n-\t\tret = vs_enqueue_pkts(vdev, VIRTIO_RXQ, m, nr_xmit);\n-\t} else if (async_vhost_driver) {\n-\t\tuint32_t cpu_cpl_nr = 0;\n-\t\tuint16_t enqueue_fail = 0;\n-\t\tstruct rte_mbuf *m_cpu_cpl[nr_xmit];\n-\n-\t\tcomplete_async_pkts(vdev);\n-\t\tret = rte_vhost_submit_enqueue_burst(vdev->vid, VIRTIO_RXQ,\n-\t\t\t\t\tm, nr_xmit, m_cpu_cpl, &cpu_cpl_nr);\n-\n-\t\tif (cpu_cpl_nr)\n-\t\t\tfree_pkts(m_cpu_cpl, cpu_cpl_nr);\n-\n-\t\tenqueue_fail = nr_xmit - ret;\n-\t\tif (enqueue_fail)\n-\t\t\tfree_pkts(&m[ret], nr_xmit - ret);\n-\t} else {\n-\t\tret = rte_vhost_enqueue_burst(vdev->vid, VIRTIO_RXQ,\n-\t\t\t\t\t\tm, nr_xmit);\n-\t}\n+\tret = vdev_queue_ops[vdev->vid].enqueue_pkt_burst(vdev,\n+\t\t\t\t\tVIRTIO_RXQ, m, nr_xmit);\n \n \tif (enable_stats) {\n \t\t__atomic_add_fetch(&vdev->stats.rx_total_atomic, nr_xmit,\n@@ -1184,6 +1167,36 @@ drain_mbuf_table(struct mbuf_table *tx_q)\n \t}\n }\n \n+uint16_t\n+async_enqueue_pkts(struct vhost_dev *vdev, uint16_t queue_id,\n+\t\tstruct rte_mbuf **pkts, uint32_t rx_count)\n+{\n+\tuint16_t enqueue_count;\n+\tuint32_t cpu_cpl_nr = 0;\n+\tuint16_t enqueue_fail = 0;\n+\tstruct rte_mbuf *m_cpu_cpl[MAX_PKT_BURST];\n+\n+\tcomplete_async_pkts(vdev);\n+\tenqueue_count = rte_vhost_submit_enqueue_burst(vdev->vid,\n+\t\t\t\tqueue_id, pkts, rx_count,\n+\t\t\t\tm_cpu_cpl, &cpu_cpl_nr);\n+\tif (cpu_cpl_nr)\n+\t\tfree_pkts(m_cpu_cpl, cpu_cpl_nr);\n+\n+\tenqueue_fail = rx_count - enqueue_count;\n+\tif (enqueue_fail)\n+\t\tfree_pkts(&pkts[enqueue_count], enqueue_fail);\n+\n+\treturn enqueue_count;\n+}\n+\n+uint16_t\n+sync_enqueue_pkts(struct vhost_dev *vdev, uint16_t queue_id,\n+\t\tstruct rte_mbuf **pkts, uint32_t rx_count)\n+{\n+\treturn rte_vhost_enqueue_burst(vdev->vid, queue_id, pkts, rx_count);\n+}\n+\n static __rte_always_inline void\n drain_eth_rx(struct vhost_dev *vdev)\n {\n@@ -1214,29 +1227,8 @@ drain_eth_rx(struct vhost_dev *vdev)\n \t\t}\n \t}\n \n-\tif (builtin_net_driver) {\n-\t\tenqueue_count = vs_enqueue_pkts(vdev, VIRTIO_RXQ,\n-\t\t\t\t\t\tpkts, rx_count);\n-\t} else if (async_vhost_driver) {\n-\t\tuint32_t cpu_cpl_nr = 0;\n-\t\tuint16_t enqueue_fail = 0;\n-\t\tstruct rte_mbuf *m_cpu_cpl[MAX_PKT_BURST];\n-\n-\t\tcomplete_async_pkts(vdev);\n-\t\tenqueue_count = rte_vhost_submit_enqueue_burst(vdev->vid,\n-\t\t\t\t\tVIRTIO_RXQ, pkts, rx_count,\n-\t\t\t\t\tm_cpu_cpl, &cpu_cpl_nr);\n-\t\tif (cpu_cpl_nr)\n-\t\t\tfree_pkts(m_cpu_cpl, cpu_cpl_nr);\n-\n-\t\tenqueue_fail = rx_count - enqueue_count;\n-\t\tif (enqueue_fail)\n-\t\t\tfree_pkts(&pkts[enqueue_count], enqueue_fail);\n-\n-\t} else {\n-\t\tenqueue_count = rte_vhost_enqueue_burst(vdev->vid, VIRTIO_RXQ,\n-\t\t\t\t\t\tpkts, rx_count);\n-\t}\n+\tenqueue_count = vdev_queue_ops[vdev->vid].enqueue_pkt_burst(vdev,\n+\t\t\t\t\t\tVIRTIO_RXQ, pkts, rx_count);\n \n \tif (enable_stats) {\n \t\t__atomic_add_fetch(&vdev->stats.rx_total_atomic, rx_count,\n@@ -1249,6 +1241,14 @@ drain_eth_rx(struct vhost_dev *vdev)\n \t\tfree_pkts(pkts, rx_count);\n }\n \n+uint16_t sync_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mempool *mbuf_pool,\n+\t\t\tstruct rte_mbuf **pkts, uint16_t count)\n+{\n+\treturn rte_vhost_dequeue_burst(dev->vid, queue_id,\n+\t\t\t\t\tmbuf_pool, pkts, count);\n+}\n+\n static __rte_always_inline void\n drain_virtio_tx(struct vhost_dev *vdev)\n {\n@@ -1256,13 +1256,8 @@ drain_virtio_tx(struct vhost_dev *vdev)\n \tuint16_t count;\n \tuint16_t i;\n \n-\tif (builtin_net_driver) {\n-\t\tcount = vs_dequeue_pkts(vdev, VIRTIO_TXQ, mbuf_pool,\n-\t\t\t\t\tpkts, MAX_PKT_BURST);\n-\t} else {\n-\t\tcount = rte_vhost_dequeue_burst(vdev->vid, VIRTIO_TXQ,\n-\t\t\t\t\tmbuf_pool, pkts, MAX_PKT_BURST);\n-\t}\n+\tcount = vdev_queue_ops[vdev->vid].dequeue_pkt_burst(vdev,\n+\t\t\t\tVIRTIO_TXQ, mbuf_pool, pkts, MAX_PKT_BURST);\n \n \t/* setup VMDq for the first packet */\n \tif (unlikely(vdev->ready == DEVICE_MAC_LEARNING) && count) {\n@@ -1436,6 +1431,21 @@ new_device(int vid)\n \t\t}\n \t}\n \n+\tif (builtin_net_driver) {\n+\t\tvdev_queue_ops[vid].enqueue_pkt_burst = builtin_enqueue_pkts;\n+\t\tvdev_queue_ops[vid].dequeue_pkt_burst = builtin_dequeue_pkts;\n+\t} else {\n+\t\tif (async_vhost_driver) {\n+\t\t\tvdev_queue_ops[vid].enqueue_pkt_burst =\n+\t\t\t\t\t\t\tasync_enqueue_pkts;\n+\t\t} else {\n+\t\t\tvdev_queue_ops[vid].enqueue_pkt_burst =\n+\t\t\t\t\t\t\tsync_enqueue_pkts;\n+\t\t}\n+\n+\t\tvdev_queue_ops[vid].dequeue_pkt_burst = sync_dequeue_pkts;\n+\t}\n+\n \tif (builtin_net_driver)\n \t\tvs_vhost_net_setup(vdev);\n \ndiff --git a/examples/vhost/main.h b/examples/vhost/main.h\nindex 0ccdce4b4a..7cd8a11a45 100644\n--- a/examples/vhost/main.h\n+++ b/examples/vhost/main.h\n@@ -60,6 +60,19 @@ struct vhost_dev {\n \tstruct vhost_queue queues[MAX_QUEUE_PAIRS * 2];\n } __rte_cache_aligned;\n \n+typedef uint16_t (*vhost_enqueue_burst_t)(struct vhost_dev *dev,\n+\t\t\tuint16_t queue_id, struct rte_mbuf **pkts,\n+\t\t\tuint32_t count);\n+\n+typedef uint16_t (*vhost_dequeue_burst_t)(struct vhost_dev *dev,\n+\t\t\tuint16_t queue_id, struct rte_mempool *mbuf_pool,\n+\t\t\tstruct rte_mbuf **pkts, uint16_t count);\n+\n+struct vhost_queue_ops {\n+\tvhost_enqueue_burst_t enqueue_pkt_burst;\n+\tvhost_dequeue_burst_t dequeue_pkt_burst;\n+};\n+\n TAILQ_HEAD(vhost_dev_tailq_list, vhost_dev);\n \n \n@@ -84,9 +97,21 @@ struct lcore_info {\n void vs_vhost_net_setup(struct vhost_dev *dev);\n void vs_vhost_net_remove(struct vhost_dev *dev);\n uint16_t vs_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mbuf **pkts, uint32_t count);\n+\n+uint16_t builtin_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mbuf **pkts, uint32_t count);\n+uint16_t builtin_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mempool *mbuf_pool,\n+\t\t\tstruct rte_mbuf **pkts, uint16_t count);\n+uint16_t sync_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n \t\t\t struct rte_mbuf **pkts, uint32_t count);\n-\n-uint16_t vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n-\t\t\t struct rte_mempool *mbuf_pool,\n-\t\t\t struct rte_mbuf **pkts, uint16_t count);\n+uint16_t sync_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mempool *mbuf_pool,\n+\t\t\tstruct rte_mbuf **pkts, uint16_t count);\n+uint16_t async_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\t struct rte_mbuf **pkts, uint32_t count);\n+uint16_t async_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\t\tstruct rte_mempool *mbuf_pool,\n+\t\t\tstruct rte_mbuf **pkts, uint16_t count);\n #endif /* _MAIN_H_ */\ndiff --git a/examples/vhost/virtio_net.c b/examples/vhost/virtio_net.c\nindex 9064fc3a82..2432a96566 100644\n--- a/examples/vhost/virtio_net.c\n+++ b/examples/vhost/virtio_net.c\n@@ -238,6 +238,13 @@ vs_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n \treturn count;\n }\n \n+uint16_t\n+builtin_enqueue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\t\tstruct rte_mbuf **pkts, uint32_t count)\n+{\n+\treturn vs_enqueue_pkts(dev, queue_id, pkts, count);\n+}\n+\n static __rte_always_inline int\n dequeue_pkt(struct vhost_dev *dev, struct rte_vhost_vring *vr,\n \t struct rte_mbuf *m, uint16_t desc_idx,\n@@ -363,7 +370,7 @@ dequeue_pkt(struct vhost_dev *dev, struct rte_vhost_vring *vr,\n \treturn 0;\n }\n \n-uint16_t\n+static uint16_t\n vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n \tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)\n {\n@@ -440,3 +447,10 @@ vs_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n \n \treturn i;\n }\n+\n+uint16_t\n+builtin_dequeue_pkts(struct vhost_dev *dev, uint16_t queue_id,\n+\tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)\n+{\n+\treturn vs_dequeue_pkts(dev, queue_id, mbuf_pool, pkts, count);\n+}\n", "prefixes": [ "v3", "1/4" ] }