qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: John Levon <john.levon@nutanix.com>
To: qemu-devel@nongnu.org
Cc: "Alex Williamson" <alex.williamson@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"David Hildenbrand" <david@redhat.com>,
	"Stefano Garzarella" <sgarzare@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"John Levon" <john.levon@nutanix.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Thanos Makatos" <thanos.makatos@nutanix.com>,
	"Cédric Le Goater" <clg@redhat.com>,
	"John Johnson" <john.g.johnson@oracle.com>,
	"Elena Ufimtseva" <elena.ufimtseva@oracle.com>,
	"Jagannathan Raman" <jag.raman@oracle.com>
Subject: [PATCH v2 23/29] vfio-user: implement VFIO_USER_DEVICE_RESET
Date: Tue, 20 May 2025 16:04:12 +0100	[thread overview]
Message-ID: <20250520150419.2172078-24-john.levon@nutanix.com> (raw)
In-Reply-To: <20250520150419.2172078-1-john.levon@nutanix.com>

Hook this call up to the legacy reset handler for vfio-user-pci.

Originally-by: John Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John Levon <john.levon@nutanix.com>
---
 hw/vfio-user/device.h |  2 ++
 hw/vfio-user/device.c | 12 ++++++++++++
 hw/vfio-user/pci.c    | 15 +++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/hw/vfio-user/device.h b/hw/vfio-user/device.h
index a5a2aa9ba6..25cd4c8a00 100644
--- a/hw/vfio-user/device.h
+++ b/hw/vfio-user/device.h
@@ -20,6 +20,8 @@
 int vfio_user_get_device_info(VFIOUserProxy *proxy,
                               struct vfio_device_info *info);
 
+void vfio_user_device_reset(VFIOUserProxy *proxy);
+
 extern VFIODeviceIOOps vfio_user_device_io_ops_sock;
 
 #endif /* VFIO_USER_DEVICE_H */
diff --git a/hw/vfio-user/device.c b/hw/vfio-user/device.c
index 45b91d22f0..b37f7329a1 100644
--- a/hw/vfio-user/device.c
+++ b/hw/vfio-user/device.c
@@ -49,6 +49,18 @@ int vfio_user_get_device_info(VFIOUserProxy *proxy,
     return 0;
 }
 
+void vfio_user_device_reset(VFIOUserProxy *proxy)
+{
+    VFIOUserHdr msg;
+
+    vfio_user_request_msg(&msg, VFIO_USER_DEVICE_RESET, sizeof(msg), 0);
+
+    vfio_user_send_wait(proxy, &msg, NULL, 0);
+    if (msg.flags & VFIO_USER_ERROR) {
+        error_printf("reset reply error %d\n", msg.error_reply);
+    }
+}
+
 static int vfio_user_get_region_info(VFIOUserProxy *proxy,
                                      struct vfio_region_info *info,
                                      VFIOUserFDs *fds)
diff --git a/hw/vfio-user/pci.c b/hw/vfio-user/pci.c
index 5904e7ebc5..2c3edb7378 100644
--- a/hw/vfio-user/pci.c
+++ b/hw/vfio-user/pci.c
@@ -251,6 +251,20 @@ static void vfio_user_instance_finalize(Object *obj)
     }
 }
 
