Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/105103/?format=api
{ "id": 105103, "url": "http://patches.dpdk.org/api/patches/105103/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20211213172001.69260-1-xuan.ding@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": "<20211213172001.69260-1-xuan.ding@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211213172001.69260-1-xuan.ding@intel.com", "date": "2021-12-13T17:20:01", "name": "vhost: rename field in guest page struct", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "e0d3895dcc5fdc74b22c9b27771f5101d85c9245", "submitter": { "id": 1401, "url": "http://patches.dpdk.org/api/people/1401/?format=api", "name": "Ding, Xuan", "email": "xuan.ding@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/20211213172001.69260-1-xuan.ding@intel.com/mbox/", "series": [ { "id": 20924, "url": "http://patches.dpdk.org/api/series/20924/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=20924", "date": "2021-12-13T17:20:01", "name": "vhost: rename field in guest page struct", "version": 1, "mbox": "http://patches.dpdk.org/series/20924/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/105103/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/105103/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 7B996A0032;\n\tMon, 13 Dec 2021 09:41:47 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 340B240E09;\n\tMon, 13 Dec 2021 09:41:47 +0100 (CET)", "from mga14.intel.com (mga14.intel.com [192.55.52.115])\n by mails.dpdk.org (Postfix) with ESMTP id 1B0EF40140\n for <dev@dpdk.org>; Mon, 13 Dec 2021 09:41:44 +0100 (CET)", "from fmsmga003.fm.intel.com ([10.253.24.29])\n by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 13 Dec 2021 00:41:33 -0800", "from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.110.228])\n by FMSMGA003.fm.intel.com with ESMTP; 13 Dec 2021 00:41:31 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=simple/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1639384905; x=1670920905;\n h=from:to:cc:subject:date:message-id;\n bh=ZSOQjRxKCJlO4qWpgAunx/Ni+3NpVpNpZwDqr+IT3AE=;\n b=dFEoZDIP/T0EwAdb8VOoPKTUztT2VFWqguHeyU7f49BVxXtVuVvpeVQb\n 6IEKw2vdz+HRQwdSyz00+03mN2/q8uS//y1xGtjECABtT3+YrRL1WXk+t\n ml53Hk+I9iU4sE6QfRefCe+ZvQXuIJv/l1L647AQMdfH+hGybXeWLCnHl\n XSHN9WOQewDxofnwC2aGaPVbpx6AQpINBjHocT+rZB//EMAQTdCrF2eLI\n MjuDYtNKsg6xtP3/cqs7Io0hvCB2s/OW6+UnTJpClUj/PRVFqlPuulsgc\n a44PG97Qh4Fhwxk1oHbSvDN2IItRRGs/qZpQ7sr9x8C8pr/GvuQaR87ZM Q==;", "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10196\"; a=\"238912098\"", "E=Sophos;i=\"5.88,202,1635231600\"; d=\"scan'208\";a=\"238912098\"", "E=Sophos;i=\"5.88,202,1635231600\"; d=\"scan'208\";a=\"603511256\"" ], "X-ExtLoop1": "1", "From": "xuan.ding@intel.com", "To": "maxime.coquelin@redhat.com,\n\tchenbo.xia@intel.com", "Cc": "dev@dpdk.org, yuanx.wang@intel.com, jiayu.hu@intel.com,\n cheng1.jiang@intel.com, Xuan Ding <xuan.ding@intel.com>", "Subject": "[PATCH] vhost: rename field in guest page struct", "Date": "Mon, 13 Dec 2021 17:20:01 +0000", "Message-Id": "<20211213172001.69260-1-xuan.ding@intel.com>", "X-Mailer": "git-send-email 2.17.1", "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": "From: Xuan Ding <xuan.ding@intel.com>\n\nThis patch renames the host_phys_addr to host_iova in guest_page\nstruct. The host_phys_addr is iova, it depends on the DPDK\nIOVA mode.\n\nSigned-off-by: Xuan Ding <xuan.ding@intel.com>\n---\n lib/vhost/vhost.h | 10 +++++-----\n lib/vhost/vhost_user.c | 24 ++++++++++++------------\n lib/vhost/virtio_net.c | 11 ++++++-----\n 3 files changed, 23 insertions(+), 22 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex d246538ca5..9521ae56da 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -354,7 +354,7 @@ struct vring_packed_desc_event {\n \n struct guest_page {\n \tuint64_t guest_phys_addr;\n-\tuint64_t host_phys_addr;\n+\tuint64_t host_iova;\n \tuint64_t host_user_addr;\n \tuint64_t size;\n };\n@@ -605,13 +605,13 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,\n \t\t\tif (gpa + gpa_size <=\n \t\t\t\t\tpage->guest_phys_addr + page->size) {\n \t\t\t\treturn gpa - page->guest_phys_addr +\n-\t\t\t\t\tpage->host_phys_addr;\n+\t\t\t\t\tpage->host_iova;\n \t\t\t} else if (gpa < page->guest_phys_addr +\n \t\t\t\t\t\tpage->size) {\n \t\t\t\t*hpa_size = page->guest_phys_addr +\n \t\t\t\t\tpage->size - gpa;\n \t\t\t\treturn gpa - page->guest_phys_addr +\n-\t\t\t\t\tpage->host_phys_addr;\n+\t\t\t\t\tpage->host_iova;\n \t\t\t}\n \t\t}\n \t} else {\n@@ -622,13 +622,13 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,\n \t\t\t\tif (gpa + gpa_size <=\n \t\t\t\t\tpage->guest_phys_addr + page->size) {\n \t\t\t\t\treturn gpa - page->guest_phys_addr +\n-\t\t\t\t\t\tpage->host_phys_addr;\n+\t\t\t\t\t\tpage->host_iova;\n \t\t\t\t} else if (gpa < page->guest_phys_addr +\n \t\t\t\t\t\t\tpage->size) {\n \t\t\t\t\t*hpa_size = page->guest_phys_addr +\n \t\t\t\t\t\tpage->size - gpa;\n \t\t\t\t\treturn gpa - page->guest_phys_addr +\n-\t\t\t\t\t\tpage->host_phys_addr;\n+\t\t\t\t\t\tpage->host_iova;\n \t\t\t\t}\n \t\t\t}\n \t\t}\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex 6d888766b0..e2e56308b9 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -154,7 +154,7 @@ async_dma_map(struct virtio_net *dev, bool do_map)\n \t\t\tpage = &dev->guest_pages[i];\n \t\t\tret = rte_vfio_container_dma_map(RTE_VFIO_DEFAULT_CONTAINER_FD,\n \t\t\t\t\t\t\t page->host_user_addr,\n-\t\t\t\t\t\t\t page->host_phys_addr,\n+\t\t\t\t\t\t\t page->host_iova,\n \t\t\t\t\t\t\t page->size);\n \t\t\tif (ret) {\n \t\t\t\t/*\n@@ -182,7 +182,7 @@ async_dma_map(struct virtio_net *dev, bool do_map)\n \t\t\tpage = &dev->guest_pages[i];\n \t\t\tret = rte_vfio_container_dma_unmap(RTE_VFIO_DEFAULT_CONTAINER_FD,\n \t\t\t\t\t\t\t page->host_user_addr,\n-\t\t\t\t\t\t\t page->host_phys_addr,\n+\t\t\t\t\t\t\t page->host_iova,\n \t\t\t\t\t\t\t page->size);\n \t\t\tif (ret) {\n \t\t\t\t/* like DMA map, ignore the kernel driver case when unmap. */\n@@ -977,7 +977,7 @@ vhost_user_set_vring_base(struct virtio_net **pdev,\n \n static int\n add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\n-\t\t uint64_t host_phys_addr, uint64_t host_user_addr, uint64_t size)\n+\t\t uint64_t host_iova, uint64_t host_user_addr, uint64_t size)\n {\n \tstruct guest_page *page, *last_page;\n \tstruct guest_page *old_pages;\n@@ -998,7 +998,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\n \tif (dev->nr_guest_pages > 0) {\n \t\tlast_page = &dev->guest_pages[dev->nr_guest_pages - 1];\n \t\t/* merge if the two pages are continuous */\n-\t\tif (host_phys_addr == last_page->host_phys_addr + last_page->size\n+\t\tif (host_iova == last_page->host_iova + last_page->size\n \t\t && guest_phys_addr == last_page->guest_phys_addr + last_page->size\n \t\t && host_user_addr == last_page->host_user_addr + last_page->size) {\n \t\t\tlast_page->size += size;\n@@ -1008,7 +1008,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\n \n \tpage = &dev->guest_pages[dev->nr_guest_pages++];\n \tpage->guest_phys_addr = guest_phys_addr;\n-\tpage->host_phys_addr = host_phys_addr;\n+\tpage->host_iova = host_iova;\n \tpage->host_user_addr = host_user_addr;\n \tpage->size = size;\n \n@@ -1022,14 +1022,14 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,\n \tuint64_t reg_size = reg->size;\n \tuint64_t host_user_addr = reg->host_user_addr;\n \tuint64_t guest_phys_addr = reg->guest_phys_addr;\n-\tuint64_t host_phys_addr;\n+\tuint64_t host_iova;\n \tuint64_t size;\n \n-\thost_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr);\n+\thost_iova = rte_mem_virt2iova((void *)(uintptr_t)host_user_addr);\n \tsize = page_size - (guest_phys_addr & (page_size - 1));\n \tsize = RTE_MIN(size, reg_size);\n \n-\tif (add_one_guest_page(dev, guest_phys_addr, host_phys_addr,\n+\tif (add_one_guest_page(dev, guest_phys_addr, host_iova,\n \t\t\t host_user_addr, size) < 0)\n \t\treturn -1;\n \n@@ -1039,9 +1039,9 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,\n \n \twhile (reg_size > 0) {\n \t\tsize = RTE_MIN(reg_size, page_size);\n-\t\thost_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)\n+\t\thost_iova = rte_mem_virt2iova((void *)(uintptr_t)\n \t\t\t\t\t\t host_user_addr);\n-\t\tif (add_one_guest_page(dev, guest_phys_addr, host_phys_addr,\n+\t\tif (add_one_guest_page(dev, guest_phys_addr, host_iova,\n \t\t\t\t host_user_addr, size) < 0)\n \t\t\treturn -1;\n \n@@ -1073,11 +1073,11 @@ dump_guest_pages(struct virtio_net *dev)\n \t\tVHOST_LOG_CONFIG(INFO,\n \t\t\t\"guest physical page region %u\\n\"\n \t\t\t\"\\t guest_phys_addr: %\" PRIx64 \"\\n\"\n-\t\t\t\"\\t host_phys_addr : %\" PRIx64 \"\\n\"\n+\t\t\t\"\\t host_iova : %\" PRIx64 \"\\n\"\n \t\t\t\"\\t size : %\" PRIx64 \"\\n\",\n \t\t\ti,\n \t\t\tpage->guest_phys_addr,\n-\t\t\tpage->host_phys_addr,\n+\t\t\tpage->host_iova,\n \t\t\tpage->size);\n \t}\n }\ndiff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c\nindex b3d954aab4..226dcc8b18 100644\n--- a/lib/vhost/virtio_net.c\n+++ b/lib/vhost/virtio_net.c\n@@ -870,20 +870,21 @@ async_mbuf_to_desc_seg(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \tstruct vhost_async *async = vq->async;\n \tuint64_t mapped_len;\n \tuint32_t buf_offset = 0;\n-\tvoid *hpa;\n+\tvoid *host_iova;\n \n \twhile (cpy_len) {\n-\t\thpa = (void *)(uintptr_t)gpa_to_first_hpa(dev,\n+\t\thost_iova = (void *)(uintptr_t)gpa_to_first_hpa(dev,\n \t\t\t\tbuf_iova + buf_offset, cpy_len, &mapped_len);\n-\t\tif (unlikely(!hpa)) {\n-\t\t\tVHOST_LOG_DATA(ERR, \"(%d) %s: failed to get hpa.\\n\", dev->vid, __func__);\n+\t\tif (unlikely(!host_iova)) {\n+\t\t\tVHOST_LOG_DATA(ERR, \"(%d) %s: failed to get host iova.\\n\",\n+\t\t\t\t dev->vid, __func__);\n \t\t\treturn -1;\n \t\t}\n \n \t\tif (unlikely(async_iter_add_iovec(async,\n \t\t\t\t\t\t(void *)(uintptr_t)rte_pktmbuf_iova_offset(m,\n \t\t\t\t\t\t\tmbuf_offset),\n-\t\t\t\t\t\thpa, (size_t)mapped_len)))\n+\t\t\t\t\t\thost_iova, (size_t)mapped_len)))\n \t\t\treturn -1;\n \n \t\tcpy_len -= (uint32_t)mapped_len;\n", "prefixes": [] }