From nobody Sun May 19 01:15:09 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=1695842936; cv=none; d=zohomail.com; s=zohoarc; b=D134RUK27MbtWwemlp9HcBnbhYqgMV9J1bnNM4oXkYpPsTrt2eGLKhykRw6bIMUpZZQKp1t7sPnJZHAHyFn3oGGK7AYsqiqWuYQYlXzrUp4Ps/t0JrlbAHz1fCb1TxN+Q0jmK7YZFYhW1Z8IOAUVGOJSXUpoGoYRmnuJT4McT4o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695842936; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=shRHyR1nxnb2BQrxMeZmP1n/TeAPtkgV8J0Z5HKWjl4=; b=UUq8+RJE+6hu2aX7tgEa+a866rlSAwv1CGiFSC3VEZAnrn5oH7WGUxyiOrefQyJeNnGlFlPUhLzo0ClIqv4HeS86znW2VV8KXIOvF2YlQ8utGmj1yxt/0PomgkeFYDPfAtUBLcHxE78BpQ9xTaucg5MkOZmcb9OGPKUgTK0BaNQ= 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 1695842936004483.2032868054646; Wed, 27 Sep 2023 12:28:56 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlaCV-0006TM-6H; Wed, 27 Sep 2023 15:28:01 -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 1qlaCK-0006Rt-Rl for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:49 -0400 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 1qlaCJ-0004t8-9V for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:48 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-570-i-DJegG_MlGlkXAdV8xH2g-1; Wed, 27 Sep 2023 15:27:41 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6915C85A5A8; Wed, 27 Sep 2023 19:27:41 +0000 (UTC) Received: from localhost (unknown [10.39.193.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id E4242C15BB8; Wed, 27 Sep 2023 19:27:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695842865; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=shRHyR1nxnb2BQrxMeZmP1n/TeAPtkgV8J0Z5HKWjl4=; b=P/KLrJYcdmQEGSxGq/ReGapPPA4ysxZqcCG+FDQtaofoGlK+SHwMD05n2npjb+x4YGgMOw /YvGXos3lSquLL10cIhhDHmLa5/w47BWHcJhW2XK79XcjdXbKsiD3mfZCa7vxfw0wHm1gi 5Q3DygZ/AZXnAMMJ2R1DkgcUpqfTz+8= X-MC-Unique: i-DJegG_MlGlkXAdV8xH2g-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: hreitz@redhat.com, Raphael Norwitz , Fam Zheng , "Michael S. Tsirkin" , eperezma@redhat.com, Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH 1/3] vhost-user: do not send RESET_OWNER on device reset Date: Wed, 27 Sep 2023 15:27:35 -0400 Message-ID: <20230927192737.528280-2-stefanha@redhat.com> In-Reply-To: <20230927192737.528280-1-stefanha@redhat.com> References: <20230927192737.528280-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 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=stefanha@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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1695842936314100006 Content-Type: text/plain; charset="utf-8" The VHOST_USER_RESET_OWNER message is deprecated in the spec: This is no longer used. Used to be sent to request disabling all rings, but some back-ends interpreted it to also discard connection state (this interpretation would lead to bugs). It is recommended that back-ends either ignore this message, or use it to disable all rings. The only caller of vhost_user_reset_device() is vhost_user_scsi_reset(). It checks that F_RESET_DEVICE was negotiated before calling it: static void vhost_user_scsi_reset(VirtIODevice *vdev) { VHostSCSICommon *vsc =3D VHOST_SCSI_COMMON(vdev); struct vhost_dev *dev =3D &vsc->dev; /* * Historically, reset was not implemented so only reset devices * that are expecting it. */ if (!virtio_has_feature(dev->protocol_features, VHOST_USER_PROTOCOL_F_RESET_DEVICE)) { return; } if (dev->vhost_ops->vhost_reset_device) { dev->vhost_ops->vhost_reset_device(dev); } } Therefore VHOST_USER_RESET_OWNER is actually never sent by vhost_user_reset_device(). Remove the dead code. This effectively moves the vhost-user protocol specific code from vhost-user-scsi.c into vhost-user.c where it belongs. Signed-off-by: Stefan Hajnoczi Acked-by: Eugenio P=C3=A9rez Reviewed-by: Raphael Norwitz Tested-by: Lei Yang --- hw/scsi/vhost-user-scsi.c | 9 --------- hw/virtio/vhost-user.c | 13 +++++++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index ee99b19e7a..8582b2e8ab 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -71,15 +71,6 @@ static void vhost_user_scsi_reset(VirtIODevice *vdev) VHostSCSICommon *vsc =3D VHOST_SCSI_COMMON(vdev); struct vhost_dev *dev =3D &vsc->dev; =20 - /* - * Historically, reset was not implemented so only reset devices - * that are expecting it. - */ - if (!virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_RESET_DEVICE)) { - return; - } - if (dev->vhost_ops->vhost_reset_device) { dev->vhost_ops->vhost_reset_device(dev); } diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 8dcf049d42..7bed9ad7d5 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1492,12 +1492,17 @@ static int vhost_user_reset_device(struct vhost_dev= *dev) { VhostUserMsg msg =3D { .hdr.flags =3D VHOST_USER_VERSION, + .hdr.request =3D VHOST_USER_RESET_DEVICE, }; =20 - msg.hdr.request =3D virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_RESET_DEVIC= E) - ? VHOST_USER_RESET_DEVICE - : VHOST_USER_RESET_OWNER; + /* + * Historically, reset was not implemented so only reset devices + * that are expecting it. + */ + if (!virtio_has_feature(dev->protocol_features, + VHOST_USER_PROTOCOL_F_RESET_DEVICE)) { + return -ENOSYS; + } =20 return vhost_user_write(dev, &msg, NULL, 0); } --=20 2.41.0 From nobody Sun May 19 01:15:09 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=1695842907; cv=none; d=zohomail.com; s=zohoarc; b=gt8ptqY5RClk/+O8+r8pSNZCdG3Njswe6ynRYi3r6/vDmxQPGTOgTPm4Hr6ZJHpOByNhI5sNKpJXAo1JoDPXxWRRlCXhODrJ6R+SxmVRfPE31QNlzZHDi7ZAqIxhxkoRO5hpFSlo+RC0Fbjw6JAQXcmlaWcsAtbbSPFeAbwp4WU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695842907; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=kLi4qYinLQYnX/WuJPcNmtBNJtt2fgcflDkKxHFpHVc=; b=Y2Pmzs10ppnW3eSE7tfsJjyBMWm4/FOL7kug5l/rrkpfI2sWftK14GYNFwVKwgEWZ2liDd8MzE0YbJ28D6IQe+W5JH/V5CNZ30vYTMO2raXFUdPkgRFfoInw4EJq+jvxNU122jPfCOsRIPvgu6KDE8v+bAO/0ki8JTMnWY3qtEg= 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 1695842907262490.3037998766812; Wed, 27 Sep 2023 12:28:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlaCc-0006UN-Ot; Wed, 27 Sep 2023 15:28:06 -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 1qlaCK-0006Ru-SA for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:49 -0400 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 1qlaCJ-0004tQ-CM for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:48 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-654-4_tot7UvMJubzelEYyqdvg-1; Wed, 27 Sep 2023 15:27:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4EACC8039C8; Wed, 27 Sep 2023 19:27:43 +0000 (UTC) Received: from localhost (unknown [10.39.193.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id BE2221004145; Wed, 27 Sep 2023 19:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695842866; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kLi4qYinLQYnX/WuJPcNmtBNJtt2fgcflDkKxHFpHVc=; b=STZhQAGkpoVzbM2f0mUd/vZEoLxIte5ywXwWoL3SBL+6SYKyZsACmwaKN1UaX/BBfpwKkW bB9qCHJ+pGIKVIIdQIGZPu/9NicBo2Bl7Hg0/UNp/uGejfsnQPI5uw3PMUJXpXAWNPUE9k d9i7XgcnochJMjmthboXJoVqH+Fk+6M= X-MC-Unique: 4_tot7UvMJubzelEYyqdvg-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: hreitz@redhat.com, Raphael Norwitz , Fam Zheng , "Michael S. Tsirkin" , eperezma@redhat.com, Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH 2/3] vhost-backend: remove vhost_kernel_reset_device() Date: Wed, 27 Sep 2023 15:27:36 -0400 Message-ID: <20230927192737.528280-3-stefanha@redhat.com> In-Reply-To: <20230927192737.528280-1-stefanha@redhat.com> References: <20230927192737.528280-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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=stefanha@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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1695842907779100001 Content-Type: text/plain; charset="utf-8" vhost_kernel_reset_device() invokes RESET_OWNER, which disassociates the owner process from the device. The device is left non-operational since SET_OWNER is only called once during startup in vhost_dev_init(). vhost_kernel_reset_device() is never called so this latent bug never appears. Get rid of vhost_kernel_reset_device() for now. If someone needs it in the future they'll need to implement it correctly. Signed-off-by: Stefan Hajnoczi Acked-by: Eugenio P=C3=A9rez Reviewed-by: Raphael Norwitz Tested-by: Lei Yang --- hw/virtio/vhost-backend.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/hw/virtio/vhost-backend.c b/hw/virtio/vhost-backend.c index 8e581575c9..17f3fc6a08 100644 --- a/hw/virtio/vhost-backend.c +++ b/hw/virtio/vhost-backend.c @@ -197,11 +197,6 @@ static int vhost_kernel_set_owner(struct vhost_dev *de= v) return vhost_kernel_call(dev, VHOST_SET_OWNER, NULL); } =20 -static int vhost_kernel_reset_device(struct vhost_dev *dev) -{ - return vhost_kernel_call(dev, VHOST_RESET_OWNER, NULL); -} - static int vhost_kernel_get_vq_index(struct vhost_dev *dev, int idx) { assert(idx >=3D dev->vq_index && idx < dev->vq_index + dev->nvqs); @@ -322,7 +317,6 @@ const VhostOps kernel_ops =3D { .vhost_get_features =3D vhost_kernel_get_features, .vhost_set_backend_cap =3D vhost_kernel_set_backend_cap, .vhost_set_owner =3D vhost_kernel_set_owner, - .vhost_reset_device =3D vhost_kernel_reset_device, .vhost_get_vq_index =3D vhost_kernel_get_vq_index, .vhost_vsock_set_guest_cid =3D vhost_kernel_vsock_set_guest_cid, .vhost_vsock_set_running =3D vhost_kernel_vsock_set_running, --=20 2.41.0 From nobody Sun May 19 01:15:09 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=1695842933; cv=none; d=zohomail.com; s=zohoarc; b=DeYYlaiFgtn6rO919JU3PFc3S6XR2mII3HsYGS1quM/sC7z9GZlHJSKq9evPSLXR4ZX1LvitY9Wxbo1S2newAwSWEtkWL1fLWM1PllnqvsXuvzdd/vB8qj9NklvrLy1v2L6T8bk+m6vB+JQlXKCszWrxUQd0LPfxu150BUjZlJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1695842933; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oT8Rnn9szS1GlHoYPHbsFeyrWZLFIGh6DO+niBvXF2s=; b=SSb0cZUv2Oa7PKtI82eYzpCK1KacKFUy0R5uaspVB4r+qn7H+xU6MiK53Fdur/y5uOpxr3Cd/rpWnwPCW0F9V8gCCFWTZBwVTeusi0ss81EtTzaGY+AZrXpA2aNFouBkzG29v7AzHkYQ3TRH69xBlIUAnD4xzxBlFzMc/wG3z68= 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 1695842933539794.1344870507402; Wed, 27 Sep 2023 12:28:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qlaCT-0006TA-Aw; Wed, 27 Sep 2023 15:27:58 -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 1qlaCN-0006SD-7S for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:51 -0400 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 1qlaCL-0004tp-Kp for qemu-devel@nongnu.org; Wed, 27 Sep 2023 15:27:50 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-656-8ynO9Y-cMHGPWocwoVrb7A-1; Wed, 27 Sep 2023 15:27:45 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 5766A802D38; Wed, 27 Sep 2023 19:27:45 +0000 (UTC) Received: from localhost (unknown [10.39.193.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id CC28D2026D4B; Wed, 27 Sep 2023 19:27:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695842869; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oT8Rnn9szS1GlHoYPHbsFeyrWZLFIGh6DO+niBvXF2s=; b=DbCvBHs1h3EDO0McQK9lOVhOR/cm3M+5M7+gjJ30hZljKw8aROVaA8d4oq9088vdQwZuGc 9kzZVBZKFCNAHlPJLU9m551fV6CLu2Hl9bpBDpboef+ggcOIa9Zi9/SgPVNQfLVIQVd6M1 9RM/f7P5zje0jilDwKRNhos4BJ8T3f8= X-MC-Unique: 8ynO9Y-cMHGPWocwoVrb7A-1 From: Stefan Hajnoczi To: qemu-devel@nongnu.org Cc: hreitz@redhat.com, Raphael Norwitz , Fam Zheng , "Michael S. Tsirkin" , eperezma@redhat.com, Paolo Bonzini , Stefan Hajnoczi Subject: [PATCH 3/3] virtio: call ->vhost_reset_device() during reset Date: Wed, 27 Sep 2023 15:27:37 -0400 Message-ID: <20230927192737.528280-4-stefanha@redhat.com> In-Reply-To: <20230927192737.528280-1-stefanha@redhat.com> References: <20230927192737.528280-1-stefanha@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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=stefanha@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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 1695842934244100003 Content-Type: text/plain; charset="utf-8" vhost-user-scsi has a VirtioDeviceClass->reset() function that calls ->vhost_reset_device(). The other vhost devices don't notify the vhost device upon reset. Stateful vhost devices may need to handle device reset in order to free resources or prevent stale device state from interfering after reset. Call ->vhost_device_reset() from virtio_reset() so that that vhost devices are notified of device reset. This patch affects behavior as follows: - vhost-kernel: No change in behavior since ->vhost_reset_device() is not implemented. - vhost-user: back-ends that negotiate VHOST_USER_PROTOCOL_F_RESET_DEVICE now receive a VHOST_USER_DEVICE_RESET message upon device reset. Otherwise there is no change in behavior. DPDK, SPDK, libvhost-user, and the vhost-user-backend crate do not negotiate VHOST_USER_PROTOCOL_F_RESET_DEVICE automatically. - vhost-vdpa: an extra SET_STATUS 0 call is made during device reset. Signed-off-by: Stefan Hajnoczi Acked-by: Eugenio P=C3=A9rez Reviewed-by: Raphael Norwitz Tested-by: Lei Yang --- include/hw/virtio/vhost.h | 3 +++ hw/scsi/vhost-user-scsi.c | 11 ----------- hw/virtio/vhost.c | 9 +++++++++ hw/virtio/virtio.c | 4 ++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h index 6a173cb9fa..381fb51966 100644 --- a/include/hw/virtio/vhost.h +++ b/include/hw/virtio/vhost.h @@ -338,4 +338,7 @@ int vhost_dev_set_inflight(struct vhost_dev *dev, int vhost_dev_get_inflight(struct vhost_dev *dev, uint16_t queue_size, struct vhost_inflight *inflight); bool vhost_dev_has_iommu(struct vhost_dev *dev); + +int vhost_reset_device(struct vhost_dev *hdev); + #endif diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 8582b2e8ab..6917a748bb 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -66,16 +66,6 @@ static void vhost_user_scsi_set_status(VirtIODevice *vde= v, uint8_t status) } } =20 -static void vhost_user_scsi_reset(VirtIODevice *vdev) -{ - VHostSCSICommon *vsc =3D VHOST_SCSI_COMMON(vdev); - struct vhost_dev *dev =3D &vsc->dev; - - if (dev->vhost_ops->vhost_reset_device) { - dev->vhost_ops->vhost_reset_device(dev); - } -} - static void vhost_dummy_handle_output(VirtIODevice *vdev, VirtQueue *vq) { } @@ -195,7 +185,6 @@ static void vhost_user_scsi_class_init(ObjectClass *kla= ss, void *data) vdc->get_features =3D vhost_scsi_common_get_features; vdc->set_config =3D vhost_scsi_common_set_config; vdc->set_status =3D vhost_user_scsi_set_status; - vdc->reset =3D vhost_user_scsi_reset; fwc->get_dev_path =3D vhost_scsi_common_get_fw_dev_path; } =20 diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c index e2f6ffb446..6003e50e83 100644 --- a/hw/virtio/vhost.c +++ b/hw/virtio/vhost.c @@ -2087,3 +2087,12 @@ int vhost_net_set_backend(struct vhost_dev *hdev, =20 return -ENOSYS; } + +int vhost_reset_device(struct vhost_dev *hdev) +{ + if (hdev->vhost_ops->vhost_reset_device) { + return hdev->vhost_ops->vhost_reset_device(hdev); + } + + return -ENOSYS; +} diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 4577f3f5b3..d863ffd5d6 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2121,6 +2121,10 @@ void virtio_reset(void *opaque) vdev->device_endian =3D virtio_default_endian(); } =20 + if (vdev->vhost_started) { + vhost_reset_device(k->get_vhost(vdev)); + } + if (k->reset) { k->reset(vdev); } --=20 2.41.0