[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 15/35] multi-process: PCI BAR read handling f
From: |
elena . ufimtseva |
Subject: |
[Qemu-devel] [RFC PATCH v2 15/35] multi-process: PCI BAR read handling for proxy & remote endpoints |
Date: |
Mon, 17 Jun 2019 11:16:02 -0700 |
From: Jagannathan Raman <address@hidden>
Proxy device object implements the read handler for PCI BAR accesses.
The handler sends BAR_READ message to the remote process.
The remote process implements handler for BAR_READ message.
Signed-off-by: Jagannathan Raman <address@hidden>
Signed-off-by: Elena Ufimtseva <address@hidden>
Signed-off-by: John G Johnson <address@hidden>
---
hw/proxy/qemu-proxy.c | 22 ++++++++++++++++
include/hw/proxy/qemu-proxy.h | 3 +++
include/io/proxy-link.h | 2 ++
remote/remote-main.c | 49 +++++++++++++++++++++++++++++++++++
4 files changed, 76 insertions(+)
diff --git a/hw/proxy/qemu-proxy.c b/hw/proxy/qemu-proxy.c
index 7f796a8e67..3ee3854f40 100644
--- a/hw/proxy/qemu-proxy.c
+++ b/hw/proxy/qemu-proxy.c
@@ -254,6 +254,7 @@ static void send_bar_access_msg(ProxyLinkState *proxy_link,
MemoryRegion *mr,
unsigned size, bool memory)
{
ProcMsg msg;
+ int wait;
memset(&msg, 0, sizeof(ProcMsg));
@@ -266,9 +267,20 @@ static void send_bar_access_msg(ProxyLinkState
*proxy_link, MemoryRegion *mr,
if (write) {
msg.cmd = BAR_WRITE;
msg.data1.bar_access.val = *val;
+ } else {
+ wait = GET_REMOTE_WAIT;
+
+ msg.cmd = BAR_READ;
+ msg.num_fds = 1;
+ msg.fds[0] = wait;
}
proxy_proc_send(proxy_link, &msg);
+
+ if (!write) {
+ *val = wait_for_remote(wait);
+ PUT_REMOTE_WAIT(wait);
+ }
}
void proxy_default_bar_write(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,
@@ -276,3 +288,13 @@ void proxy_default_bar_write(PCIProxyDev *dev,
MemoryRegion *mr, hwaddr addr,
{
send_bar_access_msg(dev->proxy_link, mr, true, addr, &val, size, memory);
}
+
+uint64_t proxy_default_bar_read(PCIProxyDev *dev, MemoryRegion *mr, hwaddr
addr,
+ unsigned size, bool memory)
+{
+ uint64_t val;
+
+ send_bar_access_msg(dev->proxy_link, mr, false, addr, &val, size, memory);
+
+ return val;
+}
diff --git a/include/hw/proxy/qemu-proxy.h b/include/hw/proxy/qemu-proxy.h
index b717c8d767..a0db811de4 100644
--- a/include/hw/proxy/qemu-proxy.h
+++ b/include/hw/proxy/qemu-proxy.h
@@ -78,4 +78,7 @@ int remote_spawn(PCIProxyDev *pdev, const char *command,
Error **errp);
void proxy_default_bar_write(PCIProxyDev *dev, MemoryRegion *mr, hwaddr addr,
uint64_t val, unsigned size, bool memory);
+uint64_t proxy_default_bar_read(PCIProxyDev *dev, MemoryRegion *mr, hwaddr
addr,
+ unsigned size, bool memory);
+
#endif /* QEMU_PROXY_H */
diff --git a/include/io/proxy-link.h b/include/io/proxy-link.h
index 20bc217212..69074a3519 100644
--- a/include/io/proxy-link.h
+++ b/include/io/proxy-link.h
@@ -57,6 +57,7 @@ typedef struct ProxyLinkState ProxyLinkState;
* CONF_WRITE PCI config. space write
* SYNC_SYSMEM Shares QEMU's RAM with remote device's RAM
* BAR_WRITE Writes to PCI BAR region
+ * BAR_READ Reads from PCI BAR region
*
*/
typedef enum {
@@ -65,6 +66,7 @@ typedef enum {
CONF_WRITE,
SYNC_SYSMEM,
BAR_WRITE,
+ BAR_READ,
MAX,
} proc_cmd_t;
diff --git a/remote/remote-main.c b/remote/remote-main.c
index 90e979289c..4372b71e89 100644
--- a/remote/remote-main.c
+++ b/remote/remote-main.c
@@ -93,6 +93,49 @@ static void process_bar_write(ProcMsg *msg, Error **errp)
}
}
+static void process_bar_read(ProcMsg *msg, Error **errp)
+{
+ bar_access_msg_t *bar_access = &msg->data1.bar_access;
+ AddressSpace *as;
+ int wait = msg->fds[0];
+ MemTxResult res;
+ uint64_t val = 0;
+
+ as = bar_access->memory ? &address_space_memory : &address_space_io;
+
+ assert(bar_access->size <= sizeof(uint64_t));
+
+ res = address_space_rw(as, bar_access->addr, MEMTXATTRS_UNSPECIFIED,
+ (uint8_t *)&val, bar_access->size, false);
+
+ if (res != MEMTX_OK) {
+ error_setg(errp, "Could not perform address space read operation,"
+ " inaccessible address: %lx.", bar_access->addr);
+ val = (uint64_t)-1;
+ goto fail;
+ }
+
+ switch (bar_access->size) {
+ case 4:
+ val = *((uint32_t *)&val);
+ break;
+ case 2:
+ val = *((uint16_t *)&val);
+ break;
+ case 1:
+ val = *((uint8_t *)&val);
+ break;
+ default:
+ error_setg(errp, "Invalid PCI BAR read size");
+ return;
+ }
+
+fail:
+ notify_proxy(wait, val);
+
+ PUT_REMOTE_WAIT(wait);
+}
+
static void process_msg(GIOCondition cond)
{
ProcMsg *msg = NULL;
@@ -125,6 +168,12 @@ static void process_msg(GIOCondition cond)
goto finalize_loop;
}
break;
+ case BAR_READ:
+ process_bar_read(msg, &err);
+ if (err) {
+ goto finalize_loop;
+ }
+ break;
default:
error_setg(&err, "Unknown command");
goto finalize_loop;
--
2.17.1
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-devel] [RFC PATCH v2 15/35] multi-process: PCI BAR read handling for proxy & remote endpoints,
elena . ufimtseva <=