From nobody Mon Feb 9 19:37:26 2026 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