Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/109569/?format=api
{ "id": 109569, "url": "https://patches.dpdk.org/api/patches/109569/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220411133836.200783-1-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": "<20220411133836.200783-1-wenwux.ma@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220411133836.200783-1-wenwux.ma@intel.com", "date": "2022-04-11T13:38:36", "name": "vhost: support sync copy when data buffer is small", "commit_ref": null, "pull_url": null, "state": "rejected", "archived": true, "hash": "a74b9137fc6a95720c3de36c33270d4e2234f0ae", "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/20220411133836.200783-1-wenwux.ma@intel.com/mbox/", "series": [ { "id": 22469, "url": "https://patches.dpdk.org/api/series/22469/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=22469", "date": "2022-04-11T13:38:36", "name": "vhost: support sync copy when data buffer is small", "version": 1, "mbox": "https://patches.dpdk.org/series/22469/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/109569/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/109569/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 E0404A00C4;\n\tMon, 11 Apr 2022 07:40:20 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CF0D140685;\n\tMon, 11 Apr 2022 07:40:20 +0200 (CEST)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id 528614067B\n for <dev@dpdk.org>; Mon, 11 Apr 2022 07:40:18 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Apr 2022 22:40:17 -0700", "from unknown (HELO localhost.localdomain) ([10.239.251.209])\n by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Apr 2022 22:40:14 -0700" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1649655618; x=1681191618;\n h=from:to:cc:subject:date:message-id:mime-version:\n content-transfer-encoding;\n bh=eq8tHLMF5ZZYQWch4ATQR1oVeOUNT/JbIVve6MYhD18=;\n b=iaPk4C00+lkjmtpBD6RKjZTcpp22DYrrbBklJLMZl5eo9seO1+ZlGnZD\n lv8qsnUIPGeXYy7i9LUFzxKP/Two3pDn7fyEvzp3MH/xSP5Ms7NP+cFch\n MYlntvpKvSWI5sjlqg5hK9uJgkEetxbokLouisadCWwhroBIgtRtd86aJ\n yx+AIMlLGqXeO27smwLzzE2Zi1R+J4brZqOuT4p4CjYnb9i4FZxe6mi1l\n RbmZjo8R+k6v1Vnry0DsTAe+TMbVe57b9Hsets9nPGEIeEEM8b84to5CV\n KSY4vgHSQCYkpZlxiHaPTUP6+ONXOXka1e2IeR4AEc4yBEiVNLAkAnBMN w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6400,9594,10313\"; a=\"262216484\"", "E=Sophos;i=\"5.90,251,1643702400\"; d=\"scan'208\";a=\"262216484\"", "E=Sophos;i=\"5.90,251,1643702400\"; d=\"scan'208\";a=\"550986724\"" ], "From": "Wenwu Ma <wenwux.ma@intel.com>", "To": "maxime.coquelin@redhat.com,\n\tchenbo.xia@intel.com,\n\tdev@dpdk.org", "Cc": "jiayu.hu@intel.com, yinan.wang@intel.com, xingguang.he@intel.com,\n weix.ling@intel.com, Wenwu Ma <wenwux.ma@intel.com>", "Subject": "[PATCH] vhost: support sync copy when data buffer is small", "Date": "Mon, 11 Apr 2022 13:38:36 +0000", "Message-Id": "<20220411133836.200783-1-wenwux.ma@intel.com>", "X-Mailer": "git-send-email 2.25.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "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" }, "content": "In async datapath, if the length of data buffer\nis less than 256, the data will be copied by CPU\ninstead of DMA.\n\nSigned-off-by: Wenwu Ma <wenwux.ma@intel.com>\n---\n lib/vhost/vhost.h | 6 ++-\n lib/vhost/virtio_net.c | 96 ++++++++++++++++++++++++++++++------------\n 2 files changed, 73 insertions(+), 29 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex 9209558465..d0da53aa46 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -125,8 +125,10 @@ struct vring_used_elem_packed {\n * iovec\n */\n struct vhost_iovec {\n-\tvoid *src_addr;\n-\tvoid *dst_addr;\n+\tvoid *src_io_addr;\n+\tvoid *dst_io_addr;\n+\tvoid *src_virt_addr;\n+\tvoid *dst_virt_addr;\n \tsize_t len;\n };\n \ndiff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c\nindex 3085905d17..46f35ac05f 100644\n--- a/lib/vhost/virtio_net.c\n+++ b/lib/vhost/virtio_net.c\n@@ -26,6 +26,8 @@\n \n #define MAX_BATCH_LEN 256\n \n+#define CPU_COPY_THRESHOLD_LEN 256\n+\n /* DMA device copy operation tracking array. */\n struct async_dma_info dma_copy_track[RTE_DMADEV_DEFAULT_MAX];\n \n@@ -61,28 +63,37 @@ vhost_async_dma_transfer_one(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \tint copy_idx = 0;\n \tuint32_t nr_segs = pkt->nr_segs;\n \tuint16_t i;\n+\tbool is_cpu_copy = true;\n \n \tif (rte_dma_burst_capacity(dma_id, vchan_id) < nr_segs)\n \t\treturn -1;\n \n \tfor (i = 0; i < nr_segs; i++) {\n-\t\tcopy_idx = rte_dma_copy(dma_id, vchan_id, (rte_iova_t)iov[i].src_addr,\n-\t\t\t\t(rte_iova_t)iov[i].dst_addr, iov[i].len, RTE_DMA_OP_FLAG_LLC);\n-\t\t/**\n-\t\t * Since all memory is pinned and DMA vChannel\n-\t\t * ring has enough space, failure should be a\n-\t\t * rare case. If failure happens, it means DMA\n-\t\t * device encounters serious errors; in this\n-\t\t * case, please stop async data-path and check\n-\t\t * what has happened to DMA device.\n-\t\t */\n-\t\tif (unlikely(copy_idx < 0)) {\n-\t\t\tif (!vhost_async_dma_copy_log) {\n-\t\t\t\tVHOST_LOG_DATA(ERR, \"(%s) DMA copy failed for channel %d:%u\\n\",\n+\t\tif (iov[i].len > CPU_COPY_THRESHOLD_LEN) {\n+\t\t\tcopy_idx = rte_dma_copy(dma_id, vchan_id,\n+\t\t\t\t\t(rte_iova_t)iov[i].src_io_addr,\n+\t\t\t\t\t(rte_iova_t)iov[i].dst_io_addr,\n+\t\t\t\t\tiov[i].len, RTE_DMA_OP_FLAG_LLC);\n+\t\t\t/**\n+\t\t\t * Since all memory is pinned and DMA vChannel\n+\t\t\t * ring has enough space, failure should be a\n+\t\t\t * rare case. If failure happens, it means DMA\n+\t\t\t * device encounters serious errors; in this\n+\t\t\t * case, please stop async data-path and check\n+\t\t\t * what has happened to DMA device.\n+\t\t\t */\n+\t\t\tif (unlikely(copy_idx < 0)) {\n+\t\t\t\tif (!vhost_async_dma_copy_log) {\n+\t\t\t\t\tVHOST_LOG_DATA(ERR,\n+\t\t\t\t\t\t\"(%s) DMA copy failed for channel %d:%u\\n\",\n \t\t\t\t\t\tdev->ifname, dma_id, vchan_id);\n-\t\t\t\tvhost_async_dma_copy_log = true;\n+\t\t\t\t\tvhost_async_dma_copy_log = true;\n+\t\t\t\t}\n+\t\t\t\treturn -1;\n \t\t\t}\n-\t\t\treturn -1;\n+\t\t\tis_cpu_copy = false;\n+\t\t} else {\n+\t\t\trte_memcpy(iov[i].dst_virt_addr, iov[i].src_virt_addr, iov[i].len);\n \t\t}\n \t}\n \n@@ -90,7 +101,13 @@ vhost_async_dma_transfer_one(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t * Only store packet completion flag address in the last copy's\n \t * slot, and other slots are set to NULL.\n \t */\n-\tdma_info->pkts_cmpl_flag_addr[copy_idx & ring_mask] = &vq->async->pkts_cmpl_flag[flag_idx];\n+\tif (is_cpu_copy == false) {\n+\t\tdma_info->pkts_cmpl_flag_addr[copy_idx & ring_mask] =\n+\t\t\t&vq->async->pkts_cmpl_flag[flag_idx];\n+\t} else {\n+\t\tvq->async->pkts_cmpl_flag[flag_idx] = true;\n+\t\tnr_segs = 0;\n+\t}\n \n \treturn nr_segs;\n }\n@@ -123,6 +140,19 @@ vhost_async_dma_transfer(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \n \trte_spinlock_unlock(&dma_info->dma_lock);\n \n+\tif (unlikely(ret < 0 && pkt_idx > 0)) {\n+\t\tdo {\n+\t\t\thead_idx = (head_idx == 0) ? vq->size : head_idx - 1;\n+\t\t\tif (vq->async->pkts_cmpl_flag[head_idx] == false)\n+\t\t\t\tbreak;\n+\n+\t\t\tpkt_idx--;\n+\t\t\tvq->async->pkts_cmpl_flag[head_idx] = false;\n+\t\t\tif (pkt_idx == 0)\n+\t\t\t\tbreak;\n+\t\t} while (1);\n+\t}\n+\n \treturn pkt_idx;\n }\n \n@@ -943,7 +973,7 @@ async_iter_initialize(struct virtio_net *dev, struct vhost_async *async)\n \n static __rte_always_inline int\n async_iter_add_iovec(struct virtio_net *dev, struct vhost_async *async,\n-\t\tvoid *src, void *dst, size_t len)\n+\t\tvoid *io_src, void *io_dst, void *virt_src, void *virt_dst, size_t len)\n {\n \tstruct vhost_iov_iter *iter;\n \tstruct vhost_iovec *iovec;\n@@ -962,8 +992,10 @@ async_iter_add_iovec(struct virtio_net *dev, struct vhost_async *async,\n \titer = async->iov_iter + async->iter_idx;\n \tiovec = async->iovec + async->iovec_idx;\n \n-\tiovec->src_addr = src;\n-\tiovec->dst_addr = dst;\n+\tiovec->src_io_addr = io_src;\n+\tiovec->dst_io_addr = io_dst;\n+\tiovec->src_virt_addr = virt_src;\n+\tiovec->dst_virt_addr = virt_dst;\n \tiovec->len = len;\n \n \titer->nr_segs++;\n@@ -999,12 +1031,13 @@ async_iter_reset(struct vhost_async *async)\n static __rte_always_inline int\n async_fill_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t\tstruct rte_mbuf *m, uint32_t mbuf_offset,\n-\t\tuint64_t buf_iova, uint32_t cpy_len, bool to_desc)\n+\t\tuint64_t buf_addr, uint64_t buf_iova, uint32_t cpy_len, bool to_desc)\n {\n \tstruct vhost_async *async = vq->async;\n \tuint64_t mapped_len;\n \tuint32_t buf_offset = 0;\n-\tvoid *src, *dst;\n+\tvoid *io_src, *io_dst;\n+\tvoid *virt_src, *virt_dst;\n \tvoid *host_iova;\n \n \twhile (cpy_len) {\n@@ -1016,16 +1049,23 @@ async_fill_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t\t\treturn -1;\n \t\t}\n \n+\n \t\tif (to_desc) {\n-\t\t\tsrc = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);\n-\t\t\tdst = host_iova;\n+\t\t\tio_src = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);\n+\t\t\tio_dst = host_iova;\n+\n+\t\t\tvirt_src = rte_pktmbuf_mtod_offset(m, void *, mbuf_offset);\n+\t\t\tvirt_dst = (void *)(buf_addr + buf_offset);\n \t\t} else {\n-\t\t\tsrc = host_iova;\n-\t\t\tdst = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);\n+\t\t\tio_src = host_iova;\n+\t\t\tio_dst = (void *)(uintptr_t)rte_pktmbuf_iova_offset(m, mbuf_offset);\n+\n+\t\t\tvirt_src = (void *)(buf_addr + buf_offset);\n+\t\t\tvirt_dst = rte_pktmbuf_mtod_offset(m, void *, mbuf_offset);\n \t\t}\n \n-\t\tif (unlikely(async_iter_add_iovec(dev, async, src, dst,\n-\t\t\t\t\t\t (size_t)mapped_len)))\n+\t\tif (unlikely(async_iter_add_iovec(dev, async, io_src, io_dst,\n+\t\t\t\t\t\tvirt_src, virt_dst, (size_t)mapped_len)))\n \t\t\treturn -1;\n \n \t\tcpy_len -= (uint32_t)mapped_len;\n@@ -1169,6 +1209,7 @@ mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \n \t\tif (is_async) {\n \t\t\tif (async_fill_seg(dev, vq, m, mbuf_offset,\n+\t\t\t\t\t\tbuf_addr + buf_offset,\n \t\t\t\t\t\tbuf_iova + buf_offset, cpy_len, true) < 0)\n \t\t\t\tgoto error;\n \t\t} else {\n@@ -2562,6 +2603,7 @@ desc_to_mbuf(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \n \t\tif (is_async) {\n \t\t\tif (async_fill_seg(dev, vq, m, mbuf_offset,\n+\t\t\t\t\t\tbuf_addr + buf_offset,\n \t\t\t\t\t\tbuf_iova + buf_offset, cpy_len, false) < 0)\n \t\t\t\tgoto error;\n \t\t} else {\n", "prefixes": [] }