Re: [dpdk-dev] [PATCH] vhost: fix realloc failure

[Maxime Coquelin]

On 02/09/2018 06:19 PM, Tomasz Kulasek wrote:

When reallocation of guest pages fails, vhost_user_set_mem_table() also
should fail.

Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
Cc:yuanhan@linux.intel.com
Cc:sta...@dpdk.org

Signed-off-by: Ziye Yang
Signed-off-by: Tomasz Kulasek
---
  lib/librte_vhost/vhost_user.c | 29 +++--
  1 file changed, 23 insertions(+), 6 deletions(-)


Reviewed-by: Maxime Coquelin 

and applied to dpdk-next-virtio/master.

Thanks,
Maxime

Re: [dpdk-dev] [PATCH] vhost: fix realloc failure

[Tan, Jianfeng]

> -Original Message-
> From: dev [mailto:dev-boun...@dpdk.org] On Behalf Of Tomasz Kulasek
> Sent: Saturday, February 10, 2018 1:19 AM
> To: y...@fridaylinux.org
> Cc: dev@dpdk.org; yuanhan@linux.intel.com; sta...@dpdk.org; Yang,
> Ziye
> Subject: [dpdk-dev] [PATCH] vhost: fix realloc failure
> 
> When reallocation of guest pages fails, vhost_user_set_mem_table() also
> should fail.
> 
> Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
> Cc: yuanhan@linux.intel.com
> Cc: sta...@dpdk.org
> 
> Signed-off-by: Ziye Yang 
> Signed-off-by: Tomasz Kulasek 

Reviewed-by: Jianfeng Tan 

[dpdk-dev] [PATCH] vhost: fix realloc failure

[Tomasz Kulasek]

When reallocation of guest pages fails, vhost_user_set_mem_table() also
should fail.

Fixes: e246896178e6 ("vhost: get guest/host physical address mappings")
Cc: yuanhan@linux.intel.com
Cc: sta...@dpdk.org

Signed-off-by: Ziye Yang 
Signed-off-by: Tomasz Kulasek 
---
 lib/librte_vhost/vhost_user.c | 29 +++--
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c
index fc1f1a948..4357b88e0 100644
--- a/lib/librte_vhost/vhost_user.c
+++ b/lib/librte_vhost/vhost_user.c
@@ -525,7 +525,7 @@ vhost_user_set_vring_base(struct virtio_net *dev,
return 0;
 }
 
-static void
+static int
 add_one_guest_page(struct virtio_net *dev, uint64_t guest_phys_addr,
   uint64_t host_phys_addr, uint64_t size)
 {
@@ -535,6 +535,10 @@ add_one_guest_page(struct virtio_net *dev, uint64_t 
guest_phys_addr,
dev->max_guest_pages *= 2;
dev->guest_pages = realloc(dev->guest_pages,
dev->max_guest_pages * sizeof(*page));
+   if (!dev->guest_pages) {
+   RTE_LOG(ERR, VHOST_CONFIG, "cannot realloc 
guest_pages\n");
+   return -1;
+   }
}
 
if (dev->nr_guest_pages > 0) {
@@ -543,7 +547,7 @@ add_one_guest_page(struct virtio_net *dev, uint64_t 
guest_phys_addr,
if (host_phys_addr == last_page->host_phys_addr +
  last_page->size) {
last_page->size += size;
-   return;
+   return 0;
}
}
 
@@ -551,9 +555,11 @@ add_one_guest_page(struct virtio_net *dev, uint64_t 
guest_phys_addr,
page->guest_phys_addr = guest_phys_addr;
page->host_phys_addr  = host_phys_addr;
page->size = size;
+
+   return 0;
 }
 
-static void
+static int
 add_guest_pages(struct virtio_net *dev, struct rte_vhost_mem_region *reg,
uint64_t page_size)
 {
@@ -567,7 +573,9 @@ add_guest_pages(struct virtio_net *dev, struct 
rte_vhost_mem_region *reg,
size = page_size - (guest_phys_addr & (page_size - 1));
size = RTE_MIN(size, reg_size);
 
-   add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size);
+   if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size) < 0)
+   return -1;
+
host_user_addr  += size;
guest_phys_addr += size;
reg_size -= size;
@@ -576,12 +584,16 @@ add_guest_pages(struct virtio_net *dev, struct 
rte_vhost_mem_region *reg,
size = RTE_MIN(reg_size, page_size);
host_phys_addr = rte_mem_virt2iova((void *)(uintptr_t)
  host_user_addr);
-   add_one_guest_page(dev, guest_phys_addr, host_phys_addr, size);
+   if (add_one_guest_page(dev, guest_phys_addr, host_phys_addr,
+   size) < 0)
+   return -1;
 
host_user_addr  += size;
guest_phys_addr += size;
reg_size -= size;
}
+
+   return 0;
 }
 
 #ifdef RTE_LIBRTE_VHOST_DEBUG
@@ -734,7 +746,12 @@ vhost_user_set_mem_table(struct virtio_net *dev, struct 
VhostUserMsg *pmsg)
  mmap_offset;
 
if (dev->dequeue_zero_copy)
-   add_guest_pages(dev, reg, alignment);
+   if (add_guest_pages(dev, reg, alignment) < 0) {
+   RTE_LOG(ERR, VHOST_CONFIG,
+   "adding guest pages to region %u 
failed.\n",
+   i);
+   goto err_mmap;
+   }
 
RTE_LOG(INFO, VHOST_CONFIG,
"guest memory region %u, size: 0x%" PRIx64 "\n"
-- 
2.14.1