Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/56211/?format=api
{ "id": 56211, "url": "https://patches.dpdk.org/api/patches/56211/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190708171320.38802-5-yong.liu@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": "<20190708171320.38802-5-yong.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190708171320.38802-5-yong.liu@intel.com", "date": "2019-07-08T17:13:11", "name": "[RFC,04/13] add vhost packed ring fast dequeue function", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "456d0325de3b14c7d9448d003da32e0e65b9e96e", "submitter": { "id": 17, "url": "https://patches.dpdk.org/api/people/17/?format=api", "name": "Marvin Liu", "email": "yong.liu@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/20190708171320.38802-5-yong.liu@intel.com/mbox/", "series": [ { "id": 5390, "url": "https://patches.dpdk.org/api/series/5390/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=5390", "date": "2019-07-08T17:13:08", "name": "[RFC,01/13] add vhost normal enqueue function", "version": 1, "mbox": "https://patches.dpdk.org/series/5390/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/56211/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/56211/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 11D411B998;\n\tMon, 8 Jul 2019 11:30:01 +0200 (CEST)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id A0E2C1B951\n\tfor <dev@dpdk.org>; Mon, 8 Jul 2019 11:29:53 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t08 Jul 2019 02:29:52 -0700", "from npg-dpdk-virtual-marvin-dev.sh.intel.com ([10.67.119.142])\n\tby orsmga007.jf.intel.com with ESMTP; 08 Jul 2019 02:29:50 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.63,466,1557212400\"; d=\"scan'208\";a=\"155821656\"", "From": "Marvin Liu <yong.liu@intel.com>", "To": "tiwei.bie@intel.com,\n\tmaxime.coquelin@redhat.com,\n\tdev@dpdk.org", "Cc": "Marvin Liu <yong.liu@intel.com>", "Date": "Tue, 9 Jul 2019 01:13:11 +0800", "Message-Id": "<20190708171320.38802-5-yong.liu@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190708171320.38802-1-yong.liu@intel.com>", "References": "<20190708171320.38802-1-yong.liu@intel.com>", "Subject": "[dpdk-dev] [RFC PATCH 04/13] add vhost packed ring fast dequeue\n\tfunction", "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": "Add fast dequeue function just like enqueue function, fast dequeue\nfunction will not support chained nor indirect descriptors, normal\nfunction will handle that.\n\nSigned-off-by: Marvin Liu <yong.liu@intel.com>", "diff": "diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h\nindex f24026acd..329a7658b 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -41,6 +41,10 @@\n \n /* Used in fast packed ring functions */\n #define PACKED_DESC_PER_CACHELINE (RTE_CACHE_LINE_SIZE / sizeof(struct vring_packed_desc))\n+\n+/* Indicated that normal path will handle */\n+#define VIRTIO_DESC_NORMAL_FLAG (VRING_DESC_F_NEXT | VRING_DESC_F_INDIRECT)\n+\n /**\n * Structure contains buffer address, length and descriptor index\n * from vring to do scatter RX.\ndiff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c\nindex 410837122..a62e0feda 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -1613,6 +1613,158 @@ virtio_dev_tx_split(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \treturn i;\n }\n \n+static __rte_always_inline int\n+vhost_dequeue_fast_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts, uint16_t avail_idx,\n+\tuintptr_t *desc_addr, uint16_t *ids)\n+{\n+\tbool wrap_counter = vq->avail_wrap_counter;\n+\tstruct vring_packed_desc *descs = vq->desc_packed;\n+\tuint64_t len, len1, len2, len3;\n+\tuint32_t buf_offset = dev->vhost_hlen;\n+\n+\t// check whether desc is cache aligned\n+\tif (unlikely(avail_idx & 0x3))\n+\t\treturn -1;\n+\n+\t// prefetch next cache line\n+\tif (unlikely(avail_idx < (vq->size - PACKED_DESC_PER_CACHELINE)))\n+\t\trte_prefetch0((void *)(uintptr_t)&descs[avail_idx +\n+\t\t\tPACKED_DESC_PER_CACHELINE]);\n+\telse\n+\t\trte_prefetch0((void *)(uintptr_t)&descs[0]);\n+\n+\tif (unlikely(!desc_is_avail(&descs[avail_idx], wrap_counter)) |\n+\t\tunlikely(!desc_is_avail(&descs[avail_idx + 1], wrap_counter)) |\n+\t\tunlikely(!desc_is_avail(&descs[avail_idx + 2], wrap_counter)) |\n+\t\tunlikely(!desc_is_avail(&descs[avail_idx + 3], wrap_counter)))\n+\t\treturn 1;\n+\n+\tif (unlikely((descs[avail_idx].flags & VIRTIO_DESC_NORMAL_FLAG) |\n+\t\t(descs[avail_idx + 1].flags & VIRTIO_DESC_NORMAL_FLAG) |\n+\t\t(descs[avail_idx + 2].flags & VIRTIO_DESC_NORMAL_FLAG) |\n+\t\t(descs[avail_idx + 3].flags & VIRTIO_DESC_NORMAL_FLAG)))\n+\t\treturn -1;\n+\n+\trte_smp_rmb();\n+\n+\tlen = descs[avail_idx].len;\n+\tlen1 = descs[avail_idx + 1].len;\n+\tlen2 = descs[avail_idx + 2].len;\n+\tlen3 = descs[avail_idx + 3].len;\n+\n+\tids[0] = descs[avail_idx].id;\n+\tids[1] = descs[avail_idx + 1].id;\n+\tids[2] = descs[avail_idx + 2].id;\n+\tids[3] = descs[avail_idx + 3].id;\n+\n+\tdesc_addr[0] = vhost_iova_to_vva(dev, vq,\n+\t\t\tdescs[avail_idx].addr,\n+\t\t\t&len,\n+\t\t\tVHOST_ACCESS_RW);\n+\n+\tdesc_addr[1] = vhost_iova_to_vva(dev, vq,\n+\t\t\tdescs[avail_idx + 1].addr,\n+\t\t\t&len1,\n+\t\t\tVHOST_ACCESS_RW);\n+\n+\tdesc_addr[2] = vhost_iova_to_vva(dev, vq,\n+\t\t\tdescs[avail_idx + 2].addr,\n+\t\t\t&len2,\n+\t\t\tVHOST_ACCESS_RW);\n+\n+\tdesc_addr[3] = vhost_iova_to_vva(dev, vq,\n+\t\t\tdescs[avail_idx + 3].addr,\n+\t\t\t&len3,\n+\t\t\tVHOST_ACCESS_RW);\n+\n+\tif (unlikely((len != descs[avail_idx].len) |\n+\t\t(len1 != descs[avail_idx + 1].len) |\n+\t\t(len2 != descs[avail_idx + 2].len) |\n+\t\t(len3 != descs[avail_idx + 3].len))) {\n+\t\treturn -1;\n+\t}\n+\n+\tif (rte_pktmbuf_alloc_bulk(mbuf_pool, pkts ,4))\n+\t\treturn -1;\n+\n+\tif (unlikely(((uint64_t)(pkts[0]->buf_len - pkts[0]->data_off) <\n+\t\t\t\t(len + buf_offset)) |\n+\t\t\t((uint64_t)(pkts[1]->buf_len - pkts[1]->data_off) <\n+\t\t\t\t(len1 + buf_offset)) |\n+\t\t\t((uint64_t)(pkts[2]->buf_len - pkts[2]->data_off) <\n+\t\t\t\t(len2 + buf_offset)) |\n+\t\t\t((uint64_t)(pkts[3]->buf_len - pkts[3]->data_off) <\n+\t\t\t\t(len3 + buf_offset)))) {\n+\t\trte_pktmbuf_free(pkts[0]);\n+\t\trte_pktmbuf_free(pkts[1]);\n+\t\trte_pktmbuf_free(pkts[2]);\n+\t\trte_pktmbuf_free(pkts[3]);\n+\t\treturn -1;\n+\t}\n+\n+\tpkts[0]->pkt_len = descs[avail_idx].len - buf_offset;\n+\tpkts[1]->pkt_len = descs[avail_idx + 1].len - buf_offset;\n+\tpkts[2]->pkt_len = descs[avail_idx + 2].len - buf_offset;\n+\tpkts[3]->pkt_len = descs[avail_idx + 3].len - buf_offset;\n+\n+\tpkts[0]->data_len = pkts[0]->pkt_len;\n+\tpkts[1]->data_len = pkts[1]->pkt_len;\n+\tpkts[2]->data_len = pkts[2]->pkt_len;\n+\tpkts[3]->data_len = pkts[3]->pkt_len;\n+\n+\treturn 0;\n+}\n+\n+static __rte_always_inline int\n+virtio_dev_tx_fast_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\tstruct rte_mempool *mbuf_pool, struct rte_mbuf **pkts)\n+{\n+\tuint16_t avail_idx = vq->last_avail_idx;\n+\tuint32_t buf_offset = dev->vhost_hlen;\n+\tuintptr_t desc_addr[4];\n+\tuint16_t ids[4];\n+\tint ret;\n+\tstruct virtio_net_hdr *hdr, *hdr1, *hdr2, *hdr3;\n+\n+\tret = vhost_dequeue_fast_packed(dev, vq, mbuf_pool, pkts, avail_idx,\n+\t\t\t\tdesc_addr, ids);\n+\n+\tif (ret)\n+\t\treturn ret;\n+\n+\trte_memcpy(rte_pktmbuf_mtod_offset(pkts[0], void *, 0),\n+\t\t(void *)(uintptr_t)(desc_addr[0] + buf_offset),\n+\t\tpkts[0]->pkt_len);\n+\trte_memcpy(rte_pktmbuf_mtod_offset(pkts[1], void *, 0),\n+\t\t(void *)(uintptr_t)(desc_addr[1] + buf_offset),\n+\t\tpkts[1]->pkt_len);\n+\trte_memcpy(rte_pktmbuf_mtod_offset(pkts[2], void *, 0),\n+\t\t(void *)(uintptr_t)(desc_addr[2] + buf_offset),\n+\t\tpkts[2]->pkt_len);\n+\trte_memcpy(rte_pktmbuf_mtod_offset(pkts[3], void *, 0),\n+\t\t(void *)(uintptr_t)(desc_addr[3] + buf_offset),\n+\t\tpkts[3]->pkt_len);\n+\n+\tif (virtio_net_with_host_offload(dev)) {\n+\t\thdr = (struct virtio_net_hdr *)((uintptr_t)desc_addr[0]);\n+\t\thdr1 = (struct virtio_net_hdr *)((uintptr_t)desc_addr[1]);\n+\t\thdr2 = (struct virtio_net_hdr *)((uintptr_t)desc_addr[2]);\n+\t\thdr3 = (struct virtio_net_hdr *)((uintptr_t)desc_addr[3]);\n+\t\tvhost_dequeue_offload(hdr, pkts[0]);\n+\t\tvhost_dequeue_offload(hdr1, pkts[1]);\n+\t\tvhost_dequeue_offload(hdr2, pkts[2]);\n+\t\tvhost_dequeue_offload(hdr3, pkts[3]);\n+\t}\n+\n+\tvq->last_avail_idx += PACKED_DESC_PER_CACHELINE;\n+\tif (vq->last_avail_idx >= vq->size) {\n+\t\tvq->last_avail_idx -= vq->size;\n+\t\tvq->avail_wrap_counter ^= 1;\n+\t}\n+\treturn 0;\n+}\n+\n static __rte_always_inline int\n vhost_dequeue_normal_packed(struct virtio_net *dev,\n \t\tstruct vhost_virtqueue *vq,\n", "prefixes": [ "RFC", "04/13" ] }