+static void vfio_user_pci_reset(DeviceState *dev)
+{
+    VFIOPCIDevice *vdev = VFIO_PCI_BASE(dev);
+    VFIODevice *vbasedev = &vdev->vbasedev;
+
+    vfio_pci_pre_reset(vdev);
+
+    if (vbasedev->reset_works) {
+        vfio_user_device_reset(vbasedev->proxy);
+    }
+
+    vfio_pci_post_reset(vdev);
+}
+
 static const Property vfio_user_pci_dev_properties[] = {
     DEFINE_PROP_UINT32("x-pci-vendor-id", VFIOPCIDevice,
                        vendor_id, PCI_ANY_ID),
@@ -269,6 +283,7 @@ static void vfio_user_pci_dev_class_init(ObjectClass *klass, const void *data)
     DeviceClass *dc = DEVICE_CLASS(klass);
     PCIDeviceClass *pdc = PCI_DEVICE_CLASS(klass);
 
+    device_class_set_legacy_reset(dc, vfio_user_pci_reset);
     device_class_set_props(dc, vfio_user_pci_dev_properties);
     dc->desc = "VFIO over socket PCI device assignment";
     pdc->realize = vfio_user_pci_realize;
-- 
2.43.0



  parent reply	other threads:[~2025-05-20 15:06 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-05-20 15:03 [PATCH v2 00/29] vfio-user client John Levon
2025-05-20 15:03 ` [PATCH v2 01/29] vfio: add more VFIOIOMMUClass docs John Levon
2025-05-20 16:14   ` Cédric Le Goater
2025-05-20 15:03 ` [PATCH v2 02/29] vfio: move more cleanup into vfio_pci_put_device() John Levon
2025-05-20 15:03 ` [PATCH v2 03/29] vfio: move config space read into vfio_pci_config_setup() John Levon
2025-05-20 15:03 ` [PATCH v2 04/29] vfio: refactor out IRQ signalling setup John Levon
2025-05-20 15:03 ` [PATCH v2 05/29] vfio: export PCI helpers needed for vfio-user John Levon
2025-05-21  7:39   ` Cédric Le Goater
2025-05-21  8:40     ` John Levon
2025-05-21  9:07       ` Cédric Le Goater
2025-05-20 15:03 ` [PATCH v2 06/29] vfio: enable per-IRQ MSI-X masking John Levon
2025-05-21  7:29   ` Cédric Le Goater
2025-05-28 17:16     ` Steven Sistare
2025-05-28 17:36       ` John Levon
2025-05-20 15:03 ` [PATCH v2 07/29] vfio: add per-region fd support John Levon
2025-05-21  8:11   ` Cédric Le Goater
2025-05-21  8:25     ` John Levon
2025-05-26 12:08       ` Cédric Le Goater
2025-05-27  8:52         ` John Levon
2025-05-20 15:03 ` [PATCH v2 08/29] vfio: mark posted writes in region write callbacks John Levon
2025-05-21  8:12   ` Cédric Le Goater
2025-05-20 15:03 ` [PATCH v2 09/29] vfio: return mr from vfio_get_xlat_addr John Levon
2025-05-20 15:03 ` [PATCH v2 10/29] vfio/container: pass MemoryRegion to DMA operations John Levon
2025-05-21  7:43   ` Cédric Le Goater
2025-05-21  8:29     ` John Levon
2025-05-21 13:00     ` Steven Sistare
2025-05-21 13:13       ` John Levon
2025-05-20 15:04 ` [PATCH v2 11/29] vfio-user: introduce vfio-user protocol specification John Levon
2025-05-20 15:04 ` [PATCH v2 12/29] vfio-user: add vfio-user class and container John Levon
2025-05-20 15:04 ` [PATCH v2 13/29] vfio-user: connect vfio proxy to remote server John Levon
2025-05-20 15:04 ` [PATCH v2 14/29] vfio-user: implement message receive infrastructure John Levon
2025-05-20 15:04 ` [PATCH v2 15/29] vfio-user: implement message send infrastructure John Levon
2025-05-20 15:04 ` [PATCH v2 16/29] vfio-user: implement VFIO_USER_DEVICE_GET_INFO John Levon
2025-05-20 15:04 ` [PATCH v2 17/29] vfio-user: implement VFIO_USER_DEVICE_GET_REGION_INFO John Levon
2025-05-20 15:04 ` [PATCH v2 18/29] vfio-user: implement VFIO_USER_REGION_READ/WRITE John Levon
2025-05-20 15:04 ` [PATCH v2 19/29] vfio-user: set up PCI in vfio_user_pci_realize() John Levon
2025-05-20 15:04 ` [PATCH v2 20/29] vfio-user: implement VFIO_USER_DEVICE_GET/SET_IRQ* John Levon
2025-05-20 15:04 ` [PATCH v2 21/29] vfio-user: forward MSI-X PBA BAR accesses to server John Levon
2025-05-20 15:04 ` [PATCH v2 22/29] vfio-user: set up container access to the proxy John Levon
2025-05-20 15:04 ` John Levon [this message]
2025-05-20 15:04 ` [PATCH v2 24/29] vfio-user: implement VFIO_USER_DMA_MAP/UNMAP John Levon
2025-05-20 15:04 ` [PATCH v2 25/29] vfio-user: implement VFIO_USER_DMA_READ/WRITE John Levon
2025-05-20 15:04 ` [PATCH v2 26/29] vfio-user: add 'x-msg-timeout' option John Levon
2025-05-20 15:04 ` [PATCH v2 27/29] vfio-user: support posted writes John Levon
2025-05-20 15:04 ` [PATCH v2 28/29] vfio-user: add coalesced " John Levon
2025-05-20 15:04 ` [PATCH v2 29/29] docs: add vfio-user documentation John Levon
2025-05-27  9:39 ` [PATCH v2 00/29] vfio-user client Cédric Le Goater
2025-05-27 10:04   ` John Levon
2025-05-27 12:09     ` Cédric Le Goater
2025-06-05 21:16     ` Cédric Le Goater

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20250520150419.2172078-24-john.levon@nutanix.com \
    --to=john.levon@nutanix.com \
    --cc=alex.williamson@redhat.com \
    --cc=berrange@redhat.com \
    --cc=clg@redhat.com \
    --cc=david@redhat.com \
    --cc=elena.ufimtseva@oracle.com \
    --cc=jag.raman@oracle.com \
    --cc=john.g.johnson@oracle.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=sgarzare@redhat.com \
    --cc=thanos.makatos@nutanix.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).