Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/107673/?format=api
{ "id": 107673, "url": "http://patches.dpdk.org/api/patches/107673/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220216022854.39057-2-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": "<20220216022854.39057-2-xuan.ding@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220216022854.39057-2-xuan.ding@intel.com", "date": "2022-02-16T02:28:53", "name": "[v4,1/2] vhost: fix field naming in guest page struct", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "fdc0c95427b1353f1836c266163ec375e42565cb", "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/20220216022854.39057-2-xuan.ding@intel.com/mbox/", "series": [ { "id": 21689, "url": "http://patches.dpdk.org/api/series/21689/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=21689", "date": "2022-02-16T02:28:52", "name": "vhost: fix async address mapping", "version": 4, "mbox": "http://patches.dpdk.org/series/21689/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/107673/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/107673/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 6052AA00C5;\n\tWed, 16 Feb 2022 03:29:06 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 00D2341142;\n\tWed, 16 Feb 2022 03:29:05 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by mails.dpdk.org (Postfix) with ESMTP id 21C8A4113F;\n Wed, 16 Feb 2022 03:29:02 +0100 (CET)", "from orsmga005.jf.intel.com ([10.7.209.41])\n by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 15 Feb 2022 18:29:02 -0800", "from npg-dpdk-xuan-cbdma.sh.intel.com ([10.67.110.228])\n by orsmga005.jf.intel.com with ESMTP; 15 Feb 2022 18:29:00 -0800" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1644978543; x=1676514543;\n h=from:to:cc:subject:date:message-id:in-reply-to: references;\n bh=UaHR7A5Ub+LQ7wME2pn3tvWoSJPaZ6dIubWN38r3wg4=;\n b=C3cDuEL0yP6tAd1EXNZUlfyRE3iP0TesbLBTuIBC6dsCMm6VrQUZ/7OE\n JPE8K6sEbsmZdtStKY5yTc56Uge7cwjCe6OkzhYIwjMNvPxxd/wG+NHHZ\n wKk7biBt5STZoq84ILz/t6ZQeADJQmQISdijImJZxAIxUZ7sEnwf2Pr/P\n hxMskpf0GN3JN1jQtV2REjAfDxqkD4h5P6aezTQYNwImhtOR2XmuZVg0c\n nKwiHsUlt946TkwI0KykmsnLznXE/rGSW2bhT2zZg0F873U6hvvdPwI3v\n Vt5G8KwasSSF+dYTrv26DibbDtR+ymCOJ0GazI6U1jmZKQ4cCWMyoAord w==;", "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10259\"; a=\"237910978\"", "E=Sophos;i=\"5.88,371,1635231600\"; d=\"scan'208\";a=\"237910978\"", "E=Sophos;i=\"5.88,371,1635231600\"; d=\"scan'208\";a=\"704087821\"" ], "X-ExtLoop1": "1", "From": "xuan.ding@intel.com", "To": "maxime.coquelin@redhat.com,\n\tchenbo.xia@intel.com", "Cc": "dev@dpdk.org, ktraynor@redhat.com, ferruh.yigit@intel.com,\n jiayu.hu@intel.com, yuanx.wang@intel.com, Xuan Ding <xuan.ding@intel.com>,\n stable@dpdk.org", "Subject": "[PATCH v4 1/2] vhost: fix field naming in guest page struct", "Date": "Wed, 16 Feb 2022 02:28:53 +0000", "Message-Id": "<20220216022854.39057-2-xuan.ding@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": "<20220216022854.39057-1-xuan.ding@intel.com>", "References": "<20220114161200.114422-1-xuan.ding@intel.com>\n <20220216022854.39057-1-xuan.ding@intel.com>", "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\nFixes: e246896178e6 (\"vhost: get guest/host physical address mappings\")\nCc: stable@dpdk.org\n\nSigned-off-by: Xuan Ding <xuan.ding@intel.com>\nReviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/vhost/vhost.h | 10 +++++-----\n lib/vhost/vhost_user.c | 20 ++++++++++----------\n lib/vhost/virtio_net.c | 11 ++++++-----\n 3 files changed, 21 insertions(+), 20 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex 1c2ee29600..ccac679c25 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -426,7 +426,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 size;\n };\n \n@@ -689,13 +689,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@@ -706,13 +706,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 1d3f89afd8..066adfb464 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -988,7 +988,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 size)\n+\t\t uint64_t host_iova, uint64_t size)\n {\n \tstruct guest_page *page, *last_page;\n \tstruct guest_page *old_pages;\n@@ -1009,7 +1009,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 +\n+\t\tif (host_iova == last_page->host_iova +\n \t\t\t\t last_page->size) {\n \t\t\tlast_page->size += size;\n \t\t\treturn 0;\n@@ -1018,7 +1018,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->size = size;\n \n \treturn 0;\n@@ -1031,14 +1031,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, size) < 0)\n+\tif (add_one_guest_page(dev, guest_phys_addr, host_iova, size) < 0)\n \t\treturn -1;\n \n \thost_user_addr += size;\n@@ -1047,9 +1047,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\tsize) < 0)\n \t\t\treturn -1;\n \n@@ -1082,8 +1082,8 @@ dump_guest_pages(struct virtio_net *dev)\n \t\t\t\tdev->ifname, i);\n \t\tVHOST_LOG_CONFIG(INFO, \"(%s)\\tguest_phys_addr: %\" PRIx64 \"\\n\",\n \t\t\t\tdev->ifname, page->guest_phys_addr);\n-\t\tVHOST_LOG_CONFIG(INFO, \"(%s)\\thost_phys_addr : %\" PRIx64 \"\\n\",\n-\t\t\t\tdev->ifname, page->host_phys_addr);\n+\t\tVHOST_LOG_CONFIG(INFO, \"(%s)\\thost_iova : %\" PRIx64 \"\\n\",\n+\t\t\t\tdev->ifname, page->host_iova);\n \t\tVHOST_LOG_CONFIG(INFO, \"(%s)\\tsize : %\" PRIx64 \"\\n\",\n \t\t\t\tdev->ifname, page->size);\n \t}\ndiff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c\nindex 886e076b28..5f432b0d77 100644\n--- a/lib/vhost/virtio_net.c\n+++ b/lib/vhost/virtio_net.c\n@@ -1004,20 +1004,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, \"(%s) %s: failed to get hpa.\\n\", dev->ifname, __func__);\n+\t\tif (unlikely(!host_iova)) {\n+\t\t\tVHOST_LOG_DATA(ERR, \"(%s) %s: failed to get host iova.\\n\",\n+\t\t\t\t dev->ifname, __func__);\n \t\t\treturn -1;\n \t\t}\n \n \t\tif (unlikely(async_iter_add_iovec(dev, 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": [ "v4", "1/2" ] }