[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v3 PATCH 43/45] multi-process: prevent duplicate memor
From: |
Jagannathan Raman |
Subject: |
[Qemu-devel] [RFC v3 PATCH 43/45] multi-process: prevent duplicate memory initialization in remote |
Date: |
Tue, 3 Sep 2019 16:38:09 -0400 |
When multiple controllers are configured in a remote process,
it's better for the memory to be managed by only one of the proxy
objects for that process, in order to conserve file descriptors. Added
"mem_int" flag for this purpose.
Signed-off-by: Elena Ufimtseva <address@hidden>
Signed-off-by: John G Johnson <address@hidden>
Signed-off-by: Jagannathan Raman <address@hidden>
---
New patch in v3
hw/proxy/qemu-proxy.c | 13 ++++++++++++-
include/hw/proxy/qemu-proxy.h | 1 +
qdev-monitor.c | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/hw/proxy/qemu-proxy.c b/hw/proxy/qemu-proxy.c
index c812145..8b820cf 100644
--- a/hw/proxy/qemu-proxy.c
+++ b/hw/proxy/qemu-proxy.c
@@ -363,6 +363,13 @@ static void pci_proxy_write_config(PCIDevice *d, uint32_t
addr, uint32_t val,
PCI_PROXY_DEV(d)->dev_id, CONF_WRITE);
}
+static void pci_proxy_dev_inst_init(Object *obj)
+{
+ PCIProxyDev *dev = PCI_PROXY_DEV(obj);
+
+ dev->mem_init = false;
+}
+
static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
{
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
@@ -377,6 +384,7 @@ static const TypeInfo pci_proxy_dev_type_info = {
.name = TYPE_PCI_PROXY_DEV,
.parent = TYPE_PCI_DEVICE,
.instance_size = sizeof(PCIProxyDev),
+ .instance_init = pci_proxy_dev_inst_init,
.abstract = true,
.class_size = sizeof(PCIProxyDevClass),
.class_init = pci_proxy_dev_class_init,
@@ -483,7 +491,10 @@ static void init_proxy(PCIDevice *dev, char *command, bool
need_spawn, Error **e
proxy_link_init_channel(pdev->proxy_link, &pdev->proxy_link->mmio,
pdev->mmio_sock);
- configure_memory_sync(pdev->sync, pdev->proxy_link);
+ if (!pdev->mem_init) {
+ pdev->mem_init = true;
+ configure_memory_sync(pdev->sync, pdev->proxy_link);
+ }
}
static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
diff --git a/include/hw/proxy/qemu-proxy.h b/include/hw/proxy/qemu-proxy.h
index d88fbd4..610695f 100644
--- a/include/hw/proxy/qemu-proxy.h
+++ b/include/hw/proxy/qemu-proxy.h
@@ -51,6 +51,7 @@ typedef struct PCIProxyDev {
ProxyLinkState *proxy_link;
RemoteMemSync *sync;
+ bool mem_init;
struct kvm_irqfd irqfd;
EventNotifier intr;
diff --git a/qdev-monitor.c b/qdev-monitor.c
index f1065af..3b08e23 100644
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -712,10 +712,10 @@ DeviceState *qdev_proxy_add(const char *rid, const char
*id, char *bus,
pdev->socket = old_pdev->socket;
pdev->mmio_sock = old_pdev->mmio_sock;
pdev->remote_pid = old_pdev->remote_pid;
+ pdev->mem_init = true;
} else {
pdev->rsocket = managed ? rsocket : -1;
pdev->socket = managed ? rsocket : -1;
-
}
pdev->managed = managed;
--
1.8.3.1
- [Qemu-devel] [RFC v3 PATCH 33/45] multi-process: add support for multiple devices, (continued)
- [Qemu-devel] [RFC v3 PATCH 33/45] multi-process: add support for multiple devices, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 35/45] multi-process: handle heartbeat messages in remote process, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 37/45] multi-process: perform device reset in the remote process, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 38/45] multi-process/mon: stub functions to enable QMP module for remote process, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 39/45] multi-process/mon: build system for QMP module in remote process, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 36/45] multi-process: Use separate MMIO communication channel, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 40/45] multi-process/mon: Refactor monitor/chardev functions out of vl.c, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 42/45] multi-process/mon: Initialize QMP module for remote processes, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 43/45] multi-process: prevent duplicate memory initialization in remote,
Jagannathan Raman <=
- [Qemu-devel] [RFC v3 PATCH 01/45] multi-process: memory: alloc RAM from file at offset, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 03/45] multi-process: add a command line option for debug file, Jagannathan Raman, 2019/09/03
- [Qemu-devel] [RFC v3 PATCH 41/45] multi-process/mon: trim HMP command set for remote storage processes, Jagannathan Raman, 2019/09/03
[Qemu-devel] [RFC v3 PATCH 44/45] multi-process: add the concept description to docs/devel/qemu-multiprocess, Jagannathan Raman, 2019/09/03