[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 13/20] multi-process: Forward PCI config space acceses to the
From: |
elena . ufimtseva |
Subject: |
[PATCH v9 13/20] multi-process: Forward PCI config space acceses to the remote process |
Date: |
Thu, 27 Aug 2020 11:12:24 -0700 |
From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
The Proxy Object sends the PCI config space accesses as messages
to the remote process over the communication channel
TODO:
Investigate if the local PCI config writes can be dropped.
Without the proxy local PCI config space writes for the device,
the driver in the guest times out on the probing.
We have tried to only refer to the remote for the PCI config writes,
but the driver timeout in the guest forced as to left this
as it is (removing local PCI config only).
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
---
hw/i386/remote-msg.c | 70 ++++++++++++++++++++++++++++++++++++++++
hw/pci/proxy.c | 50 ++++++++++++++++++++++++++++
include/io/mpqemu-link.h | 9 ++++++
io/mpqemu-link.c | 6 ++++
4 files changed, 135 insertions(+)
diff --git a/hw/i386/remote-msg.c b/hw/i386/remote-msg.c
index 2a855d5850..322c1888a3 100644
--- a/hw/i386/remote-msg.c
+++ b/hw/i386/remote-msg.c
@@ -15,6 +15,12 @@
#include "io/mpqemu-link.h"
#include "qapi/error.h"
#include "sysemu/runstate.h"
+#include "hw/pci/pci.h"
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg);
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg);
gboolean mpqemu_process_msg(QIOChannel *ioc, GIOCondition cond,
gpointer opaque)
@@ -50,6 +56,12 @@ gboolean mpqemu_process_msg(QIOChannel *ioc, GIOCondition
cond,
}
switch (msg.cmd) {
+ case PCI_CONFIG_WRITE:
+ process_config_write(ioc, pci_dev, &msg);
+ break;
+ case PCI_CONFIG_READ:
+ process_config_read(ioc, pci_dev, &msg);
+ break;
default:
error_setg(&local_err,
"Unknown command (%d) received for device %s (pid=%d)",
@@ -64,3 +76,61 @@ exit:
return TRUE;
}
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg)
+{
+ ConfDataMsg *conf = (ConfDataMsg *)&msg->data.conf_data;
+ MPQemuMsg ret = { 0 };
+ MPQemuRequest req = { 0 };
+ Error *local_err = NULL;
+
+ if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+ error_report("Bad address received when writing PCI config, pid %d",
+ getpid());
+ ret.data.u64 = UINT64_MAX;
+ } else {
+ pci_default_write_config(dev, conf->addr, conf->val, conf->l);
+ }
+
+ ret.cmd = RET_MSG;
+ ret.size = sizeof(ret.data.u64);
+
+ req.ioc = ioc;
+ req.msg = &ret;
+
+ mpqemu_msg_send_in_co(&req, ioc, &local_err);
+ if (local_err) {
+ error_report("Could not send message to proxy from pid %d",
+ getpid());
+ }
+}
+
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+ MPQemuMsg *msg)
+{
+ ConfDataMsg *conf = (ConfDataMsg *)&msg->data.conf_data;
+ MPQemuMsg ret = { 0 };
+ MPQemuRequest req = { 0 };
+ Error *local_err = NULL;
+
+ if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+ error_report("Bad address received when reading PCI config, pid %d",
+ getpid());
+ ret.data.u64 = UINT64_MAX;
+ } else {
+ ret.data.u64 = pci_default_read_config(dev, conf->addr, conf->l);
+ }
+
+ ret.cmd = RET_MSG;
+ ret.size = sizeof(ret.data.u64);
+
+ req.ioc = ioc;
+ req.msg = &ret;
+
+ mpqemu_msg_send_in_co(&req, ioc, &local_err);
+ if (local_err) {
+ error_report("Could not send message to proxy from pid %d",
+ getpid());
+ }
+}
diff --git a/hw/pci/proxy.c b/hw/pci/proxy.c
index 1bff744bd6..23aab44d8e 100644
--- a/hw/pci/proxy.c
+++ b/hw/pci/proxy.c
@@ -15,6 +15,8 @@
#include "io/channel-util.h"
#include "hw/qdev-properties.h"
#include "monitor/monitor.h"
+#include "io/mpqemu-link.h"
+#include "qemu/error-report.h"
static void proxy_set_socket(PCIProxyDev *pdev, int fd, Error **errp)
{
@@ -55,6 +57,51 @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
qio_channel_close(dev->ioc, NULL);
}
+static int config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
+ int l, unsigned int op)
+{
+ MPQemuMsg msg = { 0 };
+ long ret = -EINVAL;
+ Error *local_err = NULL;
+
+ msg.cmd = op;
+ msg.data.conf_data.addr = addr;
+ msg.data.conf_data.val = (op == PCI_CONFIG_WRITE) ? *val : 0;
+ msg.data.conf_data.l = l;
+ msg.size = sizeof(ConfDataMsg);
+
+ ret = mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
+ if (local_err) {
+ error_report("Failed to exchange PCI_CONFIG message with remote");
+ }
+ if (op == PCI_CONFIG_READ) {
+ *val = (uint32_t)ret;
+ }
+
+ return ret;
+}
+
+static uint32_t pci_proxy_read_config(PCIDevice *d, uint32_t addr, int len)
+{
+ uint32_t val;
+
+ (void)config_op_send(PCI_PROXY_DEV(d), addr, &val, len, PCI_CONFIG_READ);
+
+ return val;
+}
+
+static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t val,
+ int l)
+{
+ /*
+ * Some of the functions access the copy of the remote device
+ * PCI config space, therefore maintain it updated.
+ */
+ pci_default_write_config(d, addr, val, l);
+
+ (void)config_op_send(PCI_PROXY_DEV(d), addr, &val, l, PCI_CONFIG_WRITE);
+}
+
static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
@@ -62,6 +109,9 @@ static void pci_proxy_dev_class_init(ObjectClass *klass,
void *data)
k->realize = pci_proxy_dev_realize;
k->exit = pci_proxy_dev_exit;
+ k->config_read = pci_proxy_read_config;
+ k->config_write = pci_proxy_write_config;
+
device_class_set_props(dc, proxy_properties);
}
diff --git a/include/io/mpqemu-link.h b/include/io/mpqemu-link.h
index 62425b8f3b..a0ffedcdb1 100644
--- a/include/io/mpqemu-link.h
+++ b/include/io/mpqemu-link.h
@@ -34,6 +34,8 @@ typedef enum {
INIT = 0,
SYNC_SYSMEM,
RET_MSG,
+ PCI_CONFIG_WRITE,
+ PCI_CONFIG_READ,
MAX = INT_MAX,
} MPQemuCmd;
@@ -43,6 +45,12 @@ typedef struct {
off_t offsets[REMOTE_MAX_FDS];
} SyncSysmemMsg;
+typedef struct {
+ uint32_t addr;
+ uint32_t val;
+ int l;
+} ConfDataMsg;
+
/**
* MPQemuMsg:
* @cmd: The remote command
@@ -60,6 +68,7 @@ typedef struct {
union {
uint64_t u64;
+ ConfDataMsg conf_data;
SyncSysmemMsg sync_sysmem;
} data;
diff --git a/io/mpqemu-link.c b/io/mpqemu-link.c
index f5f22267d1..af9f536660 100644
--- a/io/mpqemu-link.c
+++ b/io/mpqemu-link.c
@@ -322,6 +322,12 @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
return false;
}
break;
+ case PCI_CONFIG_WRITE:
+ case PCI_CONFIG_READ:
+ if (msg->size != sizeof(ConfDataMsg)) {
+ return false;
+ }
+ break;
default:
break;
}
--
2.25.GIT
- [PATCH v9 00/20] Initial support for multi-process Qemu, elena . ufimtseva, 2020/08/27
- [PATCH v9 02/20] multi-process: Add config option for multi-process QEMU, elena . ufimtseva, 2020/08/27
- [PATCH v9 03/20] multi-process: setup PCI host bridge for remote device, elena . ufimtseva, 2020/08/27
- [PATCH v9 04/20] multi-process: setup a machine object for remote device process, elena . ufimtseva, 2020/08/27
- [PATCH v9 05/20] multi-process: add qio channel function to transmit, elena . ufimtseva, 2020/08/27
- [PATCH v9 06/20] multi-process: define MPQemuMsg format and transmission functions, elena . ufimtseva, 2020/08/27
- [PATCH v9 09/20] multi-process: Associate fd of a PCIDevice with its object, elena . ufimtseva, 2020/08/27
- [PATCH v9 10/20] multi-process: setup memory manager for remote device, elena . ufimtseva, 2020/08/27
- [PATCH v9 12/20] multi-process: add proxy communication functions, elena . ufimtseva, 2020/08/27
- [PATCH v9 14/20] multi-process: PCI BAR read/write handling for proxy & remote endpoints, elena . ufimtseva, 2020/08/27
- [PATCH v9 13/20] multi-process: Forward PCI config space acceses to the remote process,
elena . ufimtseva <=
- [PATCH v9 15/20] multi-process: Synchronize remote memory, elena . ufimtseva, 2020/08/27
- [PATCH v9 17/20] multi-process: Retrieve PCI info from remote process, elena . ufimtseva, 2020/08/27
- [PATCH v9 18/20] multi-process: perform device reset in the remote process, elena . ufimtseva, 2020/08/27
- [PATCH v9 16/20] multi-process: create IOHUB object to handle irq, elena . ufimtseva, 2020/08/27
- [PATCH v9 20/20] multi-process: add configure and usage information, elena . ufimtseva, 2020/08/27
- [PATCH v9 19/20] multi-process: add the concept description to docs/devel/qemu-multiprocess, elena . ufimtseva, 2020/08/27
- [PATCH v9 01/20] memory: alloc RAM from file at offset, elena . ufimtseva, 2020/08/27
- [PATCH v9 07/20] multi-process: define transmission functions in remote, elena . ufimtseva, 2020/08/27
- [PATCH v9 08/20] multi-process: Initialize message handler in remote device, elena . ufimtseva, 2020/08/27
- [PATCH v9 11/20] multi-process: introduce proxy object, elena . ufimtseva, 2020/08/27