Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/104168/?format=api
{ "id": 104168, "url": "http://patchwork.dpdk.org/api/patches/104168/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20211111062725.108297-1-yuanx.wang@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": "<20211111062725.108297-1-yuanx.wang@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20211111062725.108297-1-yuanx.wang@intel.com", "date": "2021-11-11T06:27:25", "name": "vhost: fix get hpa fail from guest pages", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3428928ba1b3c0110906e0df17b69172f98134ee", "submitter": { "id": 2087, "url": "http://patchwork.dpdk.org/api/people/2087/?format=api", "name": "Wang, YuanX", "email": "yuanx.wang@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/20211111062725.108297-1-yuanx.wang@intel.com/mbox/", "series": [ { "id": 20481, "url": "http://patchwork.dpdk.org/api/series/20481/?format=api", "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=20481", "date": "2021-11-11T06:27:25", "name": "vhost: fix get hpa fail from guest pages", "version": 1, "mbox": "http://patchwork.dpdk.org/series/20481/mbox/" } ], "comments": "http://patchwork.dpdk.org/api/patches/104168/comments/", "check": "success", "checks": "http://patchwork.dpdk.org/api/patches/104168/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 E93C7A034F;\n\tThu, 11 Nov 2021 07:39:32 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 6D13E40E2D;\n\tThu, 11 Nov 2021 07:39:32 +0100 (CET)", "from mga01.intel.com (mga01.intel.com [192.55.52.88])\n by mails.dpdk.org (Postfix) with ESMTP id 6EC1640E03\n for <dev@dpdk.org>; Thu, 11 Nov 2021 07:39:30 +0100 (CET)", "from orsmga008.jf.intel.com ([10.7.209.65])\n by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Nov 2021 22:39:29 -0800", "from unknown (HELO localhost.localdomain) ([10.240.183.50])\n by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 10 Nov 2021 22:39:25 -0800" ], "X-IronPort-AV": [ "E=McAfee;i=\"6200,9189,10164\"; a=\"256562506\"", "E=Sophos;i=\"5.87,225,1631602800\"; d=\"scan'208\";a=\"256562506\"", "E=Sophos;i=\"5.87,225,1631602800\"; d=\"scan'208\";a=\"504301308\"" ], "From": "Yuan Wang <yuanx.wang@intel.com>", "To": "maxime.coquelin@redhat.com,\n\tchenbo.xia@intel.com", "Cc": "dev@dpdk.org, jiayu.hu@intel.com, xuan.ding@intel.com,\n wenwux.ma@intel.com,\n xingguang.he@intel.com, yvonnex.yang@intel.com, yuanx.wang@intel.com", "Subject": "[PATCH] vhost: fix get hpa fail from guest pages", "Date": "Thu, 11 Nov 2021 06:27:25 +0000", "Message-Id": "<20211111062725.108297-1-yuanx.wang@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": "When processing front-end memory regions messages,\nvhost saves the guest/host physical address mappings to guest pages\nand merges adjacent contiguous pages if hpa is contiguous,\nhowever gpa is likely not contiguous in PA mode\nand merging will cause the gpa range to change.\nThis patch distinguishes the case of discontinuous gpa\nand does a range lookup on gpa when doing a binary search.\n\nFixes: e246896178e(\"vhost: get guest/host physical address mappings\")\nFixes: 6563cf92380 (\"vhost: fix async copy on multi-page buffers\")\n\nSigned-off-by: Yuan Wang <yuanx.wang@intel.com>\n---\n lib/vhost/vhost.h | 18 ++++++++++++++++--\n lib/vhost/vhost_user.c | 15 +++++++++++----\n 2 files changed, 27 insertions(+), 6 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex 7085e0885c..b3f0c1d07c 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -587,6 +587,20 @@ static __rte_always_inline int guest_page_addrcmp(const void *p1,\n \treturn 0;\n }\n \n+static __rte_always_inline int guest_page_rangecmp(const void *p1, const void *p2)\n+{\n+\tconst struct guest_page *page1 = (const struct guest_page *)p1;\n+\tconst struct guest_page *page2 = (const struct guest_page *)p2;\n+\n+\tif (page1->guest_phys_addr >= page2->guest_phys_addr) {\n+\t\tif (page1->guest_phys_addr < page2->guest_phys_addr + page2->size)\n+\t\t\treturn 0;\n+\t\telse\n+\t\t\treturn 1;\n+\t} else\n+\t\treturn -1;\n+}\n+\n static __rte_always_inline rte_iova_t\n gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,\n \tuint64_t gpa_size, uint64_t *hpa_size)\n@@ -597,9 +611,9 @@ gpa_to_first_hpa(struct virtio_net *dev, uint64_t gpa,\n \n \t*hpa_size = gpa_size;\n \tif (dev->nr_guest_pages >= VHOST_BINARY_SEARCH_THRESH) {\n-\t\tkey.guest_phys_addr = gpa & ~(dev->guest_pages[0].size - 1);\n+\t\tkey.guest_phys_addr = gpa;\n \t\tpage = bsearch(&key, dev->guest_pages, dev->nr_guest_pages,\n-\t\t\t sizeof(struct guest_page), guest_page_addrcmp);\n+\t\t\t sizeof(struct guest_page), guest_page_rangecmp);\n \t\tif (page) {\n \t\t\tif (gpa + gpa_size <=\n \t\t\t\t\tpage->guest_phys_addr + page->size) {\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex a781346c4d..7d58fde458 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -999,10 +999,17 @@ 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\t\t\t last_page->size) {\n-\t\t\tlast_page->size += size;\n-\t\t\treturn 0;\n+\t\tif (host_phys_addr == last_page->host_phys_addr + last_page->size) {\n+\t\t\tif (rte_eal_iova_mode() == RTE_IOVA_VA) {\n+\t\t\t\tlast_page->size += size;\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\n+\t\t\tif (rte_eal_iova_mode() == RTE_IOVA_PA &&\n+\t\t\t\tguest_phys_addr == last_page->guest_phys_addr + last_page->size) {\n+\t\t\t\tlast_page->size += size;\n+\t\t\t\treturn 0;\n+\t\t\t}\n \t\t}\n \t}\n \n", "prefixes": [] }