Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/58611/?format=api
http://patchwork.dpdk.org/api/patches/58611/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20190905161421.55981-3-yong.liu@intel.com/", "project": { "id": 1, "url": "http://patchwork.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": "<20190905161421.55981-3-yong.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190905161421.55981-3-yong.liu@intel.com", "date": "2019-09-05T16:14:09", "name": "[v1,02/14] vhost: add burst enqueue function for packed ring", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ee4c94642454effdc44108d51543a167420a49cb", "submitter": { "id": 17, "url": "http://patchwork.dpdk.org/api/people/17/?format=api", "name": "Marvin Liu", "email": "yong.liu@intel.com" }, "delegate": { "id": 2642, "url": "http://patchwork.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20190905161421.55981-3-yong.liu@intel.com/mbox/", "series": [ { "id": 6248, "url": "http://patchwork.dpdk.org/api/series/6248/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=6248", "date": "2019-09-05T16:14:07", "name": "vhost packed ring performance optimization", "version": 1, "mbox": "http://patchwork.dpdk.org/series/6248/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/58611/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/58611/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 EADF11EE0F;\n\tThu, 5 Sep 2019 10:34:39 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id A04381ED96\n\tfor <dev@dpdk.org>; Thu, 5 Sep 2019 10:34:34 +0200 (CEST)", "from fmsmga006.fm.intel.com ([10.253.24.20])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t05 Sep 2019 01:34:33 -0700", "from npg-dpdk-virtual-marvin-dev.sh.intel.com ([10.67.119.142])\n\tby fmsmga006.fm.intel.com with ESMTP; 05 Sep 2019 01:34:32 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.64,470,1559545200\"; d=\"scan'208\";a=\"383781505\"", "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": "Fri, 6 Sep 2019 00:14:09 +0800", "Message-Id": "<20190905161421.55981-3-yong.liu@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20190905161421.55981-1-yong.liu@intel.com>", "References": "<20190905161421.55981-1-yong.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH v1 02/14] vhost: add burst enqueue function for\n\tpacked 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": "Burst enqueue function will first check whether descriptors are cache\naligned. It will also check prerequisites in the beginning. Burst\nenqueue function not support chained mbufs, single packet enqueue\nfunction will handle it.\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 884befa85..ed8b4aabf 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -39,6 +39,8 @@\n \n #define VHOST_LOG_CACHE_NR 32\n \n+#define PACKED_DESCS_BURST 4\n+#define PACKED_BURST_MASK (PACKED_DESCS_BURST - 1)\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 5ad0a8175..51ed20543 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -896,6 +896,106 @@ virtio_dev_rx_split(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \treturn pkt_idx;\n }\n \n+static __rte_unused uint16_t\n+virtio_dev_rx_burst_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\t struct rte_mbuf **pkts)\n+{\n+\tbool wrap_counter = vq->avail_wrap_counter;\n+\tstruct vring_packed_desc *descs = vq->desc_packed;\n+\tuint16_t avail_idx = vq->last_avail_idx;\n+\tuint64_t desc_addr, desc_addr1, desc_addr2, desc_addr3;\n+\tuint64_t len, len1, len2, len3;\n+\tstruct virtio_net_hdr_mrg_rxbuf *hdr, *hdr1, *hdr2, *hdr3;\n+\tuint32_t buf_offset = dev->vhost_hlen;\n+\n+\tif (unlikely(avail_idx & PACKED_BURST_MASK))\n+\t\treturn -1;\n+\n+\tif (unlikely((pkts[0]->next != NULL) |\n+\t\t(pkts[1]->next != NULL) |\n+\t\t(pkts[2]->next != NULL) |\n+\t\t(pkts[3]->next != NULL)))\n+\t\treturn -1;\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+\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+\tif (unlikely((pkts[0]->pkt_len > (len - buf_offset)) |\n+\t\t (pkts[1]->pkt_len > (len1 - buf_offset)) |\n+\t\t (pkts[2]->pkt_len > (len2 - buf_offset)) |\n+\t\t (pkts[3]->pkt_len > (len3 - buf_offset))))\n+\t\treturn -1;\n+\n+\tdesc_addr = vhost_iova_to_vva(dev, vq, descs[avail_idx].addr, &len,\n+\t\t\t\t VHOST_ACCESS_RW);\n+\n+\tdesc_addr1 = vhost_iova_to_vva(dev, vq, descs[avail_idx + 1].addr,\n+\t\t\t\t &len1, VHOST_ACCESS_RW);\n+\n+\tdesc_addr2 = vhost_iova_to_vva(dev, vq, descs[avail_idx + 2].addr,\n+\t\t\t\t &len2, VHOST_ACCESS_RW);\n+\n+\tdesc_addr3 = vhost_iova_to_vva(dev, vq, descs[avail_idx + 3].addr,\n+\t\t\t\t &len3, VHOST_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+\n+\trte_prefetch0((void *)(uintptr_t)desc_addr);\n+\trte_prefetch0((void *)(uintptr_t)desc_addr1);\n+\trte_prefetch0((void *)(uintptr_t)desc_addr2);\n+\trte_prefetch0((void *)(uintptr_t)desc_addr3);\n+\n+\thdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)desc_addr;\n+\thdr1 = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)desc_addr1;\n+\thdr2 = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)desc_addr2;\n+\thdr3 = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)desc_addr3;\n+\n+\tvirtio_enqueue_offload(pkts[0], &hdr->hdr);\n+\tvirtio_enqueue_offload(pkts[1], &hdr1->hdr);\n+\tvirtio_enqueue_offload(pkts[2], &hdr2->hdr);\n+\tvirtio_enqueue_offload(pkts[3], &hdr3->hdr);\n+\n+\tlen = pkts[0]->pkt_len + dev->vhost_hlen;\n+\tlen1 = pkts[1]->pkt_len + dev->vhost_hlen;\n+\tlen2 = pkts[2]->pkt_len + dev->vhost_hlen;\n+\tlen3 = pkts[3]->pkt_len + dev->vhost_hlen;\n+\n+\tvq->last_avail_idx += PACKED_DESCS_BURST;\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+\n+\trte_memcpy((void *)(uintptr_t)(desc_addr + buf_offset),\n+\t\t rte_pktmbuf_mtod_offset(pkts[0], void *, 0),\n+\t\t pkts[0]->pkt_len);\n+\trte_memcpy((void *)(uintptr_t)(desc_addr1 + buf_offset),\n+\t\t rte_pktmbuf_mtod_offset(pkts[1], void *, 0),\n+\t\t pkts[1]->pkt_len);\n+\trte_memcpy((void *)(uintptr_t)(desc_addr2 + buf_offset),\n+\t\t rte_pktmbuf_mtod_offset(pkts[2], void *, 0),\n+\t\t pkts[2]->pkt_len);\n+\trte_memcpy((void *)(uintptr_t)(desc_addr3 + buf_offset),\n+\t\t rte_pktmbuf_mtod_offset(pkts[3], void *, 0),\n+\t\t pkts[3]->pkt_len);\n+\n+\treturn 0;\n+}\n+\n static __rte_unused int16_t\n virtio_dev_rx_single_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \tstruct rte_mbuf *pkt)\n", "prefixes": [ "v1", "02/14" ] }{ "id": 58611, "url": "