Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/61599/?format=api
{ "id": 61599, "url": "http://patches.dpdk.org/api/patches/61599/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191021220813.55236-8-yong.liu@intel.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": "<20191021220813.55236-8-yong.liu@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191021220813.55236-8-yong.liu@intel.com", "date": "2019-10-21T22:08:07", "name": "[v8,07/13] vhost: flush enqueue updates by cacheline", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3f4ef61942b1bc49ff83f0ba88158d74ad0767c8", "submitter": { "id": 17, "url": "http://patches.dpdk.org/api/people/17/?format=api", "name": "Marvin Liu", "email": "yong.liu@intel.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/20191021220813.55236-8-yong.liu@intel.com/mbox/", "series": [ { "id": 6969, "url": "http://patches.dpdk.org/api/series/6969/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6969", "date": "2019-10-21T22:08:00", "name": "vhost packed ring performance optimization", "version": 8, "mbox": "http://patches.dpdk.org/series/6969/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/61599/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/61599/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 BF7681BF76;\n\tMon, 21 Oct 2019 16:28:27 +0200 (CEST)", "from mga05.intel.com (mga05.intel.com [192.55.52.43])\n\tby dpdk.org (Postfix) with ESMTP id 1949F1BF58\n\tfor <dev@dpdk.org>; Mon, 21 Oct 2019 16:28:10 +0200 (CEST)", "from orsmga008.jf.intel.com ([10.7.209.65])\n\tby fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t21 Oct 2019 07:28:10 -0700", "from npg-dpdk-virtual-marvin-dev.sh.intel.com ([10.67.119.142])\n\tby orsmga008.jf.intel.com with ESMTP; 21 Oct 2019 07:28:09 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,323,1566889200\"; d=\"scan'208\";a=\"191127149\"", "From": "Marvin Liu <yong.liu@intel.com>", "To": "maxime.coquelin@redhat.com, tiwei.bie@intel.com, zhihong.wang@intel.com, \n\tstephen@networkplumber.org, gavin.hu@arm.com", "Cc": "dev@dpdk.org,\n\tMarvin Liu <yong.liu@intel.com>", "Date": "Tue, 22 Oct 2019 06:08:07 +0800", "Message-Id": "<20191021220813.55236-8-yong.liu@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20191021220813.55236-1-yong.liu@intel.com>", "References": "<20191021154016.16274-1-yong.liu@intel.com>\n\t<20191021220813.55236-1-yong.liu@intel.com>", "Subject": "[dpdk-dev] [PATCH v8 07/13] vhost: flush enqueue updates by\n\tcacheline", "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": "Buffer vhost packed ring enqueue updates, flush ring descs if buffered\ncontent filled up one cacheline. Thus virtio can receive packets at a\nfaster frequency.\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 67724c342..d59446442 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -174,6 +174,8 @@ struct vhost_virtqueue {\n \t\tstruct vring_used_elem_packed *shadow_used_packed;\n \t};\n \tuint16_t shadow_used_idx;\n+\t/* Record packed ring enqueue latest desc cache aligned index */\n+\tuint16_t\t\tshadow_aligned_idx;\n \tstruct vhost_vring_addr ring_addrs;\n \n \tstruct batch_copy_elem\t*batch_copy_elems;\ndiff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c\nindex 76435204f..25bffdd52 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -91,6 +91,69 @@ update_shadow_used_ring_split(struct vhost_virtqueue *vq,\n \tvq->shadow_used_split[i].len = len;\n }\n \n+static __rte_always_inline void\n+vhost_flush_enqueue_shadow_packed(struct virtio_net *dev,\n+\t\t\t\t struct vhost_virtqueue *vq)\n+{\n+\tint i;\n+\tuint16_t used_idx = vq->last_used_idx;\n+\tuint16_t head_idx = vq->last_used_idx;\n+\tuint16_t head_flags = 0;\n+\n+\t/* Split loop in two to save memory barriers */\n+\tfor (i = 0; i < vq->shadow_used_idx; i++) {\n+\t\tvq->desc_packed[used_idx].id = vq->shadow_used_packed[i].id;\n+\t\tvq->desc_packed[used_idx].len = vq->shadow_used_packed[i].len;\n+\n+\t\tused_idx += vq->shadow_used_packed[i].count;\n+\t\tif (used_idx >= vq->size)\n+\t\t\tused_idx -= vq->size;\n+\t}\n+\n+\trte_smp_wmb();\n+\n+\tfor (i = 0; i < vq->shadow_used_idx; i++) {\n+\t\tuint16_t flags;\n+\n+\t\tif (vq->shadow_used_packed[i].len)\n+\t\t\tflags = VRING_DESC_F_WRITE;\n+\t\telse\n+\t\t\tflags = 0;\n+\n+\t\tif (vq->used_wrap_counter) {\n+\t\t\tflags |= VRING_DESC_F_USED;\n+\t\t\tflags |= VRING_DESC_F_AVAIL;\n+\t\t} else {\n+\t\t\tflags &= ~VRING_DESC_F_USED;\n+\t\t\tflags &= ~VRING_DESC_F_AVAIL;\n+\t\t}\n+\n+\t\tif (i > 0) {\n+\t\t\tvq->desc_packed[vq->last_used_idx].flags = flags;\n+\n+\t\t\tvhost_log_cache_used_vring(dev, vq,\n+\t\t\t\t\tvq->last_used_idx *\n+\t\t\t\t\tsizeof(struct vring_packed_desc),\n+\t\t\t\t\tsizeof(struct vring_packed_desc));\n+\t\t} else {\n+\t\t\thead_idx = vq->last_used_idx;\n+\t\t\thead_flags = flags;\n+\t\t}\n+\n+\t\tvq_inc_last_used_packed(vq, vq->shadow_used_packed[i].count);\n+\t}\n+\n+\tvq->desc_packed[head_idx].flags = head_flags;\n+\n+\tvhost_log_cache_used_vring(dev, vq,\n+\t\t\t\thead_idx *\n+\t\t\t\tsizeof(struct vring_packed_desc),\n+\t\t\t\tsizeof(struct vring_packed_desc));\n+\n+\tvq->shadow_used_idx = 0;\n+\tvhost_log_cache_sync(dev, vq);\n+}\n+\n static __rte_always_inline void\n flush_shadow_used_ring_packed(struct virtio_net *dev,\n \t\t\tstruct vhost_virtqueue *vq)\n@@ -194,6 +257,33 @@ do_data_copy_dequeue(struct vhost_virtqueue *vq)\n \tvq->batch_copy_nb_elems = 0;\n }\n \n+static __rte_always_inline void\n+vhost_shadow_enqueue_single_packed(struct virtio_net *dev,\n+\t\t\t\t struct vhost_virtqueue *vq,\n+\t\t\t\t uint32_t len[],\n+\t\t\t\t uint16_t id[],\n+\t\t\t\t uint16_t count[],\n+\t\t\t\t uint16_t num_buffers)\n+{\n+\tuint16_t i;\n+\tfor (i = 0; i < num_buffers; i++) {\n+\t\t/* enqueue shadow flush action aligned with batch num */\n+\t\tif (!vq->shadow_used_idx)\n+\t\t\tvq->shadow_aligned_idx = vq->last_used_idx &\n+\t\t\t\tPACKED_BATCH_MASK;\n+\t\tvq->shadow_used_packed[vq->shadow_used_idx].id = id[i];\n+\t\tvq->shadow_used_packed[vq->shadow_used_idx].len = len[i];\n+\t\tvq->shadow_used_packed[vq->shadow_used_idx].count = count[i];\n+\t\tvq->shadow_aligned_idx += count[i];\n+\t\tvq->shadow_used_idx++;\n+\t}\n+\n+\tif (vq->shadow_aligned_idx >= PACKED_BATCH_SIZE) {\n+\t\tdo_data_copy_enqueue(dev, vq);\n+\t\tvhost_flush_enqueue_shadow_packed(dev, vq);\n+\t}\n+}\n+\n /* avoid write operation when necessary, to lessen cache issues */\n #define ASSIGN_UNLESS_EQUAL(var, val) do {\t\\\n \tif ((var) != (val))\t\t\t\\\n@@ -785,6 +875,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev,\n \tuint16_t desc_count;\n \tuint32_t size = pkt->pkt_len + dev->vhost_hlen;\n \tuint16_t num_buffers = 0;\n+\tuint32_t buffer_len[vq->size];\n+\tuint16_t buffer_buf_id[vq->size];\n+\tuint16_t buffer_desc_count[vq->size];\n \n \tif (rxvq_is_mergeable(dev))\n \t\tmax_tries = vq->size - 1;\n@@ -810,6 +903,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev,\n \t\tlen = RTE_MIN(len, size);\n \t\tsize -= len;\n \n+\t\tbuffer_len[num_buffers] = len;\n+\t\tbuffer_buf_id[num_buffers] = buf_id;\n+\t\tbuffer_desc_count[num_buffers] = desc_count;\n \t\tnum_buffers += 1;\n \n \t\t*nr_descs += desc_count;\n@@ -821,6 +917,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev,\n \tif (copy_mbuf_to_desc(dev, vq, pkt, buf_vec, nr_vec, num_buffers) < 0)\n \t\treturn -1;\n \n+\tvhost_shadow_enqueue_single_packed(dev, vq, buffer_len, buffer_buf_id,\n+\t\t\t\t\t buffer_desc_count, num_buffers);\n+\n \treturn 0;\n }\n \n@@ -1017,7 +1116,7 @@ virtio_dev_rx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \tdo_data_copy_enqueue(dev, vq);\n \n \tif (likely(vq->shadow_used_idx)) {\n-\t\tflush_shadow_used_ring_packed(dev, vq);\n+\t\tvhost_flush_enqueue_shadow_packed(dev, vq);\n \t\tvhost_vring_call_packed(dev, vq);\n \t}\n \n", "prefixes": [ "v8", "07/13" ] }