From nobody Fri Nov 14 21:03:02 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1760225205; cv=none; d=zohomail.com; s=zohoarc; b=IMjXZohzUMMiRBcOMYVOtaCz+LheUOa+oHX3EICBrFsHpuT1Gcg4fgrB8RpYnHUa6mvH26kok39m8tDsAPEbyantFTuu4qLAVLj8vZdhb7GD+W/wBWOoDCwdLUV/ieq/AyknOqvzBgIZzevh3k96F1LHwt1+HA1KKqxRIW1xYkU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760225205; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=WN5yuwTmhtU1R4aUfiR8bSsIlHXGKve2ZsnRiu3lKQ4=; b=EB3Uh4uFqeYlCj/UOvaUaTyv4fPQGCl1LUdH5i7mAvTGBNaoSjyH2cGagKzv5mIcSiGkR6vVZR9VUsTlBJwwmi9gRKgWAZy0ncpDSOxKS1LtW6RdHe+UTBKBG8EqwrE2Nr4XvjlKv5ccfrXEEMUrWgD2kfixjdXEDzraJ6l0e2Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1760225205789872.1057074133415; Sat, 11 Oct 2025 16:26:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v7iwu-0006Fw-HI; Sat, 11 Oct 2025 19:24:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7iws-0006F0-V0 for qemu-devel@nongnu.org; Sat, 11 Oct 2025 19:24:26 -0400 Received: from forwardcorp1a.mail.yandex.net ([178.154.239.72]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v7iwq-0000uV-Ou for qemu-devel@nongnu.org; Sat, 11 Oct 2025 19:24:26 -0400 Received: from mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net [IPv6:2a02:6b8:c2d:7394:0:640:5a8a:0]) by forwardcorp1a.mail.yandex.net (Yandex) with ESMTPS id 544C2C01DA; Sun, 12 Oct 2025 02:24:23 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:a4b::1:3c]) by mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id 6OWMXt1FjqM0-dLmyNdO4; Sun, 12 Oct 2025 02:24:22 +0300 Precedence: bulk X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1760225062; bh=WN5yuwTmhtU1R4aUfiR8bSsIlHXGKve2ZsnRiu3lKQ4=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=Ua04rSKfwuLK7FDd1r/TJValNMgRcKJqI35LbeF5M51XRQshQkyG+z6SxCo5BXWGl G+5na8b4CWxrbevpSnVCAolyEgWn7bO9Qtc0DxEvEE/+V1xrARWRZzayi96P8Wl9TQ vAucYtiYkNytFfGKnRg5CrutZ3qkP5Q2vqrafO9c= Authentication-Results: mail-nwsmtp-smtp-corp-main-83.vla.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: mst@redhat.com Cc: sgarzare@redhat.com, raphael@enfabrica.net, qemu-devel@nongnu.org, raphael.s.norwitz@gmail.com, vsementsov@yandex-team.ru, yc-core@yandex-team.ru, d-tatianin@yandex-team.ru Subject: [PATCH v2 18/23] vhost: introduce check_memslots() helper Date: Sun, 12 Oct 2025 02:23:57 +0300 Message-ID: <20251011232404.561024-19-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20251011232404.561024-1-vsementsov@yandex-team.ru> References: <20251011232404.561024-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=178.154.239.72; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1a.mail.yandex.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1760225207624154100 Content-Type: text/plain; charset="utf-8" Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Raphael Norwitz --- hw/virtio/vhost.c | 71 ++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index 8ba97c231b..c990029756 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -1572,12 +1572,50 @@ static int vhost_dev_get_features(struct vhost_dev = *hdev, return r; } =20 +static bool check_memslots(struct vhost_dev *hdev, Error **errp) +{ + unsigned int used, reserved, limit; + + limit =3D hdev->vhost_ops->vhost_backend_memslots_limit(hdev); + if (limit < MEMORY_DEVICES_SAFE_MAX_MEMSLOTS && + memory_devices_memslot_auto_decision_active()) { + error_setg(errp, "some memory device (like virtio-mem)" + " decided how many memory slots to use based on the overall" + " number of memory slots; this vhost backend would further" + " restricts the overall number of memory slots"); + error_append_hint(errp, "Try plugging this vhost backend before" + " plugging such memory devices.\n"); + return false; + } + + /* + * The listener we registered properly setup the number of required + * memslots in vhost_commit(). + */ + used =3D hdev->mem->nregions; + + /* + * We assume that all reserved memslots actually require a real memslot + * in our vhost backend. This might not be true, for example, if the + * memslot would be ROM. If ever relevant, we can optimize for that -- + * but we'll need additional information about the reservations. + */ + reserved =3D memory_devices_get_reserved_memslots(); + if (used + reserved > limit) { + error_setg(errp, "vhost backend memory slots limit (%d) is less" + " than current number of used (%d) and reserved (%d)" + " memory slots for memory devices.", limit, used, reser= ved); + return false; + } + + return true; +} + int vhost_dev_init(struct vhost_dev *hdev, void *opaque, VhostBackendType backend_type, uint32_t busyloop_timeou= t, Error **errp) { uint64_t features[VIRTIO_FEATURES_NU64S]; - unsigned int used, reserved, limit; int i, r, n_initialized_vqs =3D 0; =20 hdev->vdev =3D NULL; @@ -1603,19 +1641,6 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, goto fail; } =20 - limit =3D hdev->vhost_ops->vhost_backend_memslots_limit(hdev); - if (limit < MEMORY_DEVICES_SAFE_MAX_MEMSLOTS && - memory_devices_memslot_auto_decision_active()) { - error_setg(errp, "some memory device (like virtio-mem)" - " decided how many memory slots to use based on the overall" - " number of memory slots; this vhost backend would further" - " restricts the overall number of memory slots"); - error_append_hint(errp, "Try plugging this vhost backend before" - " plugging such memory devices.\n"); - r =3D -EINVAL; - goto fail; - } - for (i =3D 0; i < hdev->nvqs; ++i, ++n_initialized_vqs) { r =3D vhost_virtqueue_init(hdev, hdev->vqs + i, hdev->vq_index + i, busyloop_timeout); @@ -1674,23 +1699,7 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opa= que, memory_listener_register(&hdev->memory_listener, &address_space_memory= ); QLIST_INSERT_HEAD(&vhost_devices, hdev, entry); =20 - /* - * The listener we registered properly setup the number of required - * memslots in vhost_commit(). - */ - used =3D hdev->mem->nregions; - - /* - * We assume that all reserved memslots actually require a real memslot - * in our vhost backend. This might not be true, for example, if the - * memslot would be ROM. If ever relevant, we can optimize for that -- - * but we'll need additional information about the reservations. - */ - reserved =3D memory_devices_get_reserved_memslots(); - if (used + reserved > limit) { - error_setg(errp, "vhost backend memory slots limit (%d) is less" - " than current number of used (%d) and reserved (%d)" - " memory slots for memory devices.", limit, used, reser= ved); + if (!check_memslots(hdev, errp)) { r =3D -EINVAL; goto fail; } --=20 2.48.1