From: elena.ufimtseva@oracle.com
To: qemu-devel@nongnu.org
Cc: elena.ufimtseva@oracle.com, fam@euphon.net,
swapnil.ingle@nutanix.com, john.g.johnson@oracle.com,
kraxel@redhat.com, jag.raman@oracle.com, quintela@redhat.com,
mst@redhat.com, armbru@redhat.com, kanth.ghatraju@oracle.com,
felipe@nutanix.com, thuth@redhat.com, ehabkost@redhat.com,
konrad.wilk@oracle.com, dgilbert@redhat.com, stefanha@redhat.com,
thanos.makatos@nutanix.com, rth@twiddle.net, kwolf@redhat.com,
berrange@redhat.com, mreitz@redhat.com,
ross.lagerwall@citrix.com, marcandre.lureau@gmail.com,
pbonzini@redhat.com
Subject: [PATCH v10 10/19] multi-process: introduce proxy object
Date: Mon, 5 Oct 2020 11:50:58 -0700 [thread overview]
Message-ID: <20a943d22c931bc5d435d3356568df9a80fb8d8e.1601923020.git.elena.ufimtseva@oracle.com> (raw)
In-Reply-To: <cover.1601923020.git.elena.ufimtseva@oracle.com>
From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Defines a PCI Device proxy object as a child of TYPE_PCI_DEVICE.
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>
---
MAINTAINERS | 2 +
hw/pci/meson.build | 1 +
hw/pci/proxy.c | 94 ++++++++++++++++++++++++++++++++++++++++++
include/hw/pci/proxy.h | 36 ++++++++++++++++
4 files changed, 133 insertions(+)
create mode 100644 hw/pci/proxy.c
create mode 100644 include/hw/pci/proxy.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 14b8c005fc..7b2096b300 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3052,6 +3052,8 @@ F: include/hw/i386/remote-obj.h
F: hw/i386/remote-obj.c
F: include/hw/i386/remote-memory.h
F: hw/i386/remote-memory.c
+F: hw/pci/proxy.c
+F: include/hw/pci/proxy.h
Build and test automation
-------------------------
diff --git a/hw/pci/meson.build b/hw/pci/meson.build
index 5c4bbac817..0df30172b5 100644
--- a/hw/pci/meson.build
+++ b/hw/pci/meson.build
@@ -12,6 +12,7 @@ pci_ss.add(files(
# allow plugging PCIe devices into PCI buses, include them even if
# CONFIG_PCI_EXPRESS=n.
pci_ss.add(files('pcie.c', 'pcie_aer.c'))
+pci_ss.add(when: 'CONFIG_MPQEMU', if_true: files('proxy.c'))
softmmu_ss.add(when: 'CONFIG_PCI_EXPRESS', if_true: files('pcie_port.c', 'pcie_host.c'))
softmmu_ss.add_all(when: 'CONFIG_PCI', if_true: pci_ss)
diff --git a/hw/pci/proxy.c b/hw/pci/proxy.c
new file mode 100644
index 0000000000..6b954f22a5
--- /dev/null
+++ b/hw/pci/proxy.c
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2018, 2020 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/pci/proxy.h"
+#include "hw/pci/pci.h"
+#include "qapi/error.h"
+#include "io/channel-util.h"
+#include "hw/qdev-properties.h"
+#include "monitor/monitor.h"
+#include "migration/blocker.h"
+
+static void proxy_set_socket(PCIProxyDev *pdev, int fd, Error **errp)
+{
+ pdev->ioc = qio_channel_new_fd(fd, errp);
+}
+
+static Property proxy_properties[] = {
+ DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
+{
+ PCIProxyDev *dev = PCI_PROXY_DEV(device);
+ int fd;
+
+ if (dev->fd) {
+ fd = monitor_fd_param(cur_mon, dev->fd, errp);
+ if (fd == -1) {
+ error_prepend(errp, "proxy: unable to parse fd: ");
+ return;
+ }
+ proxy_set_socket(dev, fd, errp);
+ } else {
+ error_setg(errp, "fd parameter not specified for %s",
+ DEVICE(device)->id);
+ return;
+ }
+
+ error_setg(&dev->migration_blocker, "%s does not support migration",
+ TYPE_PCI_PROXY_DEV);
+ if (migrate_add_blocker(dev->migration_blocker, errp)) {
+ error_free(dev->migration_blocker);
+ error_free(*errp);
+ dev->migration_blocker = NULL;
+ error_setg(errp, "Failed to set migration blocker");
+ }
+
+ qemu_mutex_init(&dev->io_mutex);
+ qio_channel_set_blocking(dev->ioc, true, NULL);
+}
+
+static void pci_proxy_dev_exit(PCIDevice *pdev)
+{
+ PCIProxyDev *dev = PCI_PROXY_DEV(pdev);
+
+ qio_channel_close(dev->ioc, NULL);
+}
+
+static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+ k->realize = pci_proxy_dev_realize;
+ k->exit = pci_proxy_dev_exit;
+ device_class_set_props(dc, proxy_properties);
+}
+
+static const TypeInfo pci_proxy_dev_type_info = {
+ .name = TYPE_PCI_PROXY_DEV,
+ .parent = TYPE_PCI_DEVICE,
+ .instance_size = sizeof(PCIProxyDev),
+ .class_init = pci_proxy_dev_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { },
+ },
+};
+
+static void pci_proxy_dev_register_types(void)
+{
+ type_register_static(&pci_proxy_dev_type_info);
+}
+
+type_init(pci_proxy_dev_register_types)
diff --git a/include/hw/pci/proxy.h b/include/hw/pci/proxy.h
new file mode 100644
index 0000000000..29b3cdda3e
--- /dev/null
+++ b/include/hw/pci/proxy.h
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2018, 2020 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef PROXY_H
+#define PROXY_H
+
+#include "hw/pci/pci.h"
+#include "io/channel.h"
+
+#define TYPE_PCI_PROXY_DEV "pci-proxy-dev"
+
+#define PCI_PROXY_DEV(obj) \
+ OBJECT_CHECK(PCIProxyDev, (obj), TYPE_PCI_PROXY_DEV)
+typedef struct PCIProxyDev PCIProxyDev;
+
+struct PCIProxyDev {
+ PCIDevice parent_dev;
+ char *fd;
+
+ /*
+ * Mutex used to protect the QIOChannel fd from
+ * the concurrent access by the VCPUs since proxy
+ * blocks while awaiting for the replies from the
+ * process remote.
+ */
+ QemuMutex io_mutex;
+ QIOChannel *ioc;
+ Error *migration_blocker;
+};
+
+#endif /* PROXY_H */
--
2.25.GIT
next prev parent reply other threads:[~2020-10-05 19:06 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-05 18:50 [PATCH v10 00/19] Initial support for multi-process Qemu elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 01/19] memory: alloc RAM from file at offset elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 02/19] multi-process: Add config option for multi-process QEMU elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 03/19] multi-process: setup PCI host bridge for remote device elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 04/19] multi-process: setup a machine object for remote device process elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 05/19] multi-process: add qio channel function to transmit elena.ufimtseva
2020-10-05 18:50 ` [PATCH v10 06/19] multi-process: define MPQemuMsg format and transmission functions elena.ufimtseva
2020-10-07 14:22 ` Stefan Hajnoczi
2020-10-05 18:50 ` [PATCH v10 07/19] multi-process: Initialize message handler in remote device elena.ufimtseva
2020-10-07 14:26 ` Stefan Hajnoczi
2020-10-05 18:50 ` [PATCH v10 08/19] multi-process: Associate fd of a PCIDevice with its object elena.ufimtseva
2020-10-07 14:34 ` Stefan Hajnoczi
2020-10-05 18:50 ` [PATCH v10 09/19] multi-process: setup memory manager for remote device elena.ufimtseva
2020-10-05 18:50 ` elena.ufimtseva [this message]
2020-10-07 14:37 ` [PATCH v10 10/19] multi-process: introduce proxy object Stefan Hajnoczi
2020-10-05 18:50 ` [PATCH v10 11/19] multi-process: add proxy communication functions elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 12/19] multi-process: Forward PCI config space acceses to the remote process elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 13/19] multi-process: PCI BAR read/write handling for proxy & remote endpoints elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 14/19] multi-process: Synchronize remote memory elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 15/19] multi-process: create IOHUB object to handle irq elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 16/19] multi-process: Retrieve PCI info from remote process elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 17/19] multi-process: perform device reset in the " elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 18/19] multi-process: add the concept description to docs/devel/qemu-multiprocess elena.ufimtseva
2020-10-05 18:51 ` [PATCH v10 19/19] multi-process: add configure and usage information elena.ufimtseva
2020-10-07 14:43 ` [PATCH v10 00/19] Initial support for multi-process Qemu Stefan Hajnoczi
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=20a943d22c931bc5d435d3356568df9a80fb8d8e.1601923020.git.elena.ufimtseva@oracle.com \
--to=elena.ufimtseva@oracle.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=dgilbert@redhat.com \
--cc=ehabkost@redhat.com \
--cc=fam@euphon.net \
--cc=felipe@nutanix.com \
--cc=jag.raman@oracle.com \
--cc=john.g.johnson@oracle.com \
--cc=kanth.ghatraju@oracle.com \
--cc=konrad.wilk@oracle.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@gmail.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
--cc=ross.lagerwall@citrix.com \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
--cc=swapnil.ingle@nutanix.com \
--cc=thanos.makatos@nutanix.com \
--cc=thuth@redhat.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).