Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/35096/?format=api
{ "id": 35096, "url": "http://patches.dpdk.org/api/patches/35096/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180209171919.6176-1-tomaszx.kulasek@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": "<20180209171919.6176-1-tomaszx.kulasek@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180209171919.6176-1-tomaszx.kulasek@intel.com", "date": "2018-02-09T17:19:19", "name": "[dpdk-dev] vhost: fix realloc failure", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "f0bdf97485e15b5190aa5b69b8a5824a03408ac9", "submitter": { "id": 155, "url": "http://patches.dpdk.org/api/people/155/?format=api", "name": "Tomasz Kulasek", "email": "tomaszx.kulasek@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/20180209171919.6176-1-tomaszx.kulasek@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/35096/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/35096/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 517CE1B877;\n\tFri, 9 Feb 2018 18:20:38 +0100 (CET)", "from mga11.intel.com (mga11.intel.com [192.55.52.93])\n\tby dpdk.org (Postfix) with ESMTP id 071221B863;\n\tFri, 9 Feb 2018 18:20:35 +0100 (CET)", "from fmsmga001.fm.intel.com ([10.253.24.23])\n\tby fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t09 Feb 2018 09:20:35 -0800", "from unknown (HELO Sent) ([10.103.103.74])\n\tby fmsmga001.fm.intel.com with SMTP; 09 Feb 2018 09:20:32 -0800", "by Sent (sSMTP sendmail emulation); Fri, 09 Feb 2018 18:19:28 +0100" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.46,483,1511856000\"; d=\"scan'208\";a=\"29527826\"", "From": "Tomasz Kulasek <tomaszx.kulasek@intel.com>", "To": "yliu@fridaylinux.org", "Cc": "dev@dpdk.org, yuanhan.liu@linux.intel.com, stable@dpdk.org,\n\tZiye Yang <ziye.yang@intel.com>", "Date": "Fri, 9 Feb 2018 18:19:19 +0100", "Message-Id": "<20180209171919.6176-1-tomaszx.kulasek@intel.com>", "X-Mailer": "git-send-email 2.12.3", "Subject": "[dpdk-dev] [PATCH] vhost: fix realloc failure", "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://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "When reallocation of guest pages fails, vhost_user_set_mem_table() also\nshould fail.\n\nFixes: e246896178e6 (\"vhost: get guest/host physical address mappings\")\nCc: yuanhan.liu@linux.intel.com\nCc: stable@dpdk.org\n\nSigned-off-by: Ziye Yang <ziye.yang@intel.com>\nSigned-off-by: Tomasz Kulasek <tomaszx.kulasek@intel.com>\n---\n lib/librte_vhost/vhost_user.c | 29 +++++++++++++++++++++++------\n 1 file changed, 23 insertions(+), 6 deletions(-)", "diff": "diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex fc1f1a948..4357b88e0 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -525,7 +525,7 @@ vhost_user_set_vring_base(struct virtio_net *dev,\n \treturn 0;\n }\n \n-static void\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 {\n@@ -535,6 +535,10 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\n \t\tdev->max_guest_pages *= 2;\n \t\tdev->guest_pages = realloc(dev->guest_pages,\n \t\t\t\t\tdev->max_guest_pages * sizeof(*page));\n+\t\tif (!dev->guest_pages) {\n+\t\t\tRTE_LOG(ERR, VHOST_CONFIG, \"cannot realloc guest_pages\\n\");\n+\t\t\treturn -1;\n+\t\t}\n \t}\n \n \tif (dev->nr_guest_pages > 0) {\n@@ -543,7 +547,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\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;\n+\t\t\treturn 0;\n \t\t}\n \t}\n \n@@ -551,9 +555,11 @@ add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,\n \tpage->guest_phys_addr = guest_phys_addr;\n \tpage->host_phys_addr = host_phys_addr;\n \tpage->size = size;\n+\n+\treturn 0;\n }\n \n-static void\n+static int\n add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,\n \t\tuint64_t page_size)\n {\n@@ -567,7 +573,9 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,\n \tsize = page_size - (guest_phys_addr & (page_size - 1));\n \tsize = RTE_MIN(size, reg_size);\n \n-\tadd_one_guest_page(dev, guest_phys_addr, host_phys_addr, size);\n+\tif (add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size) < 0)\n+\t\treturn -1;\n+\n \thost_user_addr += size;\n \tguest_phys_addr += size;\n \treg_size -= size;\n@@ -576,12 +584,16 @@ add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,\n \t\tsize = RTE_MIN(reg_size, page_size);\n \t\thost_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)\n \t\t\t\t\t\t host_user_addr);\n-\t\tadd_one_guest_page(dev, guest_phys_addr, host_phys_addr, size);\n+\t\tif (add_one_guest_page(dev, guest_phys_addr, host_phys_addr,\n+\t\t\t\tsize) < 0)\n+\t\t\treturn -1;\n \n \t\thost_user_addr += size;\n \t\tguest_phys_addr += size;\n \t\treg_size -= size;\n \t}\n+\n+\treturn 0;\n }\n \n #ifdef RTE_LIBRTE_VHOST_DEBUG\n@@ -734,7 +746,12 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct VhostUserMsg *pmsg)\n \t\t\t\t mmap_offset;\n \n \t\tif (dev->dequeue_zero_copy)\n-\t\t\tadd_guest_pages(dev, reg, alignment);\n+\t\t\tif (add_guest_pages(dev, reg, alignment) < 0) {\n+\t\t\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\t\t\"adding guest pages to region %u failed.\\n\",\n+\t\t\t\t\ti);\n+\t\t\t\tgoto err_mmap;\n+\t\t\t}\n \n \t\tRTE_LOG(INFO, VHOST_CONFIG,\n \t\t\t\"guest memory region %u, size: 0x%\" PRIx64 \"\\n\"\n", "prefixes": [ "dpdk-dev" ] }