From nobody Sun May 19 10:57:29 2024 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=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1675963413; cv=none; d=zohomail.com; s=zohoarc; b=iZwB3Bvhw59a4TZaErcmt4byonDoKz2QiUK8NdYwq0mgfE/ZcJNIlcCxt2TvdoTvjV7230czueZfBPBdwQUFX1KLcTWZXgdFIOExQ0GZkBXPLHTaUFGkMkabANh7/Bw4IL/uossbiWWFbz6XKwvdEFZZd39acfuFpP/w9QH2LNs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1675963413; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=t4BHCHdT1w0EG7MYuWUG8TmXFQlCJLQm4PToxYUOF3Y=; b=YS+m+v8uAq934/yvqz9zwwX1MBbN7YSRevPP7flzyxZHo5oOXHggG3f1VkRulJwHd9YE3RgsHEIZzVetqAlOZIFcwmplY4t91afh2u3zI8hOc56z0xGXV8d7KZIkwWT+7xudK39+5WaZU6uupS26kTr1dcObP1jLiQRVFY9KBeA= 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 1675963413309905.779786449568; Thu, 9 Feb 2023 09:23:33 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQAHh-0006Tc-LT; Thu, 09 Feb 2023 12:00:33 -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 1pQAHR-0006E7-Eb for qemu-devel@nongnu.org; Thu, 09 Feb 2023 12:00:18 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pQAHP-00048W-Lm for qemu-devel@nongnu.org; Thu, 09 Feb 2023 12:00:17 -0500 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-70-1iPmsG_7OcypTX01ETFKhw-1; Thu, 09 Feb 2023 12:00:11 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 447F138173F1; Thu, 9 Feb 2023 17:00:08 +0000 (UTC) Received: from eperezma.remote.csb (unknown [10.39.195.168]) by smtp.corp.redhat.com (Postfix) with ESMTP id CCEC7492C3E; Thu, 9 Feb 2023 17:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675962014; 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; bh=t4BHCHdT1w0EG7MYuWUG8TmXFQlCJLQm4PToxYUOF3Y=; b=LeikSnlUAxl54EYUD8ZlUSjnJkYX0rvQTmYHAdGnCQay27sOpjAqmKI4ANomgDJ1AAympY VTrMJPHm2VEzcdjXYcsdH7iopfov/APkUwEIvZRgBbrzqIsX5aEYN4EX4lhWUNXNqbrb/C x1Xyod0uGEU3Aptzkwgh5D37buW4PWI= X-MC-Unique: 1iPmsG_7OcypTX01ETFKhw-1 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, Laurent Vivier , Lei Yang , Jason Wang , "Michael S. Tsirkin" Subject: [PATCH] vdpa: stop all svq on device deletion Date: Thu, 9 Feb 2023 18:00:04 +0100 Message-Id: <20230209170004.899472-1-eperezma@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 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.133.124; envelope-from=eperezma@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, 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 Precedence: list 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 @redhat.com) X-ZM-MESSAGEID: 1675963415120100003 Not stopping them leave the device in a bad state when virtio-net fronted device is unplugged with device_del monitor command. This is not triggable in regular poweroff or qemu forces shutdown because cleanup is called right after vhost_vdpa_dev_start(false). But devices hot unplug does not call vdpa device cleanups. This lead to all the vhost_vdpa devices without stop the SVQ but the last. Fix it and clean the code, making it symmetric with vhost_vdpa_svqs_start. Fixes: dff4426fa656 ("vhost: Add Shadow VirtQueue kick forwarding capabilit= ies") Reported-by: Lei Yang Signed-off-by: Eugenio P=C3=A9rez Acked-by: Jason Wang Tested-by: Laurent Vivier --- hw/virtio/vhost-vdpa.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 542e003101..df3a1e92ac 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -689,26 +689,11 @@ static int vhost_vdpa_get_device_id(struct vhost_dev = *dev, return ret; } =20 -static void vhost_vdpa_reset_svq(struct vhost_vdpa *v) -{ - if (!v->shadow_vqs_enabled) { - return; - } - - for (unsigned i =3D 0; i < v->shadow_vqs->len; ++i) { - VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); - vhost_svq_stop(svq); - } -} - static int vhost_vdpa_reset_device(struct vhost_dev *dev) { - struct vhost_vdpa *v =3D dev->opaque; int ret; uint8_t status =3D 0; =20 - vhost_vdpa_reset_svq(v); - ret =3D vhost_vdpa_call(dev, VHOST_VDPA_SET_STATUS, &status); trace_vhost_vdpa_reset_device(dev, status); return ret; @@ -1100,6 +1085,8 @@ static void vhost_vdpa_svqs_stop(struct vhost_dev *de= v) =20 for (unsigned i =3D 0; i < v->shadow_vqs->len; ++i) { VhostShadowVirtqueue *svq =3D g_ptr_array_index(v->shadow_vqs, i); + + vhost_svq_stop(svq); vhost_vdpa_svq_unmap_rings(dev, svq); =20 event_notifier_cleanup(&svq->hdev_kick); --=20 2.31.1