From nobody Thu Nov 13 06:04:07 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578230042; cv=none; d=zohomail.com; s=zohoarc; b=DLYTAn5wcJFLOrtVKMpa2PtLWZG3LdjBSK02cTAMrwVAcaUCq0nEgN122YeQy68zZGbNqRHJuHNbrzFmxMP7yGDx1d8Xl2uLSwR5UPMOkr0i478QxQzO1Ci0BgsiPHi+AyEfi3T3E+tdX2QmBY71/u6zpxH5zckbfFF68jfMpdg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578230042; h=Content-Type: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=51WDbq+PBwGZb4DLRjFJvXY/baMy4xbXgzhN6b6J6AM=; b=mq4rfy96UjxpR8WNZd48vPgXV8rR126906sEFdsiDy3qKO8WrH9tmujJrc1Baurh8GIxEhkjAIwp/S3oxhRF6ye8JF02Z6I4JMvigrlgDiYk0mXkHJFYbDJN1GIpMH8L/tGhMUnvQv9mslIJ+WqFUislmVTF1C9/H67ckRFUS8Q= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578230042352800.261762878383; Sun, 5 Jan 2020 05:14:02 -0800 (PST) Received: from localhost ([::1]:42006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io5jE-0003k2-Mu for importer@patchew.org; Sun, 05 Jan 2020 08:14:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58419) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1io5VB-00037y-3u for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:59:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1io5V8-0004zN-Ox for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:59:28 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:50979 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1io5V7-0004yo-7E for qemu-devel@nongnu.org; Sun, 05 Jan 2020 07:59:25 -0500 Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-2VnyM1ZWM9ipVOx8nip_oA-1; Sun, 05 Jan 2020 07:59:23 -0500 Received: by mail-qk1-f198.google.com with SMTP id m13so15990814qka.9 for ; Sun, 05 Jan 2020 04:59:23 -0800 (PST) Received: from redhat.com (bzq-79-183-34-164.red.bezeqint.net. [79.183.34.164]) by smtp.gmail.com with ESMTPSA id a144sm19514167qkc.30.2020.01.05.04.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Jan 2020 04:59:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578229164; 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=51WDbq+PBwGZb4DLRjFJvXY/baMy4xbXgzhN6b6J6AM=; b=OF2ZOxzV52pigYgr/FOwZszhRhu0a1DH3htaxD82WOqoPF/xBaK8GaodJC3XDYXoyDrJNH jHsoor2xGdq6wTuXBDaWoEGLnc7xPKqtEsOsZJ8BZSNG+AE9zGqIXDMz/XktM5HDPhrLy9 5RV7PE7gSjjIWJXkMVezCmVVtPT59Q8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=o8odu1UwTWT4bWPiNG9EYA27yURxcpg5mIlh0CMeiVA=; b=Ukpp35hCgPiubElzfD6mWLXUKMX9jp83rRakuhFvEi3HhNZ2FUYL2FJ9LNpHSQqsOQ aiR9ScGp/A+8kDP8BE99txDWYI7kyrGqguRvNsx8A0H3SrixUNH3BzRg5V5HHyYxMmPU M72BSNHrvATAT2JZlp4ILlgnPLlH1D5IxwF9alEX7ClwFg5QSMyyMtNfMdR/wvncDe/2 CPf8DRO2KC5+R9dXbOsoIu+syauZ37o75BasuVieGIsphzNWpOGizCN0iEORrgw7zuY0 nOpIRpQHmNjUnlSeKlDzqfs/Z3D3Xp9H8XaD57kqbVUMbM2tRWFsENM1eYECrw3lCxAJ Xxtg== X-Gm-Message-State: APjAAAVLtIzoNquacz6nHFQmT4QWmkd3pV1a5g7Pr4Zu4uU5P1Gd61Mu PPGV7grXrPR3oeITTgxQTmYemSIy1hHMueR+p5AA1dOcDKpTbpjJQclaiNQfj4ScmZ3z6cIX+iR i+ywtg8gBTNSg81A= X-Received: by 2002:a0c:e14f:: with SMTP id c15mr72896496qvl.169.1578229162588; Sun, 05 Jan 2020 04:59:22 -0800 (PST) X-Google-Smtp-Source: APXvYqwP5ytGsY9TTehJKJQpzrrDPmEX7umvl06dlEwjDfqHui9pbk4YeG000yt7Mem7JjJvM6/PNA== X-Received: by 2002:a0c:e14f:: with SMTP id c15mr72896482qvl.169.1578229162374; Sun, 05 Jan 2020 04:59:22 -0800 (PST) Date: Sun, 5 Jan 2020 07:59:17 -0500 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Subject: [PULL v3 23/32] vhost-user: add VHOST_USER_RESET_DEVICE to reset devices Message-ID: <20200105125622.27231-24-mst@redhat.com> References: <20200105125622.27231-1-mst@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200105125622.27231-1-mst@redhat.com> X-Mailer: git-send-email 2.24.1.751.gd10ce2899c X-Mutt-Fcc: =sent X-MC-Unique: 2VnyM1ZWM9ipVOx8nip_oA-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , David Vrabel , Raphael Norwitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Raphael Norwitz Add a VHOST_USER_RESET_DEVICE message which will reset the vhost user backend. Disabling all rings, and resetting all internal state, ready for the backend to be reinitialized. A backend has to report it supports this features with the VHOST_USER_PROTOCOL_F_RESET_DEVICE protocol feature bit. If it does so, the new message is used instead of sending a RESET_OWNER which has had inconsistent implementations. Signed-off-by: David Vrabel Signed-off-by: Raphael Norwitz Message-Id: <1572385083-5254-2-git-send-email-raphael.norwitz@nutanix.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/virtio/vhost-user.c | 8 +++++++- docs/interop/vhost-user.rst | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 02a9b25199..d27a10fcc6 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -58,6 +58,7 @@ enum VhostUserProtocolFeature { VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD =3D 10, VHOST_USER_PROTOCOL_F_HOST_NOTIFIER =3D 11, VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD =3D 12, + VHOST_USER_PROTOCOL_F_RESET_DEVICE =3D 13, VHOST_USER_PROTOCOL_F_MAX }; =20 @@ -98,6 +99,7 @@ typedef enum VhostUserRequest { VHOST_USER_GET_INFLIGHT_FD =3D 31, VHOST_USER_SET_INFLIGHT_FD =3D 32, VHOST_USER_GPU_SET_SOCKET =3D 33, + VHOST_USER_RESET_DEVICE =3D 34, VHOST_USER_MAX } VhostUserRequest; =20 @@ -890,10 +892,14 @@ static int vhost_user_set_owner(struct vhost_dev *dev) static int vhost_user_reset_device(struct vhost_dev *dev) { VhostUserMsg msg =3D { - .hdr.request =3D VHOST_USER_RESET_OWNER, .hdr.flags =3D VHOST_USER_VERSION, }; =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; + if (vhost_user_write(dev, &msg, NULL, 0) < 0) { return -1; } diff --git a/docs/interop/vhost-user.rst b/docs/interop/vhost-user.rst index 015ac08177..5f8b3a456b 100644 --- a/docs/interop/vhost-user.rst +++ b/docs/interop/vhost-user.rst @@ -785,6 +785,7 @@ Protocol features #define VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD 10 #define VHOST_USER_PROTOCOL_F_HOST_NOTIFIER 11 #define VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD 12 + #define VHOST_USER_PROTOCOL_F_RESET_DEVICE 13 =20 Master message types -------------------- @@ -1190,6 +1191,20 @@ Master message types ancillary data. The GPU protocol is used to inform the master of rendering state and updates. See vhost-user-gpu.rst for details. =20 +``VHOST_USER_RESET_DEVICE`` + :id: 34 + :equivalent ioctl: N/A + :master payload: N/A + :slave payload: N/A + + Ask the vhost user backend to disable all rings and reset all + internal device state to the initial state, ready to be + reinitialized. The backend retains ownership of the device + throughout the reset operation. + + Only valid if the ``VHOST_USER_PROTOCOL_F_RESET_DEVICE`` protocol + feature is set by the backend. + Slave message types ------------------- =20 --=20 MST