From nobody Sun Feb 8 21:09:39 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1770232271; cv=none; d=zohomail.com; s=zohoarc; b=VbEvbEUki0loWQthFEUbRfzW5WsatoPb9EJkv4Q5gTGFDqy4YQT7kXBU/YQeJmrNPoDD1C7jThqfqtwSJ342KtBSmif92A6ZxBWzoN9FX6nzKpfKuzsTA+ReOlj7Ph+X6qlqsYJVNLaJGg40vkS3WQj5/vaLiMDwp21ZVGBHes4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770232271; h=Content-Type: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=YXkScNv7xNrQiajhZNxV5Y+IbqsvARHUNAQ/l/4frxQ=; b=fQB3GHnPh+9f7l80HZtShkaKOgHRBB8VfgAJhAVdPEdDLlwB6IhLihurBlyyhDeh2HHIwEUEMoGcZcapmKcsYCQ0F5Y6Ut5MaKzalPPIl1fdD7QXZk5xD1pf5Vn2VKWcCMf7V+TPFCr3tb7uiNcGJcPs9IfH2CqerYuVyfN7kLA= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177023227113812.725741245518861; Wed, 4 Feb 2026 11:11:11 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vniAV-0008AR-B1; Wed, 04 Feb 2026 14:04:03 -0500 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 1vniAL-0007av-CH for qemu-devel@nongnu.org; Wed, 04 Feb 2026 14:03:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vniAJ-0007vH-QH for qemu-devel@nongnu.org; Wed, 04 Feb 2026 14:03:53 -0500 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-S1kZFgiONg25G7Y9VaoA8Q-1; Wed, 04 Feb 2026 14:03:50 -0500 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-435a6c0c794so179882f8f.2 for ; Wed, 04 Feb 2026 11:03:49 -0800 (PST) Received: from redhat.com (IGLD-80-230-34-155.inter.net.il. [80.230.34.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43617e263b9sm7935042f8f.4.2026.02.04.11.03.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Feb 2026 11:03:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1770231831; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=YXkScNv7xNrQiajhZNxV5Y+IbqsvARHUNAQ/l/4frxQ=; b=Sprhm/1PW5pknAg/m9QSrA/F5rDsJxt18yq7uItgp5Ds0H7Qw0voEGE80AFFXaKHXaBJ0i HvbNv9ItPCDtQ5fa7bIcT3PWp0uXJQM6x7n5/eFIPZxojnlKNbxDCQyZBMymwwuR5KO62z CXp5iQnL3uDzGKUZafO/mFflzXqxUhY= X-MC-Unique: S1kZFgiONg25G7Y9VaoA8Q-1 X-Mimecast-MFC-AGG-ID: S1kZFgiONg25G7Y9VaoA8Q_1770231829 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1770231828; x=1770836628; darn=nongnu.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=YXkScNv7xNrQiajhZNxV5Y+IbqsvARHUNAQ/l/4frxQ=; b=LPAKXDgjm1erUf7SnogR0JqEiNTf5J1IN/aFYdKNxktLhBzqiDxGLMo4oAybgwXPdq ZwgqxWss77OzRHWktxDmTldUdZ3dmtpfIG2s5SfG+0LedmFvL+IOHRJK5SwbLGkhsSor dNRhTk1JPhLSj0ZwPCx72i2ad015ieW3X8+q5YUpMxU+gGE912AfC9uSnhEvwEmbbYj7 9UFC8Z/+67JLfKOS5Gr9aFra509USdgEHB8H0BlmeKfMMM8YILi5CkiV3uJFyPDIwIU2 iIoe7TZ6wrymEJM66PyGNxp9kmr0oiu10wkIwA0iCI01ALHbkmaDPwJ8eWzVs3nHXUDQ QVEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770231828; x=1770836628; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YXkScNv7xNrQiajhZNxV5Y+IbqsvARHUNAQ/l/4frxQ=; b=KI6QsPGcxenKComBdG9mTrPYWFx8T6nl3m1rqmHhWIeq26ThFsLm70g4ZWhv+MJAMt sCXlEtd1RK+ww+hJ+qkp4bTQ56gw7EH5B2/xOzqVU4RFpsOeoYq5DXn6x3P2WBBCsb2t pqFI2WIvFIiKUPff1wSOxx8ERa7RM52IowhGfQ0ysFK8g/C30qlpNBcSoXvUFfUhEk21 3cBGCaFamwqU/1PXY6g7aQlbSiYkBdO6DGjuZ+/iBbHZBNgyRrBoyy3VP2fR0QIiFIxD qo6Q0qkt/WKTUcl4sti4qL0EK6wW+9by4+3F7AUYXAw8QvAp9tlgtiF8S8/7m42Rxkrq HKZw== X-Gm-Message-State: AOJu0YwrS+JFEMnbY3LHDXjbfLVxSENcSZTceFOmUVSOSnVD3AlVu225 B4nWumMt7EQ5orITBRgPU5as+UdhrKKJJnKbkDSIqlYNM7AAkTnefc5BLT/V3v7Dm98iuzGd6BS u9pt2frRvVQIcs6HGrDSXNcA5XL87rknAkYcBpJmM12z9EzeC5ztxYk8X5Bw/Bf+xs4b0szHhCb qteTQpc5FsgBeVkzH4acyCmXXA3IfdYBJr3A== X-Gm-Gg: AZuq6aJXZQwItlXs3jg2++X6btMKAabAyAJJRtsMGnu2puuKjdXYhrACgAcHTrlPjTf sSPOBnraVKt4EeBqYTqr2t6IrdfVndAS6Mnl/03pn64ZzQFghlv821rOKUCqQRufksGr3PZgttf xHUgRXtf/K31tdtKukq3fkMnN+7V0KkI1OVRszZiNt0xEcHnWidtPCJxto2mxss2C2AZJsn7UXl YauC1FxFn+mbQWAcXGV5rr3kMy9l6iT4FY0hpcmhRV/vbT/+7h3dM4yiNOo5LSMvoJRcUrqRQFT KEIZgXiXh/5ZbrQjftu2lVobA5N14YD4JuEXNnu/PvyBuppGknnTp4ZkDJHK0Jovn4ZND8QwBij oeTeQRrLq4Hw286bS0ZuHOxtQHKahfcoAIA== X-Received: by 2002:a05:6000:400b:b0:432:8504:befd with SMTP id ffacd0b85a97d-4361805509dmr5469577f8f.32.1770231828491; Wed, 04 Feb 2026 11:03:48 -0800 (PST) X-Received: by 2002:a05:6000:400b:b0:432:8504:befd with SMTP id ffacd0b85a97d-4361805509dmr5469516f8f.32.1770231827967; Wed, 04 Feb 2026 11:03:47 -0800 (PST) Date: Wed, 4 Feb 2026 14:03:45 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Wafer Xie , Eugenio =?utf-8?B?UMOpcmV6?= , Jason Wang , Stefano Garzarella Subject: [PULL 25/51] vdpa: fix vhost-vdpa suspended state not be shared Message-ID: <707e307a3d30cd04b8fe627fa34254732a9d7caa.1770231744.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.129.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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 Precedence: list List-Id: qemu development 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 @redhat.com) X-ZM-MESSAGEID: 1770232272644154100 From: Wafer Xie When stopping a vhost-vdpa device, only the first queue pair is marked as s= uspended, while the remaining queues are not updated to the suspended state. As a result, when stopping a multi-queue vhost-vdpa device, the following error message will be printed. qemu-system-x86_64:vhost VQ 2 ring restore failed: -1: Operation not permit= ted (1) qemu-system-x86_64:vhost VQ 3 ring restore failed: -1: Operation not permit= ted (1) So move v->suspended to v->shared, and then all the vhost_vdpa devices cann= ot have different suspended states. Fixes: 0bb302a9960a ("vdpa: add vhost_vdpa_suspend") Suggested-by: Eugenio P=C3=A9rez Acked-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Signed-off-by: Wafer Xie Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin Acked-by: Jason Wang Message-Id: <20251119132452.3117-1-wafer@jaguarmicro.com> --- hw/virtio/vhost-vdpa.c | 6 +++--- include/hw/virtio/vhost-vdpa.h | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 7061b6e1a3..2f8f11df86 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -905,7 +905,7 @@ static int vhost_vdpa_reset_device(struct vhost_dev *de= v) =20 memory_listener_unregister(&v->shared->listener); v->shared->listener_registered =3D false; - v->suspended =3D false; + v->shared->suspended =3D false; return 0; } =20 @@ -1354,7 +1354,7 @@ static void vhost_vdpa_suspend(struct vhost_dev *dev) if (unlikely(r)) { error_report("Cannot suspend: %s(%d)", g_strerror(errno), errn= o); } else { - v->suspended =3D true; + v->shared->suspended =3D true; return; } } @@ -1481,7 +1481,7 @@ static int vhost_vdpa_get_vring_base(struct vhost_dev= *dev, return 0; } =20 - if (!v->suspended) { + if (!v->shared->suspended) { /* * Cannot trust in value returned by device, let vhost recover used * idx from guest. diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h index 449bf5c840..80ff670e23 100644 --- a/include/hw/virtio/vhost-vdpa.h +++ b/include/hw/virtio/vhost-vdpa.h @@ -76,6 +76,12 @@ typedef struct vhost_vdpa_shared { =20 /* SVQ switching is in progress, or already completed? */ SVQTransitionState svq_switching; + + /* + * Device suspended successfully. + * The vhost_vdpa devices cannot have different suspended states. + */ + bool suspended; } VhostVDPAShared; =20 typedef struct vhost_vdpa { @@ -83,8 +89,6 @@ typedef struct vhost_vdpa { uint32_t address_space_id; uint64_t acked_features; bool shadow_vqs_enabled; - /* Device suspended successfully */ - bool suspended; VhostVDPAShared *shared; GPtrArray *shadow_vqs; const VhostShadowVirtqueueOps *shadow_vq_ops; --=20 MST