Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42079/?format=api
{ "id": 42079, "url": "http://patches.dpdk.org/api/patches/42079/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180702081629.29258-14-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": "<20180702081629.29258-14-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180702081629.29258-14-maxime.coquelin@redhat.com", "date": "2018-07-02T08:16:27", "name": "[v6,13/15] vhost: add Tx support for packed ring", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "130ca719b864cb6f2aa022e6cc953dddd748b572", "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/20180702081629.29258-14-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 348, "url": "http://patches.dpdk.org/api/series/348/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=348", "date": "2018-07-02T08:16:14", "name": "Vhost: add support to packed ring layout", "version": 6, "mbox": "http://patches.dpdk.org/series/348/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42079/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/42079/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id BF50C8E58;\n\tMon, 2 Jul 2018 10:17:26 +0200 (CEST)", "from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73])\n\tby dpdk.org (Postfix) with ESMTP id 374318DAF\n\tfor <dev@dpdk.org>; Mon, 2 Jul 2018 10:17:25 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id D59BD401EF02;\n\tMon, 2 Jul 2018 08:17:24 +0000 (UTC)", "from localhost.localdomain (ovpn-112-41.ams2.redhat.com\n\t[10.36.112.41])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 4C6891C589;\n\tMon, 2 Jul 2018 08:17:21 +0000 (UTC)" ], "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "tiwei.bie@intel.com, zhihong.wang@intel.com, jfreimann@redhat.com,\n\tdev@dpdk.org", "Cc": "mst@redhat.com, jasowang@redhat.com, wexu@redhat.com,\n\tMaxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Mon, 2 Jul 2018 10:16:27 +0200", "Message-Id": "<20180702081629.29258-14-maxime.coquelin@redhat.com>", "In-Reply-To": "<20180702081629.29258-1-maxime.coquelin@redhat.com>", "References": "<20180702081629.29258-1-maxime.coquelin@redhat.com>", "X-Scanned-By": "MIMEDefang 2.79 on 10.11.54.5", "X-Greylist": [ "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.11.55.5]); Mon, 02 Jul 2018 08:17:24 +0000 (UTC)", "inspected by milter-greylist-4.5.16 (mx1.redhat.com\n\t[10.11.55.5]); \n\tMon, 02 Jul 2018 08:17:24 +0000 (UTC) for IP:'10.11.54.5'\n\tDOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com'\n\tHELO:'smtp.corp.redhat.com' FROM:'maxime.coquelin@redhat.com' RCPT:''" ], "Subject": "[dpdk-dev] [PATCH v6 13/15] vhost: add Tx support for packed ring", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/librte_vhost/vhost.h | 1 +\n lib/librte_vhost/virtio_net.c | 121 +++++++++++++++++++++++++++++++++++++++++-\n 2 files changed, 121 insertions(+), 1 deletion(-)", "diff": "diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h\nindex a7320469a..6ea8fb896 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -56,6 +56,7 @@ struct buf_vector {\n struct zcopy_mbuf {\n \tstruct rte_mbuf *mbuf;\n \tuint32_t desc_idx;\n+\tuint16_t desc_count;\n \tuint16_t in_use;\n \n \tTAILQ_ENTRY(zcopy_mbuf) next;\ndiff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c\nindex 2e286e228..03dd38235 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -1445,6 +1445,122 @@ virtio_dev_tx_split(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \treturn i;\n }\n \n+static __rte_always_inline uint16_t\n+virtio_dev_tx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)\n+{\n+\tuint16_t i;\n+\n+\trte_prefetch0(&vq->desc_packed[vq->last_avail_idx]);\n+\n+\tif (unlikely(dev->dequeue_zero_copy)) {\n+\t\tstruct zcopy_mbuf *zmbuf, *next;\n+\t\tint nr_updated = 0;\n+\n+\t\tfor (zmbuf = TAILQ_FIRST(&vq->zmbuf_list);\n+\t\t zmbuf != NULL; zmbuf = next) {\n+\t\t\tnext = TAILQ_NEXT(zmbuf, next);\n+\n+\t\t\tif (mbuf_is_consumed(zmbuf->mbuf)) {\n+\t\t\t\tupdate_shadow_used_ring_packed(vq,\n+\t\t\t\t\t\tzmbuf->desc_idx,\n+\t\t\t\t\t\t0,\n+\t\t\t\t\t\tzmbuf->desc_count);\n+\t\t\t\tnr_updated += 1;\n+\n+\t\t\t\tTAILQ_REMOVE(&vq->zmbuf_list, zmbuf, next);\n+\t\t\t\trestore_mbuf(zmbuf->mbuf);\n+\t\t\t\trte_pktmbuf_free(zmbuf->mbuf);\n+\t\t\t\tput_zmbuf(zmbuf);\n+\t\t\t\tvq->nr_zmbuf -= 1;\n+\t\t\t}\n+\t\t}\n+\n+\t\tflush_shadow_used_ring_packed(dev, vq);\n+\t\tvhost_vring_call(dev, vq);\n+\t}\n+\n+\tVHOST_LOG_DEBUG(VHOST_DATA, \"(%d) %s\\n\", dev->vid, __func__);\n+\n+\tcount = RTE_MIN(count, MAX_PKT_BURST);\n+\tVHOST_LOG_DEBUG(VHOST_DATA, \"(%d) about to dequeue %u buffers\\n\",\n+\t\t\tdev->vid, count);\n+\n+\tfor (i = 0; i < count; i++) {\n+\t\tstruct buf_vector buf_vec[BUF_VECTOR_MAX];\n+\t\tuint16_t buf_id, dummy_len;\n+\t\tuint16_t desc_count, nr_vec = 0;\n+\t\tint err;\n+\n+\t\tif (unlikely(fill_vec_buf_packed(dev, vq,\n+\t\t\t\t\t\tvq->last_avail_idx, &desc_count,\n+\t\t\t\t\t\tbuf_vec, &nr_vec,\n+\t\t\t\t\t\t&buf_id, &dummy_len,\n+\t\t\t\t\t\tVHOST_ACCESS_RW) < 0))\n+\t\t\tbreak;\n+\n+\t\tif (likely(dev->dequeue_zero_copy == 0))\n+\t\t\tupdate_shadow_used_ring_packed(vq, buf_id, 0,\n+\t\t\t\t\tdesc_count);\n+\n+\t\trte_prefetch0((void *)(uintptr_t)buf_vec[0].buf_addr);\n+\n+\t\tpkts[i] = rte_pktmbuf_alloc(mbuf_pool);\n+\t\tif (unlikely(pkts[i] == NULL)) {\n+\t\t\tRTE_LOG(ERR, VHOST_DATA,\n+\t\t\t\t\"Failed to allocate memory for mbuf.\\n\");\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\terr = copy_desc_to_mbuf(dev, vq, buf_vec, nr_vec, pkts[i],\n+\t\t\t\tmbuf_pool);\n+\t\tif (unlikely(err)) {\n+\t\t\trte_pktmbuf_free(pkts[i]);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tif (unlikely(dev->dequeue_zero_copy)) {\n+\t\t\tstruct zcopy_mbuf *zmbuf;\n+\n+\t\t\tzmbuf = get_zmbuf(vq);\n+\t\t\tif (!zmbuf) {\n+\t\t\t\trte_pktmbuf_free(pkts[i]);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t\tzmbuf->mbuf = pkts[i];\n+\t\t\tzmbuf->desc_idx = buf_id;\n+\t\t\tzmbuf->desc_count = desc_count;\n+\n+\t\t\t/*\n+\t\t\t * Pin lock the mbuf; we will check later to see\n+\t\t\t * whether the mbuf is freed (when we are the last\n+\t\t\t * user) or not. If that's the case, we then could\n+\t\t\t * update the used ring safely.\n+\t\t\t */\n+\t\t\trte_mbuf_refcnt_update(pkts[i], 1);\n+\n+\t\t\tvq->nr_zmbuf += 1;\n+\t\t\tTAILQ_INSERT_TAIL(&vq->zmbuf_list, zmbuf, next);\n+\t\t}\n+\n+\t\tvq->last_avail_idx += desc_count;\n+\t\tif (vq->last_avail_idx >= vq->size) {\n+\t\t\tvq->last_avail_idx -= vq->size;\n+\t\t\tvq->avail_wrap_counter ^= 1;\n+\t\t}\n+\t}\n+\n+\tif (likely(dev->dequeue_zero_copy == 0)) {\n+\t\tdo_data_copy_dequeue(vq);\n+\t\tif (unlikely(i < count))\n+\t\t\tvq->shadow_used_idx = i;\n+\t\tflush_shadow_used_ring_packed(dev, vq);\n+\t\tvhost_vring_call(dev, vq);\n+\t}\n+\n+\treturn i;\n+}\n+\n uint16_t\n rte_vhost_dequeue_burst(int vid, uint16_t queue_id,\n \tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t count)\n@@ -1515,7 +1631,10 @@ rte_vhost_dequeue_burst(int vid, uint16_t queue_id,\n \t\tcount -= 1;\n \t}\n \n-\tcount = virtio_dev_tx_split(dev, vq, mbuf_pool, pkts, count);\n+\tif (vq_is_packed(dev))\n+\t\tcount = virtio_dev_tx_packed(dev, vq, mbuf_pool, pkts, count);\n+\telse\n+\t\tcount = virtio_dev_tx_split(dev, vq, mbuf_pool, pkts, count);\n \n out:\n \tif (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))\n", "prefixes": [ "v6", "13/15" ] }