From nobody Fri May 3 19:15:22 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1513269543107390.9351636458366; Thu, 14 Dec 2017 08:39:03 -0800 (PST) Received: from localhost ([::1]:41871 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePWWw-0001Mz-1n for importer@patchew.org; Thu, 14 Dec 2017 11:38:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePWVO-0000Uy-Gj for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePWVL-0001xj-99 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:06 -0500 Received: from [45.249.212.32] (port=34850 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePWVK-0001tN-LS for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:03 -0500 Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 3F30B86E1B291; Fri, 15 Dec 2017 00:36:46 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.361.1; Fri, 15 Dec 2017 00:36:41 +0800 From: Jay Zhou To: , Date: Fri, 15 Dec 2017 00:36:31 +0800 Message-ID: <1513269392-23224-2-git-send-email-jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com> References: <1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.32 Subject: [Qemu-devel] [PATCH 1/2] vhost: add used memslot number for vhost-user 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: wangxinxin.wang@huawei.com, arei.gonglei@huawei.com, weidong.huang@huawei.com, gary.liuzhe@huawei.com, jianjay.zhou@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Used_memslots is equal to dev->mem->nregions now, it is true for vhost kernel, but not for vhost user, which uses the memory regions that have file descriptor. In fact, not all of the memory regions have file descriptor. It is usefully in some scenarios, e.g. used_memslots is 8, and only 5 memory slots can be used by vhost user, it is failed to hot plug a new memory RAM because vhost_has_free_slot just returned false, but we can hot plug it safely in fact. Signed-off-by: Jay Zhou Signed-off-by: Zhe Liu --- hw/virtio/vhost-user.c | 31 +++++++++++++++++++++++++++++++ hw/virtio/vhost.c | 25 +++++++++++++++++++++---- include/hw/virtio/vhost-backend.h | 4 ++++ 3 files changed, 56 insertions(+), 4 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 093675e..58a4cec 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -122,6 +122,8 @@ static VhostUserMsg m __attribute__ ((unused)); /* The version of the protocol we support */ #define VHOST_USER_VERSION (0x1) =20 +static unsigned int vhost_user_used_memslots; + struct vhost_user { CharBackend *chr; int slave_fd; @@ -922,6 +924,33 @@ static void vhost_user_set_iotlb_callback(struct vhost= _dev *dev, int enabled) /* No-op as the receive channel is not dedicated to IOTLB messages. */ } =20 +static void vhost_user_set_used_memslots(struct vhost_dev *dev) +{ + int counter =3D 0; + int i; + + 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; + int fd; + + 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) { + counter++; + } + } + vhost_user_used_memslots =3D counter; +} + +static unsigned int vhost_user_get_used_memslots(void) +{ + return vhost_user_used_memslots; +} + const VhostOps user_ops =3D { .backend_type =3D VHOST_BACKEND_TYPE_USER, .vhost_backend_init =3D vhost_user_init, @@ -948,4 +977,6 @@ const VhostOps user_ops =3D { .vhost_net_set_mtu =3D vhost_user_net_set_mtu, .vhost_set_iotlb_callback =3D vhost_user_set_iotlb_callback, .vhost_send_device_iotlb_msg =3D vhost_user_send_device_iotlb_msg, + .vhost_set_used_memslots =3D vhost_user_set_used_memslots, + .vhost_get_used_memslots =3D vhost_user_get_used_memslots, }; diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index e4290ce..0cf8a53 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -49,14 +49,21 @@ static QLIST_HEAD(, vhost_dev) vhost_devices =3D =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_get_used_memslots) { + if (hdev->vhost_ops->vhost_get_used_memslots() >=3D r) { + return false; + } + } else if (used_memslots >=3D r) { + return false; + } } - return slots_limit > used_memslots; + + return true; } =20 static void vhost_dev_sync_region(struct vhost_dev *dev, @@ -607,6 +614,9 @@ static void vhost_set_memory(MemoryListener *listener, 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; + if (dev->vhost_ops->vhost_set_used_memslots) { + dev->vhost_ops->vhost_set_used_memslots(dev); + } } =20 static bool vhost_section(MemoryRegionSection *section) @@ -1239,6 +1249,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaq= ue, uint64_t features; int i, r, n_initialized_vqs =3D 0; Error *local_err =3D NULL; + unsigned int n_memslots =3D 0; =20 hdev->vdev =3D NULL; hdev->migration_blocker =3D NULL; @@ -1251,7 +1262,13 @@ 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= )) { + if (hdev->vhost_ops->vhost_get_used_memslots) { + n_memslots =3D hdev->vhost_ops->vhost_get_used_memslots(); + } else { + n_memslots =3D used_memslots; + } + + if (n_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; diff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-ba= ckend.h index a7a5f22..19961b5 100644 --- a/include/hw/virtio/vhost-backend.h +++ b/include/hw/virtio/vhost-backend.h @@ -84,6 +84,8 @@ typedef void (*vhost_set_iotlb_callback_op)(struct vhost_= dev *dev, int enabled); typedef int (*vhost_send_device_iotlb_msg_op)(struct vhost_dev *dev, struct vhost_iotlb_msg *imsg= ); +typedef void (*vhost_set_used_memslots_op)(struct vhost_dev *dev); +typedef unsigned int (*vhost_get_used_memslots_op)(void); =20 typedef struct VhostOps { VhostBackendType backend_type; @@ -118,6 +120,8 @@ typedef struct VhostOps { vhost_vsock_set_running_op vhost_vsock_set_running; vhost_set_iotlb_callback_op vhost_set_iotlb_callback; vhost_send_device_iotlb_msg_op vhost_send_device_iotlb_msg; + vhost_set_used_memslots_op vhost_set_used_memslots; + vhost_get_used_memslots_op vhost_get_used_memslots; } VhostOps; =20 extern const VhostOps user_ops; --=20 1.8.3.1 From nobody Fri May 3 19:15:22 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 1513269530399243.82329950078463; Thu, 14 Dec 2017 08:38:50 -0800 (PST) Received: from localhost ([::1]:41872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePWWy-0001Oc-Le for importer@patchew.org; Thu, 14 Dec 2017 11:38:44 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36315) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePWVO-0000Uz-NT for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePWVL-0001y5-DG for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:06 -0500 Received: from szxga04-in.huawei.com ([45.249.212.190]:2120 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ePWVL-0001vQ-1l for qemu-devel@nongnu.org; Thu, 14 Dec 2017 11:37:03 -0500 Received: from DGGEMS408-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 88ACCB60D2DB1; Fri, 15 Dec 2017 00:36:48 +0800 (CST) Received: from localhost (10.177.19.14) by DGGEMS408-HUB.china.huawei.com (10.3.19.208) with Microsoft SMTP Server id 14.3.361.1; Fri, 15 Dec 2017 00:36:42 +0800 From: Jay Zhou To: , Date: Fri, 15 Dec 2017 00:36:32 +0800 Message-ID: <1513269392-23224-3-git-send-email-jianjay.zhou@huawei.com> X-Mailer: git-send-email 2.6.1.windows.1 In-Reply-To: <1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com> References: <1513269392-23224-1-git-send-email-jianjay.zhou@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.19.14] X-CFilter-Loop: Reflected X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 45.249.212.190 Subject: [Qemu-devel] [PATCH 2/2] vhost: double check memslot number 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: wangxinxin.wang@huawei.com, arei.gonglei@huawei.com, weidong.huang@huawei.com, gary.liuzhe@huawei.com, jianjay.zhou@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" If the VM already has N(N>=3D8) available memory slots for vhost user, the VM will be crashed in vhost_user_set_mem_table if we try to hotplug the first vhost user NIC. This patch checks if memslot number exceeded or not after updating vhost_user_used_memslots. Signed-off-by: Jay Zhou --- hw/virtio/vhost.c | 40 ++++++++++++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 0cf8a53..33aed1f 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1243,13 +1243,31 @@ static void vhost_virtqueue_cleanup(struct vhost_vi= rtqueue *vq) event_notifier_cleanup(&vq->masked_notifier); } =20 +static bool vhost_dev_memslots_is_exceeded(struct vhost_dev *hdev) +{ + unsigned int n_memslots =3D 0; + + if (hdev->vhost_ops->vhost_get_used_memslots) { + n_memslots =3D hdev->vhost_ops->vhost_get_used_memslots(); + } else { + n_memslots =3D used_memslots; + } + + if (n_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"); + return true; + } + + return false; +} + int vhost_dev_init(struct vhost_dev *hdev, void *opaque, VhostBackendType backend_type, uint32_t busyloop_timeou= t) { uint64_t features; int i, r, n_initialized_vqs =3D 0; Error *local_err =3D NULL; - unsigned int n_memslots =3D 0; =20 hdev->vdev =3D NULL; hdev->migration_blocker =3D NULL; @@ -1262,15 +1280,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, goto fail; } =20 - if (hdev->vhost_ops->vhost_get_used_memslots) { - n_memslots =3D hdev->vhost_ops->vhost_get_used_memslots(); - } else { - n_memslots =3D used_memslots; - } - - if (n_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"); + if (vhost_dev_memslots_is_exceeded(hdev)) { r =3D -1; goto fail; } @@ -1356,6 +1366,16 @@ 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 (vhost_dev_memslots_is_exceeded(hdev)) { + r =3D -1; + if (busyloop_timeout) { + goto fail_busyloop; + } else { + goto fail; + } + } + return 0; =20 fail_busyloop: --=20 1.8.3.1