From nobody Thu May 2 20:12:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151660458455225.397911829223858; Sun, 21 Jan 2018 23:03:04 -0800 (PST) Received: from localhost ([::1]:51134 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edW8F-0000Rg-Sy for importer@patchew.org; Mon, 22 Jan 2018 02:03:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edW4j-0006pE-Uu for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edW4f-0001rs-Ac for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:26 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:2249 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edW4e-0001lw-VZ for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:21 -0500 Received: from DGGEMS414-HUB.china.huawei.com (unknown [10.3.19.214]) by Forcepoint Email with ESMTP id B0794CF8DD8A3; Mon, 22 Jan 2018 14:59:15 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.361.1; Mon, 22 Jan 2018 14:59:09 +0800 From: Jay Zhou To: Date: Mon, 22 Jan 2018 14:57:49 +0800 Message-ID: X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.189 Subject: [Qemu-devel] [PATCH v7 1/2] vhost: fix memslot limit check X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, mst@redhat.com, wangxinxin.wang@huawei.com, arei.gonglei@huawei.com, jianjay.zhou@huawei.com, imammedo@redhat.com, liuzhe13@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since used_memslots will be updated to the actual value after registering memory listener for the first time, move the memslots limit checking to the right place. Reviewed-by: Igor Mammedov Signed-off-by: Jay Zhou --- hw/virtio/vhost.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 386aef8..1ac512e 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1251,13 +1251,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, goto fail; } =20 - if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev= )) { - error_report("vhost backend memory slots limit is less" - " than current number of present memory slots"); - r =3D -1; - goto fail; - } - r =3D hdev->vhost_ops->vhost_set_owner(hdev); if (r < 0) { VHOST_OPS_DEBUG("vhost_set_owner failed"); @@ -1339,6 +1332,18 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, hdev->memory_changed =3D false; memory_listener_register(&hdev->memory_listener, &address_space_memory= ); QLIST_INSERT_HEAD(&vhost_devices, hdev, entry); + + if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev= )) { + error_report("vhost backend memory slots limit is less" + " than current number of present memory slots"); + r =3D -1; + if (busyloop_timeout) { + goto fail_busyloop; + } else { + goto fail; + } + } + return 0; =20 fail_busyloop: --=20 1.8.3.1 From nobody Thu May 2 20:12:28 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151660446453948.37808903526002; Sun, 21 Jan 2018 23:01:04 -0800 (PST) Received: from localhost ([::1]:51059 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edW6B-0007Zn-Jz for importer@patchew.org; Mon, 22 Jan 2018 02:00:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60754) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1edW4k-0006pI-Lz for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1edW4f-0001sy-Vi for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:26 -0500 Received: from szxga01-in.huawei.com ([45.249.212.187]:2372 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1edW4f-0001p1-5C for qemu-devel@nongnu.org; Mon, 22 Jan 2018 01:59:21 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [10.3.19.205]) by Forcepoint Email with ESMTP id 89EC6BFE94E53; Mon, 22 Jan 2018 14:59:16 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Mon, 22 Jan 2018 14:59:10 +0800 From: Jay Zhou To: Date: Mon, 22 Jan 2018 14:57:50 +0800 Message-ID: <3002cd24d55e40b9afbacdd9f9e83183cba8a698.1516527761.git.jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: References: MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.187 Subject: [Qemu-devel] [PATCH v7 2/2] vhost: used_memslots refactoring X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: weidong.huang@huawei.com, mst@redhat.com, wangxinxin.wang@huawei.com, arei.gonglei@huawei.com, jianjay.zhou@huawei.com, imammedo@redhat.com, liuzhe13@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Used_memslots is shared by vhost kernel and user, it is equal to dev->mem->nregions, which is correct for vhost kernel, but not for vhost user, the latter one uses memory regions that have file descriptor. E.g. a VM has a vhost-user NIC and 8(vhost user memslot upper limit) memory slots, it will be failed to hotplug a new DIMM device since vhost_has_free_slot() finds no free slot left. It should be successful if only part of memory slots have file descriptor, so setting used memslots for vhost-user and vhost-kernel respectively. Signed-off-by: Igor Mammedov Signed-off-by: Jay Zhou Signed-off-by: Liuzhe --- hw/virtio/vhost-backend.c | 15 +++++++- hw/virtio/vhost-user.c | 77 ++++++++++++++++++++++++++---------= ---- hw/virtio/vhost.c | 13 +++---- include/hw/virtio/vhost-backend.h | 6 ++- 4 files changed, 75 insertions(+), 36 deletions(-) diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 7f09efa..59def69 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -15,6 +15,8 @@ #include "hw/virtio/vhost-backend.h" #include "qemu/error-report.h" =20 +static unsigned int vhost_kernel_used_memslots; + static int vhost_kernel_call(struct vhost_dev *dev, unsigned long int requ= est, void *arg) { @@ -62,6 +64,11 @@ static int vhost_kernel_memslots_limit(struct vhost_dev = *dev) return limit; } =20 +static bool vhost_kernel_has_free_memslots(struct vhost_dev *dev) +{ + return vhost_kernel_used_memslots < vhost_kernel_memslots_limit(dev); +} + static int vhost_kernel_net_set_backend(struct vhost_dev *dev, struct vhost_vring_file *file) { @@ -233,11 +240,16 @@ static void vhost_kernel_set_iotlb_callback(struct vh= ost_dev *dev, qemu_set_fd_handler((uintptr_t)dev->opaque, NULL, NULL, NULL); } =20 +static void vhost_kernel_set_used_memslots(struct vhost_dev *dev) +{ + vhost_kernel_used_memslots =3D dev->mem->nregions; +} + static const VhostOps kernel_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_KERNEL, .vhost_backend_init =3D vhost_kernel_init, .vhost_backend_cleanup =3D vhost_kernel_cleanup, - .vhost_backend_memslots_limit =3D vhost_kernel_memslots_limit, + .vhost_backend_has_free_memslots =3D vhost_kernel_has_free_memslot= s, .vhost_net_set_backend =3D vhost_kernel_net_set_backend, .vhost_scsi_set_endpoint =3D vhost_kernel_scsi_set_endpoint, .vhost_scsi_clear_endpoint =3D vhost_kernel_scsi_clear_endpoint, @@ -264,6 +276,7 @@ static const VhostOps kernel_ops =3D { #endif /* CONFIG_VHOST_VSOCK */ .vhost_set_iotlb_callback =3D vhost_kernel_set_iotlb_callback, .vhost_send_device_iotlb_msg =3D vhost_kernel_send_device_iotlb_ms= g, + .vhost_set_used_memslots =3D vhost_kernel_set_used_memslots, }; =20 int vhost_set_backend_type(struct vhost_dev *dev, VhostBackendType backend= _type) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 6eb9798..f732c80 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -147,6 +147,8 @@ static VhostUserMsg m __attribute__ ((unused)); /* The version of the protocol we support */ #define VHOST_USER_VERSION (0x1) =20 +static bool vhost_user_free_memslots =3D true; + struct vhost_user { CharBackend *chr; int slave_fd; @@ -314,12 +316,43 @@ static int vhost_user_set_log_base(struct vhost_dev *= dev, uint64_t base, return 0; } =20 +static int vhost_user_prepare_msg(struct vhost_dev *dev, VhostUserMemory *= mem, + int *fds) +{ + int i, fd; + + vhost_user_free_memslots =3D true; + for (i =3D 0, mem->nregions =3D 0; i < dev->mem->nregions; ++i) { + struct vhost_memory_region *reg =3D dev->mem->regions + i; + ram_addr_t offset; + MemoryRegion *mr; + + assert((uintptr_t)reg->userspace_addr =3D=3D reg->userspace_addr); + mr =3D memory_region_from_host((void *)(uintptr_t)reg->userspace_a= ddr, + &offset); + fd =3D memory_region_get_fd(mr); + if (fd > 0) { + if (mem->nregions =3D=3D VHOST_MEMORY_MAX_NREGIONS) { + vhost_user_free_memslots =3D false; + return -1; + } + + mem->regions[mem->nregions].userspace_addr =3D reg->userspace_= addr; + mem->regions[mem->nregions].memory_size =3D reg->memory_size; + mem->regions[mem->nregions].guest_phys_addr =3D reg->guest_phy= s_addr; + mem->regions[mem->nregions].mmap_offset =3D offset; + fds[mem->nregions++] =3D fd; + } + } + + return 0; +} + static int vhost_user_set_mem_table(struct vhost_dev *dev, struct vhost_memory *mem) { int fds[VHOST_MEMORY_MAX_NREGIONS]; - int i, fd; - size_t fd_num =3D 0; + size_t fd_num; bool reply_supported =3D virtio_has_feature(dev->protocol_features, VHOST_USER_PROTOCOL_F_REPLY_= ACK); =20 @@ -332,29 +365,12 @@ static int vhost_user_set_mem_table(struct vhost_dev = *dev, msg.hdr.flags |=3D VHOST_USER_NEED_REPLY_MASK; } =20 - for (i =3D 0; i < dev->mem->nregions; ++i) { - struct vhost_memory_region *reg =3D dev->mem->regions + i; - ram_addr_t offset; - MemoryRegion *mr; - - assert((uintptr_t)reg->userspace_addr =3D=3D reg->userspace_addr); - mr =3D memory_region_from_host((void *)(uintptr_t)reg->userspace_a= ddr, - &offset); - fd =3D memory_region_get_fd(mr); - if (fd > 0) { - if (fd_num =3D=3D VHOST_MEMORY_MAX_NREGIONS) { - error_report("Failed preparing vhost-user memory table msg= "); - return -1; - } - msg.payload.memory.regions[fd_num].userspace_addr =3D reg->use= rspace_addr; - msg.payload.memory.regions[fd_num].memory_size =3D reg->memor= y_size; - msg.payload.memory.regions[fd_num].guest_phys_addr =3D reg->gu= est_phys_addr; - msg.payload.memory.regions[fd_num].mmap_offset =3D offset; - fds[fd_num++] =3D fd; - } + if (vhost_user_prepare_msg(dev, &msg.payload.memory, fds) < 0) { + error_report("Failed preparing vhost-user memory table msg"); + return -1; } =20 - msg.payload.memory.nregions =3D fd_num; + fd_num =3D msg.payload.memory.nregions; =20 if (!fd_num) { error_report("Failed initializing vhost-user memory map, " @@ -870,9 +886,9 @@ static int vhost_user_get_vq_index(struct vhost_dev *de= v, int idx) return idx; } =20 -static int vhost_user_memslots_limit(struct vhost_dev *dev) +static bool vhost_user_has_free_memslots(struct vhost_dev *dev) { - return VHOST_MEMORY_MAX_NREGIONS; + return vhost_user_free_memslots; } =20 static bool vhost_user_requires_shm_log(struct vhost_dev *dev) @@ -1054,11 +1070,19 @@ static int vhost_user_set_config(struct vhost_dev *= dev, const uint8_t *data, return 0; } =20 +static void vhost_user_set_used_memslots(struct vhost_dev *dev) +{ + int fds[VHOST_MEMORY_MAX_NREGIONS]; + VhostUserMsg msg; + + vhost_user_prepare_msg(dev, &msg.payload.memory, fds); +} + const VhostOps user_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_USER, .vhost_backend_init =3D vhost_user_init, .vhost_backend_cleanup =3D vhost_user_cleanup, - .vhost_backend_memslots_limit =3D vhost_user_memslots_limit, + .vhost_backend_has_free_memslots =3D vhost_user_has_free_memslots, .vhost_set_log_base =3D vhost_user_set_log_base, .vhost_set_mem_table =3D vhost_user_set_mem_table, .vhost_set_vring_addr =3D vhost_user_set_vring_addr, @@ -1082,4 +1106,5 @@ const VhostOps user_ops =3D { .vhost_send_device_iotlb_msg =3D vhost_user_send_device_iotlb_msg, .vhost_get_config =3D vhost_user_get_config, .vhost_set_config =3D vhost_user_set_config, + .vhost_set_used_memslots =3D vhost_user_set_used_memslots, }; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 1ac512e..b6eb72c 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -43,20 +43,19 @@ static struct vhost_log *vhost_log; static struct vhost_log *vhost_log_shm; =20 -static unsigned int used_memslots; static QLIST_HEAD(, vhost_dev) vhost_devices =3D QLIST_HEAD_INITIALIZER(vhost_devices); =20 bool vhost_has_free_slot(void) { - unsigned int slots_limit =3D ~0U; struct vhost_dev *hdev; =20 QLIST_FOREACH(hdev, &vhost_devices, entry) { - unsigned int r =3D hdev->vhost_ops->vhost_backend_memslots_limit(h= dev); - slots_limit =3D MIN(slots_limit, r); + if (!hdev->vhost_ops->vhost_backend_has_free_memslots(hdev)) { + return false; + } } - return slots_limit > used_memslots; + return true; } =20 static void vhost_dev_sync_region(struct vhost_dev *dev, @@ -606,7 +605,7 @@ static void vhost_set_memory(MemoryListener *listener, dev->mem_changed_start_addr =3D MIN(dev->mem_changed_start_addr, start= _addr); dev->mem_changed_end_addr =3D MAX(dev->mem_changed_end_addr, start_add= r + size - 1); dev->memory_changed =3D true; - used_memslots =3D dev->mem->nregions; + dev->vhost_ops->vhost_set_used_memslots(dev); } =20 static bool vhost_section(MemoryRegionSection *section) @@ -1333,7 +1332,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, memory_listener_register(&hdev->memory_listener, &address_space_memory= ); QLIST_INSERT_HEAD(&vhost_devices, hdev, entry); =20 - if (used_memslots > hdev->vhost_ops->vhost_backend_memslots_limit(hdev= )) { + if (!hdev->vhost_ops->vhost_backend_has_free_memslots(hdev)) { error_report("vhost backend memory slots limit is less" " than current number of present memory slots"); r =3D -1; diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-ba= ckend.h index 592254f..2eac224 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -36,7 +36,7 @@ struct vhost_iotlb_msg; =20 typedef int (*vhost_backend_init)(struct vhost_dev *dev, void *opaque); typedef int (*vhost_backend_cleanup)(struct vhost_dev *dev); -typedef int (*vhost_backend_memslots_limit)(struct vhost_dev *dev); +typedef bool (*vhost_backend_has_free_memslots)(struct vhost_dev *dev); =20 typedef int (*vhost_net_set_backend_op)(struct vhost_dev *dev, struct vhost_vring_file *file); @@ -94,12 +94,13 @@ typedef int (*vhost_set_config_op)(struct vhost_dev *de= v, const uint8_t *data, uint32_t flags); typedef int (*vhost_get_config_op)(struct vhost_dev *dev, uint8_t *config, uint32_t config_len); +typedef void (*vhost_set_used_memslots_op)(struct vhost_dev *dev); =20 typedef struct VhostOps { VhostBackendType backend_type; vhost_backend_init vhost_backend_init; vhost_backend_cleanup vhost_backend_cleanup; - vhost_backend_memslots_limit vhost_backend_memslots_limit; + vhost_backend_has_free_memslots vhost_backend_has_free_memslots; vhost_net_set_backend_op vhost_net_set_backend; vhost_net_set_mtu_op vhost_net_set_mtu; vhost_scsi_set_endpoint_op vhost_scsi_set_endpoint; @@ -130,6 +131,7 @@ typedef struct VhostOps { vhost_send_device_iotlb_msg_op vhost_send_device_iotlb_msg; vhost_get_config_op vhost_get_config; vhost_set_config_op vhost_set_config; + vhost_set_used_memslots_op vhost_set_used_memslots; } VhostOps; =20 extern const VhostOps user_ops; --=20 1.8.3.1