[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v10 17/19] multi-process: perform device reset in the remote proc
From: |
elena . ufimtseva |
Subject: |
[PATCH v10 17/19] multi-process: perform device reset in the remote process |
Date: |
Mon, 5 Oct 2020 11:51:05 -0700 |
From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Perform device reset in the remote process when QEMU performs
device reset. This is required to reset the internal state
(like registers, etc...) of emulated devices
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
hw/i386/remote-msg.c | 23 ++++++++++++++++++++++-
hw/pci/proxy.c | 20 ++++++++++++++++++++
include/io/mpqemu-link.h | 1 +
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/hw/i386/remote-msg.c b/hw/i386/remote-msg.c
index a318a9ff91..82f1b4f2a0 100644
--- a/hw/i386/remote-msg.c
+++ b/hw/i386/remote-msg.c
@@ -19,6 +19,7 @@
#include "exec/memattrs.h"
#include "hw/i386/remote-memory.h"
#include "hw/i386/remote-iohub.h"
+#include "sysemu/reset.h"
static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
MPQemuMsg *msg);
@@ -26,6 +27,8 @@ static void process_config_read(QIOChannel *ioc, PCIDevice
*dev,
MPQemuMsg *msg);
static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
+static void process_device_reset_msg(QIOChannel *ioc, PCIDevice *dev,
+ Error **errp);
void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
{
@@ -72,7 +75,9 @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
case SET_IRQFD:
process_set_irqfd_msg(pci_dev, &msg);
break;
-
+ case DEVICE_RESET:
+ process_device_reset_msg(com->ioc, pci_dev, &local_err);
+ break;
default:
error_setg(&local_err,
"Unknown command (%d) received for device %s (pid=%d)",
@@ -218,3 +223,19 @@ fail:
"in remote process pid=%d", getpid());
}
}
+
+static void process_device_reset_msg(QIOChannel *ioc, PCIDevice *dev,
+ Error **errp)
+{
+ DeviceClass *dc = DEVICE_GET_CLASS(dev);
+ DeviceState *s = DEVICE(dev);
+ MPQemuMsg ret = { 0 };
+
+ if (dc->reset) {
+ dc->reset(s);
+ }
+
+ ret.cmd = RET_MSG;
+
+ mpqemu_msg_send(&ret, ioc, errp);
+}
diff --git a/hw/pci/proxy.c b/hw/pci/proxy.c
index 1e4b18e5b2..90d588b43c 100644
--- a/hw/pci/proxy.c
+++ b/hw/pci/proxy.c
@@ -25,6 +25,7 @@
#include "util/event_notifier-posix.c"
static void probe_pci_info(PCIDevice *dev, Error **errp);
+static void proxy_device_reset(DeviceState *dev);
static void proxy_set_socket(PCIProxyDev *pdev, int fd, Error **errp)
{
@@ -194,6 +195,8 @@ static void pci_proxy_dev_class_init(ObjectClass *klass,
void *data)
k->config_read = pci_proxy_read_config;
k->config_write = pci_proxy_write_config;
+ dc->reset = proxy_device_reset;
+
device_class_set_props(dc, proxy_properties);
}
@@ -351,3 +354,20 @@ static void probe_pci_info(PCIDevice *dev, Error **errp)
}
}
}
+
+static void proxy_device_reset(DeviceState *dev)
+{
+ PCIProxyDev *pdev = PCI_PROXY_DEV(dev);
+ MPQemuMsg msg = { 0 };
+ Error *local_err = NULL;
+
+ msg.cmd = DEVICE_RESET;
+ msg.size = 0;
+
+ (void)mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
+ if (local_err) {
+ error_report("Failed to send DEVICE_RESET to the remote process");
+ error_free(local_err);
+ }
+
+}
diff --git a/include/io/mpqemu-link.h b/include/io/mpqemu-link.h
index 4cf81f5237..746296885a 100644
--- a/include/io/mpqemu-link.h
+++ b/include/io/mpqemu-link.h
@@ -39,6 +39,7 @@ typedef enum {
BAR_WRITE,
BAR_READ,
SET_IRQFD,
+ DEVICE_RESET,
MPQEMU_CMD_MAX,
} MPQemuCmd;
--
2.25.GIT
- [PATCH v10 09/19] multi-process: setup memory manager for remote device, (continued)
- [PATCH v10 09/19] multi-process: setup memory manager for remote device, elena . ufimtseva, 2020/10/05
- [PATCH v10 12/19] multi-process: Forward PCI config space acceses to the remote process, elena . ufimtseva, 2020/10/05
- [PATCH v10 10/19] multi-process: introduce proxy object, elena . ufimtseva, 2020/10/05
- [PATCH v10 14/19] multi-process: Synchronize remote memory, elena . ufimtseva, 2020/10/05
- [PATCH v10 16/19] multi-process: Retrieve PCI info from remote process, elena . ufimtseva, 2020/10/05
- [PATCH v10 15/19] multi-process: create IOHUB object to handle irq, elena . ufimtseva, 2020/10/05
- [PATCH v10 04/19] multi-process: setup a machine object for remote device process, elena . ufimtseva, 2020/10/05
- [PATCH v10 11/19] multi-process: add proxy communication functions, elena . ufimtseva, 2020/10/05
- [PATCH v10 13/19] multi-process: PCI BAR read/write handling for proxy & remote endpoints, elena . ufimtseva, 2020/10/05
- [PATCH v10 17/19] multi-process: perform device reset in the remote process,
elena . ufimtseva <=
- [PATCH v10 19/19] multi-process: add configure and usage information, elena . ufimtseva, 2020/10/05
- [PATCH v10 18/19] multi-process: add the concept description to docs/devel/qemu-multiprocess, elena . ufimtseva, 2020/10/05
- Re: [PATCH v10 00/19] Initial support for multi-process Qemu, Stefan Hajnoczi, 2020/10/07