From nobody Tue Feb 10 16:22:45 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=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 Reviewed-by: Raphael Norwitz --- 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