* [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-13 12:52 [Qemu-devel] [PATCH v2 0/2] Xen: Use ioreq-server API Paul Durrant
@ 2014-10-13 12:52 ` Paul Durrant
2014-10-13 12:52 ` [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available Paul Durrant
2014-10-13 12:52 ` Paul Durrant
2 siblings, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 12:52 UTC (permalink / raw)
To: qemu-devel, xen-devel
Cc: Peter Crosthwaite, Thomas Huth, Michael S. Tsirkin,
Christian Borntraeger, Paul Durrant, Paolo Bonzini,
Andreas Faerber
The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
models explicitly register with Xen for config space accesses. This patch
adds a PCI bus listener interface which can be used by the Xen interface
code to monitor PCI buses for arrival and departure of devices.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Andreas Faerber <afaerber@suse.de>
Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
---
hw/pci/pci.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
include/hw/pci/pci.h | 9 +++++++
include/qemu/typedefs.h | 1 +
3 files changed, 75 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 6ce75aa..53c955d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU;
static QLIST_HEAD(, PCIHostState) pci_host_bridges;
+static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
+ = QTAILQ_HEAD_INITIALIZER(pci_listeners);
+
+enum ListenerDirection { Forward, Reverse };
+
+#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
+ do { \
+ PCIListener *_listener; \
+ \
+ switch (_direction) { \
+ case Forward: \
+ QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
+ if (_listener->_callback) { \
+ _listener->_callback(_listener, ##_args); \
+ } \
+ } \
+ break; \
+ case Reverse: \
+ QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
+ pci_listeners, link) { \
+ if (_listener->_callback) { \
+ _listener->_callback(_listener, ##_args); \
+ } \
+ } \
+ break; \
+ default: \
+ abort(); \
+ } \
+ } while (0)
+
+static int pci_listener_add(DeviceState *dev, void *opaque)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+ PCIDevice *pci_dev = PCI_DEVICE(dev);
+
+ PCI_LISTENER_CALL(device_add, Forward, pci_dev);
+ }
+
+ return 0;
+}
+
+void pci_listener_register(PCIListener *listener)
+{
+ PCIHostState *host;
+
+ QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
+
+ QLIST_FOREACH(host, &pci_host_bridges, next) {
+ PCIBus *bus = host->bus;
+
+ qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
+ NULL, NULL);
+ }
+}
+
+void pci_listener_unregister(PCIListener *listener)
+{
+ QTAILQ_REMOVE(&pci_listeners, listener, link);
+}
+
static int pci_bar(PCIDevice *d, int reg)
{
uint8_t type;
@@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
static void do_pci_unregister_device(PCIDevice *pci_dev)
{
+ PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
+
pci_dev->bus->devices[pci_dev->devfn] = NULL;
pci_config_free(pci_dev);
@@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
pci_dev->config_write = config_write;
bus->devices[devfn] = pci_dev;
pci_dev->version_id = 2; /* Current pci device vmstate version */
+
+ PCI_LISTENER_CALL(device_add, Forward, pci_dev);
+
return pci_dev;
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index c352c7b..6c21b37 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -303,6 +303,15 @@ struct PCIDevice {
MSIVectorPollNotifier msix_vector_poll_notifier;
};
+struct PCIListener {
+ void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
+ void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
+ QTAILQ_ENTRY(PCIListener) link;
+};
+
+void pci_listener_register(PCIListener *listener);
+void pci_listener_unregister(PCIListener *listener);
+
void pci_register_bar(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory);
void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 04df51b..2b974c6 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
typedef struct PCIExpressHost PCIExpressHost;
typedef struct PCIBus PCIBus;
typedef struct PCIDevice PCIDevice;
+typedef struct PCIListener PCIListener;
typedef struct PCIExpressDevice PCIExpressDevice;
typedef struct PCIBridge PCIBridge;
typedef struct PCIEAERMsg PCIEAERMsg;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH v2 1/2] Add PCI bus listener interface
@ 2014-10-13 12:52 ` Paul Durrant
0 siblings, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 12:52 UTC (permalink / raw)
To: qemu-devel, xen-devel
Cc: Peter Crosthwaite, Thomas Huth, Michael S. Tsirkin,
Christian Borntraeger, Paul Durrant, Paolo Bonzini,
Andreas Faerber
The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
models explicitly register with Xen for config space accesses. This patch
adds a PCI bus listener interface which can be used by the Xen interface
code to monitor PCI buses for arrival and departure of devices.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Andreas Faerber <afaerber@suse.de>
Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
---
hw/pci/pci.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
include/hw/pci/pci.h | 9 +++++++
include/qemu/typedefs.h | 1 +
3 files changed, 75 insertions(+)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 6ce75aa..53c955d 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU;
static QLIST_HEAD(, PCIHostState) pci_host_bridges;
+static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
+ = QTAILQ_HEAD_INITIALIZER(pci_listeners);
+
+enum ListenerDirection { Forward, Reverse };
+
+#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
+ do { \
+ PCIListener *_listener; \
+ \
+ switch (_direction) { \
+ case Forward: \
+ QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
+ if (_listener->_callback) { \
+ _listener->_callback(_listener, ##_args); \
+ } \
+ } \
+ break; \
+ case Reverse: \
+ QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
+ pci_listeners, link) { \
+ if (_listener->_callback) { \
+ _listener->_callback(_listener, ##_args); \
+ } \
+ } \
+ break; \
+ default: \
+ abort(); \
+ } \
+ } while (0)
+
+static int pci_listener_add(DeviceState *dev, void *opaque)
+{
+ if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+ PCIDevice *pci_dev = PCI_DEVICE(dev);
+
+ PCI_LISTENER_CALL(device_add, Forward, pci_dev);
+ }
+
+ return 0;
+}
+
+void pci_listener_register(PCIListener *listener)
+{
+ PCIHostState *host;
+
+ QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
+
+ QLIST_FOREACH(host, &pci_host_bridges, next) {
+ PCIBus *bus = host->bus;
+
+ qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
+ NULL, NULL);
+ }
+}
+
+void pci_listener_unregister(PCIListener *listener)
+{
+ QTAILQ_REMOVE(&pci_listeners, listener, link);
+}
+
static int pci_bar(PCIDevice *d, int reg)
{
uint8_t type;
@@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
static void do_pci_unregister_device(PCIDevice *pci_dev)
{
+ PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
+
pci_dev->bus->devices[pci_dev->devfn] = NULL;
pci_config_free(pci_dev);
@@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
pci_dev->config_write = config_write;
bus->devices[devfn] = pci_dev;
pci_dev->version_id = 2; /* Current pci device vmstate version */
+
+ PCI_LISTENER_CALL(device_add, Forward, pci_dev);
+
return pci_dev;
}
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index c352c7b..6c21b37 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -303,6 +303,15 @@ struct PCIDevice {
MSIVectorPollNotifier msix_vector_poll_notifier;
};
+struct PCIListener {
+ void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
+ void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
+ QTAILQ_ENTRY(PCIListener) link;
+};
+
+void pci_listener_register(PCIListener *listener);
+void pci_listener_unregister(PCIListener *listener);
+
void pci_register_bar(PCIDevice *pci_dev, int region_num,
uint8_t attr, MemoryRegion *memory);
void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index 04df51b..2b974c6 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
typedef struct PCIExpressHost PCIExpressHost;
typedef struct PCIBus PCIBus;
typedef struct PCIDevice PCIDevice;
+typedef struct PCIListener PCIListener;
typedef struct PCIExpressDevice PCIExpressDevice;
typedef struct PCIBridge PCIBridge;
typedef struct PCIEAERMsg PCIEAERMsg;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [PATCH v2 1/2] Add PCI bus listener interface
2014-10-13 12:52 ` Paul Durrant
(?)
@ 2014-10-14 9:53 ` Michael S. Tsirkin
-1 siblings, 0 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 9:53 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel, Christian Borntraeger,
Paolo Bonzini, xen-devel, Andreas Faerber
On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> models explicitly register with Xen for config space accesses. This patch
> adds a PCI bus listener interface which can be used by the Xen interface
> code to monitor PCI buses for arrival and departure of devices.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Andreas Faerber <afaerber@suse.de>
> Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Do you really need multiple notifiers?
In any case, I think such a mechanism makes more sense on QOM level:
we have APIs to find objects of a given class and/or at a given path,
why not a mechanism to get notified when said objects are added/removed.
> ---
> hw/pci/pci.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/pci/pci.h | 9 +++++++
> include/qemu/typedefs.h | 1 +
> 3 files changed, 75 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 6ce75aa..53c955d 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU;
>
> static QLIST_HEAD(, PCIHostState) pci_host_bridges;
>
> +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> +
> +enum ListenerDirection { Forward, Reverse };
> +
> +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> + do { \
> + PCIListener *_listener; \
> + \
> + switch (_direction) { \
> + case Forward: \
> + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> + if (_listener->_callback) { \
> + _listener->_callback(_listener, ##_args); \
> + } \
> + } \
> + break; \
> + case Reverse: \
> + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> + pci_listeners, link) { \
> + if (_listener->_callback) { \
> + _listener->_callback(_listener, ##_args); \
> + } \
> + } \
> + break; \
> + default: \
> + abort(); \
> + } \
> + } while (0)
> +
> +static int pci_listener_add(DeviceState *dev, void *opaque)
> +{
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> + PCIDevice *pci_dev = PCI_DEVICE(dev);
> +
> + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> + }
> +
> + return 0;
> +}
> +
> +void pci_listener_register(PCIListener *listener)
> +{
> + PCIHostState *host;
> +
> + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> +
> + QLIST_FOREACH(host, &pci_host_bridges, next) {
> + PCIBus *bus = host->bus;
> +
> + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> + NULL, NULL);
> + }
> +}
> +
> +void pci_listener_unregister(PCIListener *listener)
> +{
> + QTAILQ_REMOVE(&pci_listeners, listener, link);
> +}
> +
> static int pci_bar(PCIDevice *d, int reg)
> {
> uint8_t type;
> @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
>
> static void do_pci_unregister_device(PCIDevice *pci_dev)
> {
> + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> +
> pci_dev->bus->devices[pci_dev->devfn] = NULL;
> pci_config_free(pci_dev);
>
> @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
> pci_dev->config_write = config_write;
> bus->devices[devfn] = pci_dev;
> pci_dev->version_id = 2; /* Current pci device vmstate version */
> +
> + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> +
> return pci_dev;
> }
>
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index c352c7b..6c21b37 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -303,6 +303,15 @@ struct PCIDevice {
> MSIVectorPollNotifier msix_vector_poll_notifier;
> };
>
> +struct PCIListener {
> + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> + QTAILQ_ENTRY(PCIListener) link;
> +};
> +
> +void pci_listener_register(PCIListener *listener);
> +void pci_listener_unregister(PCIListener *listener);
> +
> void pci_register_bar(PCIDevice *pci_dev, int region_num,
> uint8_t attr, MemoryRegion *memory);
> void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 04df51b..2b974c6 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> typedef struct PCIExpressHost PCIExpressHost;
> typedef struct PCIBus PCIBus;
> typedef struct PCIDevice PCIDevice;
> +typedef struct PCIListener PCIListener;
> typedef struct PCIExpressDevice PCIExpressDevice;
> typedef struct PCIBridge PCIBridge;
> typedef struct PCIEAERMsg PCIEAERMsg;
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-13 12:52 ` Paul Durrant
(?)
(?)
@ 2014-10-14 9:53 ` Michael S. Tsirkin
2014-10-14 10:08 ` Paul Durrant
2014-10-14 10:08 ` Paul Durrant
-1 siblings, 2 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 9:53 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel, Christian Borntraeger,
Paolo Bonzini, xen-devel, Andreas Faerber
On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> models explicitly register with Xen for config space accesses. This patch
> adds a PCI bus listener interface which can be used by the Xen interface
> code to monitor PCI buses for arrival and departure of devices.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> Cc: Michael S. Tsirkin <mst@redhat.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Andreas Faerber <afaerber@suse.de>
> Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Do you really need multiple notifiers?
In any case, I think such a mechanism makes more sense on QOM level:
we have APIs to find objects of a given class and/or at a given path,
why not a mechanism to get notified when said objects are added/removed.
> ---
> hw/pci/pci.c | 65 +++++++++++++++++++++++++++++++++++++++++++++++
> include/hw/pci/pci.h | 9 +++++++
> include/qemu/typedefs.h | 1 +
> 3 files changed, 75 insertions(+)
>
> diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> index 6ce75aa..53c955d 100644
> --- a/hw/pci/pci.c
> +++ b/hw/pci/pci.c
> @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id = PCI_SUBDEVICE_ID_QEMU;
>
> static QLIST_HEAD(, PCIHostState) pci_host_bridges;
>
> +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> +
> +enum ListenerDirection { Forward, Reverse };
> +
> +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> + do { \
> + PCIListener *_listener; \
> + \
> + switch (_direction) { \
> + case Forward: \
> + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> + if (_listener->_callback) { \
> + _listener->_callback(_listener, ##_args); \
> + } \
> + } \
> + break; \
> + case Reverse: \
> + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> + pci_listeners, link) { \
> + if (_listener->_callback) { \
> + _listener->_callback(_listener, ##_args); \
> + } \
> + } \
> + break; \
> + default: \
> + abort(); \
> + } \
> + } while (0)
> +
> +static int pci_listener_add(DeviceState *dev, void *opaque)
> +{
> + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> + PCIDevice *pci_dev = PCI_DEVICE(dev);
> +
> + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> + }
> +
> + return 0;
> +}
> +
> +void pci_listener_register(PCIListener *listener)
> +{
> + PCIHostState *host;
> +
> + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> +
> + QLIST_FOREACH(host, &pci_host_bridges, next) {
> + PCIBus *bus = host->bus;
> +
> + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> + NULL, NULL);
> + }
> +}
> +
> +void pci_listener_unregister(PCIListener *listener)
> +{
> + QTAILQ_REMOVE(&pci_listeners, listener, link);
> +}
> +
> static int pci_bar(PCIDevice *d, int reg)
> {
> uint8_t type;
> @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
>
> static void do_pci_unregister_device(PCIDevice *pci_dev)
> {
> + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> +
> pci_dev->bus->devices[pci_dev->devfn] = NULL;
> pci_config_free(pci_dev);
>
> @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev, PCIBus *bus,
> pci_dev->config_write = config_write;
> bus->devices[devfn] = pci_dev;
> pci_dev->version_id = 2; /* Current pci device vmstate version */
> +
> + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> +
> return pci_dev;
> }
>
> diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> index c352c7b..6c21b37 100644
> --- a/include/hw/pci/pci.h
> +++ b/include/hw/pci/pci.h
> @@ -303,6 +303,15 @@ struct PCIDevice {
> MSIVectorPollNotifier msix_vector_poll_notifier;
> };
>
> +struct PCIListener {
> + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> + QTAILQ_ENTRY(PCIListener) link;
> +};
> +
> +void pci_listener_register(PCIListener *listener);
> +void pci_listener_unregister(PCIListener *listener);
> +
> void pci_register_bar(PCIDevice *pci_dev, int region_num,
> uint8_t attr, MemoryRegion *memory);
> void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> index 04df51b..2b974c6 100644
> --- a/include/qemu/typedefs.h
> +++ b/include/qemu/typedefs.h
> @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> typedef struct PCIExpressHost PCIExpressHost;
> typedef struct PCIBus PCIBus;
> typedef struct PCIDevice PCIDevice;
> +typedef struct PCIListener PCIListener;
> typedef struct PCIExpressDevice PCIExpressDevice;
> typedef struct PCIBridge PCIBridge;
> typedef struct PCIEAERMsg PCIEAERMsg;
> --
> 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 9:53 ` [Qemu-devel] " Michael S. Tsirkin
@ 2014-10-14 10:08 ` Paul Durrant
2014-10-14 11:26 ` Michael S. Tsirkin
2014-10-14 11:26 ` Michael S. Tsirkin
2014-10-14 10:08 ` Paul Durrant
1 sibling, 2 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-14 10:08 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 14 October 2014 10:54
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> Borntraeger
> Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
>
> On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> > models explicitly register with Xen for config space accesses. This patch
> > adds a PCI bus listener interface which can be used by the Xen interface
> > code to monitor PCI buses for arrival and departure of devices.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: Andreas Faerber <afaerber@suse.de>
> > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
>
> Do you really need multiple notifiers?
>
I don't quite understand what you mean by multiple notifiers. Are you suggesting that the PCI listener could be combined with the memory listener?
> In any case, I think such a mechanism makes more sense on QOM level:
> we have APIs to find objects of a given class and/or at a given path,
> why not a mechanism to get notified when said objects are added/removed.
>
Having a general object listener could work as long as notifications could be filtered such that the Xen code could get notifications purely for PCI devices. The set of listeners clearly cannot be added to the object itself though, as you could then only register listeners after the object is created.
Paul
>
>
> > ---
> > hw/pci/pci.c | 65
> +++++++++++++++++++++++++++++++++++++++++++++++
> > include/hw/pci/pci.h | 9 +++++++
> > include/qemu/typedefs.h | 1 +
> > 3 files changed, 75 insertions(+)
> >
> > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > index 6ce75aa..53c955d 100644
> > --- a/hw/pci/pci.c
> > +++ b/hw/pci/pci.c
> > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> PCI_SUBDEVICE_ID_QEMU;
> >
> > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> >
> > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > +
> > +enum ListenerDirection { Forward, Reverse };
> > +
> > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > + do { \
> > + PCIListener *_listener; \
> > + \
> > + switch (_direction) { \
> > + case Forward: \
> > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > + if (_listener->_callback) { \
> > + _listener->_callback(_listener, ##_args); \
> > + } \
> > + } \
> > + break; \
> > + case Reverse: \
> > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > + pci_listeners, link) { \
> > + if (_listener->_callback) { \
> > + _listener->_callback(_listener, ##_args); \
> > + } \
> > + } \
> > + break; \
> > + default: \
> > + abort(); \
> > + } \
> > + } while (0)
> > +
> > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > +{
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > +
> > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +void pci_listener_register(PCIListener *listener)
> > +{
> > + PCIHostState *host;
> > +
> > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > +
> > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > + PCIBus *bus = host->bus;
> > +
> > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > + NULL, NULL);
> > + }
> > +}
> > +
> > +void pci_listener_unregister(PCIListener *listener)
> > +{
> > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > +}
> > +
> > static int pci_bar(PCIDevice *d, int reg)
> > {
> > uint8_t type;
> > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> >
> > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > {
> > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > +
> > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > pci_config_free(pci_dev);
> >
> > @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice
> *pci_dev, PCIBus *bus,
> > pci_dev->config_write = config_write;
> > bus->devices[devfn] = pci_dev;
> > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > +
> > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > +
> > return pci_dev;
> > }
> >
> > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > index c352c7b..6c21b37 100644
> > --- a/include/hw/pci/pci.h
> > +++ b/include/hw/pci/pci.h
> > @@ -303,6 +303,15 @@ struct PCIDevice {
> > MSIVectorPollNotifier msix_vector_poll_notifier;
> > };
> >
> > +struct PCIListener {
> > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > + QTAILQ_ENTRY(PCIListener) link;
> > +};
> > +
> > +void pci_listener_register(PCIListener *listener);
> > +void pci_listener_unregister(PCIListener *listener);
> > +
> > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > uint8_t attr, MemoryRegion *memory);
> > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > index 04df51b..2b974c6 100644
> > --- a/include/qemu/typedefs.h
> > +++ b/include/qemu/typedefs.h
> > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > typedef struct PCIExpressHost PCIExpressHost;
> > typedef struct PCIBus PCIBus;
> > typedef struct PCIDevice PCIDevice;
> > +typedef struct PCIListener PCIListener;
> > typedef struct PCIExpressDevice PCIExpressDevice;
> > typedef struct PCIBridge PCIBridge;
> > typedef struct PCIEAERMsg PCIEAERMsg;
> > --
> > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 10:08 ` Paul Durrant
@ 2014-10-14 11:26 ` Michael S. Tsirkin
2014-10-14 12:44 ` Paul Durrant
2014-10-14 12:44 ` [Qemu-devel] " Paul Durrant
2014-10-14 11:26 ` Michael S. Tsirkin
1 sibling, 2 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 11:26 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > -----Original Message-----
> > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > Sent: 14 October 2014 10:54
> > To: Paul Durrant
> > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > Borntraeger
> > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> >
> > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> > > models explicitly register with Xen for config space accesses. This patch
> > > adds a PCI bus listener interface which can be used by the Xen interface
> > > code to monitor PCI buses for arrival and departure of devices.
> > >
> > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > Cc: Andreas Faerber <afaerber@suse.de>
> > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> >
> > Do you really need multiple notifiers?
> >
>
> I don't quite understand what you mean by multiple notifiers. Are you suggesting that the PCI listener could be combined with the memory listener?
Bus is already notified about the hotplug.
Do you need another notification, or can you override that one?
>
> > In any case, I think such a mechanism makes more sense on QOM level:
> > we have APIs to find objects of a given class and/or at a given path,
> > why not a mechanism to get notified when said objects are added/removed.
> >
>
> Having a general object listener could work as long as notifications
> could be filtered such that the Xen code could get notifications
> purely for PCI devices.
As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
to do the filtering.
> The set of listeners clearly cannot be added
> to the object itself though, as you could then only register listeners
> after the object is created.
>
> Paul
Yes.
One other thing you need to consider: do you want to be notified
when removal is requested, or after it happens?
> >
> >
> > > ---
> > > hw/pci/pci.c | 65
> > +++++++++++++++++++++++++++++++++++++++++++++++
> > > include/hw/pci/pci.h | 9 +++++++
> > > include/qemu/typedefs.h | 1 +
> > > 3 files changed, 75 insertions(+)
> > >
> > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > index 6ce75aa..53c955d 100644
> > > --- a/hw/pci/pci.c
> > > +++ b/hw/pci/pci.c
> > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > PCI_SUBDEVICE_ID_QEMU;
> > >
> > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > >
> > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > +
> > > +enum ListenerDirection { Forward, Reverse };
> > > +
> > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > + do { \
> > > + PCIListener *_listener; \
> > > + \
> > > + switch (_direction) { \
> > > + case Forward: \
> > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > + if (_listener->_callback) { \
> > > + _listener->_callback(_listener, ##_args); \
> > > + } \
> > > + } \
> > > + break; \
> > > + case Reverse: \
> > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > + pci_listeners, link) { \
> > > + if (_listener->_callback) { \
> > > + _listener->_callback(_listener, ##_args); \
> > > + } \
> > > + } \
> > > + break; \
> > > + default: \
> > > + abort(); \
> > > + } \
> > > + } while (0)
> > > +
> > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > +{
> > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > +
> > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +void pci_listener_register(PCIListener *listener)
> > > +{
> > > + PCIHostState *host;
> > > +
> > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > +
> > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > + PCIBus *bus = host->bus;
> > > +
> > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > + NULL, NULL);
> > > + }
> > > +}
> > > +
> > > +void pci_listener_unregister(PCIListener *listener)
> > > +{
> > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > +}
> > > +
> > > static int pci_bar(PCIDevice *d, int reg)
> > > {
> > > uint8_t type;
> > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > >
> > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > {
> > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > +
> > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > pci_config_free(pci_dev);
> > >
> > > @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice
> > *pci_dev, PCIBus *bus,
> > > pci_dev->config_write = config_write;
> > > bus->devices[devfn] = pci_dev;
> > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > +
> > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > +
> > > return pci_dev;
> > > }
> > >
> > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > index c352c7b..6c21b37 100644
> > > --- a/include/hw/pci/pci.h
> > > +++ b/include/hw/pci/pci.h
> > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > };
> > >
> > > +struct PCIListener {
> > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > + QTAILQ_ENTRY(PCIListener) link;
> > > +};
> > > +
> > > +void pci_listener_register(PCIListener *listener);
> > > +void pci_listener_unregister(PCIListener *listener);
> > > +
> > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > uint8_t attr, MemoryRegion *memory);
> > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > index 04df51b..2b974c6 100644
> > > --- a/include/qemu/typedefs.h
> > > +++ b/include/qemu/typedefs.h
> > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > typedef struct PCIExpressHost PCIExpressHost;
> > > typedef struct PCIBus PCIBus;
> > > typedef struct PCIDevice PCIDevice;
> > > +typedef struct PCIListener PCIListener;
> > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > typedef struct PCIBridge PCIBridge;
> > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > --
> > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 11:26 ` Michael S. Tsirkin
@ 2014-10-14 12:44 ` Paul Durrant
2014-10-14 12:44 ` [Qemu-devel] " Paul Durrant
1 sibling, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-14 12:44 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 14 October 2014 12:27
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> Borntraeger
> Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
>
> On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > > -----Original Message-----
> > > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > > Sent: 14 October 2014 10:54
> > > To: Paul Durrant
> > > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > > Borntraeger
> > > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> > >
> > > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI
> device
> > > > models explicitly register with Xen for config space accesses. This patch
> > > > adds a PCI bus listener interface which can be used by the Xen interface
> > > > code to monitor PCI buses for arrival and departure of devices.
> > > >
> > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > Cc: Andreas Faerber <afaerber@suse.de>
> > > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> > >
> > > Do you really need multiple notifiers?
> > >
> >
> > I don't quite understand what you mean by multiple notifiers. Are you
> suggesting that the PCI listener could be combined with the memory
> listener?
>
>
> Bus is already notified about the hotplug.
> Do you need another notification, or can you override that one?
>
I'm not sure. IIRC there's some sort of 'coldplug' bypass for things that are present on the PCI bus before the guest is started, so I'm not sure the notification would happen.
> >
> > > In any case, I think such a mechanism makes more sense on QOM level:
> > > we have APIs to find objects of a given class and/or at a given path,
> > > why not a mechanism to get notified when said objects are
> added/removed.
> > >
> >
> > Having a general object listener could work as long as notifications
> > could be filtered such that the Xen code could get notifications
> > purely for PCI devices.
>
> As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
> to do the filtering.
>
That sounds plausible then. I'll investigate.
> > The set of listeners clearly cannot be added
> > to the object itself though, as you could then only register listeners
> > after the object is created.
> >
> > Paul
>
> Yes.
>
>
> One other thing you need to consider: do you want to be notified
> when removal is requested, or after it happens?
>
The unmapping of the device from Xen needs to happen after it's really gone away, so I guess object destruction time it right for that one.
Paul
> > >
> > >
> > > > ---
> > > > hw/pci/pci.c | 65
> > > +++++++++++++++++++++++++++++++++++++++++++++++
> > > > include/hw/pci/pci.h | 9 +++++++
> > > > include/qemu/typedefs.h | 1 +
> > > > 3 files changed, 75 insertions(+)
> > > >
> > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > > index 6ce75aa..53c955d 100644
> > > > --- a/hw/pci/pci.c
> > > > +++ b/hw/pci/pci.c
> > > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > > PCI_SUBDEVICE_ID_QEMU;
> > > >
> > > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > > >
> > > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > > +
> > > > +enum ListenerDirection { Forward, Reverse };
> > > > +
> > > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > > + do { \
> > > > + PCIListener *_listener; \
> > > > + \
> > > > + switch (_direction) { \
> > > > + case Forward: \
> > > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > > + if (_listener->_callback) { \
> > > > + _listener->_callback(_listener, ##_args); \
> > > > + } \
> > > > + } \
> > > > + break; \
> > > > + case Reverse: \
> > > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > > + pci_listeners, link) { \
> > > > + if (_listener->_callback) { \
> > > > + _listener->_callback(_listener, ##_args); \
> > > > + } \
> > > > + } \
> > > > + break; \
> > > > + default: \
> > > > + abort(); \
> > > > + } \
> > > > + } while (0)
> > > > +
> > > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > > +{
> > > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > > +
> > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +void pci_listener_register(PCIListener *listener)
> > > > +{
> > > > + PCIHostState *host;
> > > > +
> > > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > > +
> > > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > > + PCIBus *bus = host->bus;
> > > > +
> > > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > > + NULL, NULL);
> > > > + }
> > > > +}
> > > > +
> > > > +void pci_listener_unregister(PCIListener *listener)
> > > > +{
> > > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > > +}
> > > > +
> > > > static int pci_bar(PCIDevice *d, int reg)
> > > > {
> > > > uint8_t type;
> > > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > > >
> > > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > > {
> > > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > > +
> > > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > > pci_config_free(pci_dev);
> > > >
> > > > @@ -878,6 +940,9 @@ static PCIDevice
> *do_pci_register_device(PCIDevice
> > > *pci_dev, PCIBus *bus,
> > > > pci_dev->config_write = config_write;
> > > > bus->devices[devfn] = pci_dev;
> > > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > > +
> > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > +
> > > > return pci_dev;
> > > > }
> > > >
> > > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > > index c352c7b..6c21b37 100644
> > > > --- a/include/hw/pci/pci.h
> > > > +++ b/include/hw/pci/pci.h
> > > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > > };
> > > >
> > > > +struct PCIListener {
> > > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > > + QTAILQ_ENTRY(PCIListener) link;
> > > > +};
> > > > +
> > > > +void pci_listener_register(PCIListener *listener);
> > > > +void pci_listener_unregister(PCIListener *listener);
> > > > +
> > > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > > uint8_t attr, MemoryRegion *memory);
> > > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > > index 04df51b..2b974c6 100644
> > > > --- a/include/qemu/typedefs.h
> > > > +++ b/include/qemu/typedefs.h
> > > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > > typedef struct PCIExpressHost PCIExpressHost;
> > > > typedef struct PCIBus PCIBus;
> > > > typedef struct PCIDevice PCIDevice;
> > > > +typedef struct PCIListener PCIListener;
> > > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > > typedef struct PCIBridge PCIBridge;
> > > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > > --
> > > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 11:26 ` Michael S. Tsirkin
2014-10-14 12:44 ` Paul Durrant
@ 2014-10-14 12:44 ` Paul Durrant
2014-10-14 14:32 ` Michael S. Tsirkin
2014-10-14 14:32 ` Michael S. Tsirkin
1 sibling, 2 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-14 12:44 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 14 October 2014 12:27
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> Borntraeger
> Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
>
> On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > > -----Original Message-----
> > > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > > Sent: 14 October 2014 10:54
> > > To: Paul Durrant
> > > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > > Borntraeger
> > > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> > >
> > > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI
> device
> > > > models explicitly register with Xen for config space accesses. This patch
> > > > adds a PCI bus listener interface which can be used by the Xen interface
> > > > code to monitor PCI buses for arrival and departure of devices.
> > > >
> > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > Cc: Andreas Faerber <afaerber@suse.de>
> > > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> > >
> > > Do you really need multiple notifiers?
> > >
> >
> > I don't quite understand what you mean by multiple notifiers. Are you
> suggesting that the PCI listener could be combined with the memory
> listener?
>
>
> Bus is already notified about the hotplug.
> Do you need another notification, or can you override that one?
>
I'm not sure. IIRC there's some sort of 'coldplug' bypass for things that are present on the PCI bus before the guest is started, so I'm not sure the notification would happen.
> >
> > > In any case, I think such a mechanism makes more sense on QOM level:
> > > we have APIs to find objects of a given class and/or at a given path,
> > > why not a mechanism to get notified when said objects are
> added/removed.
> > >
> >
> > Having a general object listener could work as long as notifications
> > could be filtered such that the Xen code could get notifications
> > purely for PCI devices.
>
> As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
> to do the filtering.
>
That sounds plausible then. I'll investigate.
> > The set of listeners clearly cannot be added
> > to the object itself though, as you could then only register listeners
> > after the object is created.
> >
> > Paul
>
> Yes.
>
>
> One other thing you need to consider: do you want to be notified
> when removal is requested, or after it happens?
>
The unmapping of the device from Xen needs to happen after it's really gone away, so I guess object destruction time it right for that one.
Paul
> > >
> > >
> > > > ---
> > > > hw/pci/pci.c | 65
> > > +++++++++++++++++++++++++++++++++++++++++++++++
> > > > include/hw/pci/pci.h | 9 +++++++
> > > > include/qemu/typedefs.h | 1 +
> > > > 3 files changed, 75 insertions(+)
> > > >
> > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > > index 6ce75aa..53c955d 100644
> > > > --- a/hw/pci/pci.c
> > > > +++ b/hw/pci/pci.c
> > > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > > PCI_SUBDEVICE_ID_QEMU;
> > > >
> > > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > > >
> > > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > > +
> > > > +enum ListenerDirection { Forward, Reverse };
> > > > +
> > > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > > + do { \
> > > > + PCIListener *_listener; \
> > > > + \
> > > > + switch (_direction) { \
> > > > + case Forward: \
> > > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > > + if (_listener->_callback) { \
> > > > + _listener->_callback(_listener, ##_args); \
> > > > + } \
> > > > + } \
> > > > + break; \
> > > > + case Reverse: \
> > > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > > + pci_listeners, link) { \
> > > > + if (_listener->_callback) { \
> > > > + _listener->_callback(_listener, ##_args); \
> > > > + } \
> > > > + } \
> > > > + break; \
> > > > + default: \
> > > > + abort(); \
> > > > + } \
> > > > + } while (0)
> > > > +
> > > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > > +{
> > > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > > +
> > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > + }
> > > > +
> > > > + return 0;
> > > > +}
> > > > +
> > > > +void pci_listener_register(PCIListener *listener)
> > > > +{
> > > > + PCIHostState *host;
> > > > +
> > > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > > +
> > > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > > + PCIBus *bus = host->bus;
> > > > +
> > > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > > + NULL, NULL);
> > > > + }
> > > > +}
> > > > +
> > > > +void pci_listener_unregister(PCIListener *listener)
> > > > +{
> > > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > > +}
> > > > +
> > > > static int pci_bar(PCIDevice *d, int reg)
> > > > {
> > > > uint8_t type;
> > > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > > >
> > > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > > {
> > > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > > +
> > > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > > pci_config_free(pci_dev);
> > > >
> > > > @@ -878,6 +940,9 @@ static PCIDevice
> *do_pci_register_device(PCIDevice
> > > *pci_dev, PCIBus *bus,
> > > > pci_dev->config_write = config_write;
> > > > bus->devices[devfn] = pci_dev;
> > > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > > +
> > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > +
> > > > return pci_dev;
> > > > }
> > > >
> > > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > > index c352c7b..6c21b37 100644
> > > > --- a/include/hw/pci/pci.h
> > > > +++ b/include/hw/pci/pci.h
> > > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > > };
> > > >
> > > > +struct PCIListener {
> > > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > > + QTAILQ_ENTRY(PCIListener) link;
> > > > +};
> > > > +
> > > > +void pci_listener_register(PCIListener *listener);
> > > > +void pci_listener_unregister(PCIListener *listener);
> > > > +
> > > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > > uint8_t attr, MemoryRegion *memory);
> > > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > > index 04df51b..2b974c6 100644
> > > > --- a/include/qemu/typedefs.h
> > > > +++ b/include/qemu/typedefs.h
> > > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > > typedef struct PCIExpressHost PCIExpressHost;
> > > > typedef struct PCIBus PCIBus;
> > > > typedef struct PCIDevice PCIDevice;
> > > > +typedef struct PCIListener PCIListener;
> > > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > > typedef struct PCIBridge PCIBridge;
> > > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > > --
> > > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 12:44 ` [Qemu-devel] " Paul Durrant
@ 2014-10-14 14:32 ` Michael S. Tsirkin
2014-10-14 14:32 ` Michael S. Tsirkin
1 sibling, 0 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 14:32 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
On Tue, Oct 14, 2014 at 12:44:06PM +0000, Paul Durrant wrote:
> > -----Original Message-----
> > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > Sent: 14 October 2014 12:27
> > To: Paul Durrant
> > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > Borntraeger
> > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> >
> > On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > > > -----Original Message-----
> > > > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > > > Sent: 14 October 2014 10:54
> > > > To: Paul Durrant
> > > > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > > > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > > > Borntraeger
> > > > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> > > >
> > > > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI
> > device
> > > > > models explicitly register with Xen for config space accesses. This patch
> > > > > adds a PCI bus listener interface which can be used by the Xen interface
> > > > > code to monitor PCI buses for arrival and departure of devices.
> > > > >
> > > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > > Cc: Andreas Faerber <afaerber@suse.de>
> > > > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> > > >
> > > > Do you really need multiple notifiers?
> > > >
> > >
> > > I don't quite understand what you mean by multiple notifiers. Are you
> > suggesting that the PCI listener could be combined with the memory
> > listener?
> >
> >
> > Bus is already notified about the hotplug.
> > Do you need another notification, or can you override that one?
> >
>
> I'm not sure. IIRC there's some sort of 'coldplug' bypass for things that are present on the PCI bus before the guest is started, so I'm not sure the notification would happen.
AFAIK it happens for all devices including coldplug.
> > >
> > > > In any case, I think such a mechanism makes more sense on QOM level:
> > > > we have APIs to find objects of a given class and/or at a given path,
> > > > why not a mechanism to get notified when said objects are
> > added/removed.
> > > >
> > >
> > > Having a general object listener could work as long as notifications
> > > could be filtered such that the Xen code could get notifications
> > > purely for PCI devices.
> >
> > As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
> > to do the filtering.
> >
>
> That sounds plausible then. I'll investigate.
>
> > > The set of listeners clearly cannot be added
> > > to the object itself though, as you could then only register listeners
> > > after the object is created.
> > >
> > > Paul
> >
> > Yes.
> >
> >
> > One other thing you need to consider: do you want to be notified
> > when removal is requested, or after it happens?
> >
>
> The unmapping of the device from Xen needs to happen after it's really gone away, so I guess object destruction time it right for that one.
>
> Paul
>
> > > >
> > > >
> > > > > ---
> > > > > hw/pci/pci.c | 65
> > > > +++++++++++++++++++++++++++++++++++++++++++++++
> > > > > include/hw/pci/pci.h | 9 +++++++
> > > > > include/qemu/typedefs.h | 1 +
> > > > > 3 files changed, 75 insertions(+)
> > > > >
> > > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > > > index 6ce75aa..53c955d 100644
> > > > > --- a/hw/pci/pci.c
> > > > > +++ b/hw/pci/pci.c
> > > > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > > > PCI_SUBDEVICE_ID_QEMU;
> > > > >
> > > > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > > > >
> > > > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > > > +
> > > > > +enum ListenerDirection { Forward, Reverse };
> > > > > +
> > > > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > > > + do { \
> > > > > + PCIListener *_listener; \
> > > > > + \
> > > > > + switch (_direction) { \
> > > > > + case Forward: \
> > > > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > > > + if (_listener->_callback) { \
> > > > > + _listener->_callback(_listener, ##_args); \
> > > > > + } \
> > > > > + } \
> > > > > + break; \
> > > > > + case Reverse: \
> > > > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > > > + pci_listeners, link) { \
> > > > > + if (_listener->_callback) { \
> > > > > + _listener->_callback(_listener, ##_args); \
> > > > > + } \
> > > > > + } \
> > > > > + break; \
> > > > > + default: \
> > > > > + abort(); \
> > > > > + } \
> > > > > + } while (0)
> > > > > +
> > > > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > > > +{
> > > > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > > > +
> > > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > > + }
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +void pci_listener_register(PCIListener *listener)
> > > > > +{
> > > > > + PCIHostState *host;
> > > > > +
> > > > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > > > +
> > > > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > > > + PCIBus *bus = host->bus;
> > > > > +
> > > > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > > > + NULL, NULL);
> > > > > + }
> > > > > +}
> > > > > +
> > > > > +void pci_listener_unregister(PCIListener *listener)
> > > > > +{
> > > > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > > > +}
> > > > > +
> > > > > static int pci_bar(PCIDevice *d, int reg)
> > > > > {
> > > > > uint8_t type;
> > > > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > > > >
> > > > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > > > {
> > > > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > > > +
> > > > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > > > pci_config_free(pci_dev);
> > > > >
> > > > > @@ -878,6 +940,9 @@ static PCIDevice
> > *do_pci_register_device(PCIDevice
> > > > *pci_dev, PCIBus *bus,
> > > > > pci_dev->config_write = config_write;
> > > > > bus->devices[devfn] = pci_dev;
> > > > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > > > +
> > > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > > +
> > > > > return pci_dev;
> > > > > }
> > > > >
> > > > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > > > index c352c7b..6c21b37 100644
> > > > > --- a/include/hw/pci/pci.h
> > > > > +++ b/include/hw/pci/pci.h
> > > > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > > > };
> > > > >
> > > > > +struct PCIListener {
> > > > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > > > + QTAILQ_ENTRY(PCIListener) link;
> > > > > +};
> > > > > +
> > > > > +void pci_listener_register(PCIListener *listener);
> > > > > +void pci_listener_unregister(PCIListener *listener);
> > > > > +
> > > > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > > > uint8_t attr, MemoryRegion *memory);
> > > > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > > > index 04df51b..2b974c6 100644
> > > > > --- a/include/qemu/typedefs.h
> > > > > +++ b/include/qemu/typedefs.h
> > > > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > > > typedef struct PCIExpressHost PCIExpressHost;
> > > > > typedef struct PCIBus PCIBus;
> > > > > typedef struct PCIDevice PCIDevice;
> > > > > +typedef struct PCIListener PCIListener;
> > > > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > > > typedef struct PCIBridge PCIBridge;
> > > > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > > > --
> > > > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 12:44 ` [Qemu-devel] " Paul Durrant
2014-10-14 14:32 ` Michael S. Tsirkin
@ 2014-10-14 14:32 ` Michael S. Tsirkin
1 sibling, 0 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 14:32 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
On Tue, Oct 14, 2014 at 12:44:06PM +0000, Paul Durrant wrote:
> > -----Original Message-----
> > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > Sent: 14 October 2014 12:27
> > To: Paul Durrant
> > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > Borntraeger
> > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> >
> > On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > > > -----Original Message-----
> > > > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > > > Sent: 14 October 2014 10:54
> > > > To: Paul Durrant
> > > > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > > > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > > > Borntraeger
> > > > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> > > >
> > > > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI
> > device
> > > > > models explicitly register with Xen for config space accesses. This patch
> > > > > adds a PCI bus listener interface which can be used by the Xen interface
> > > > > code to monitor PCI buses for arrival and departure of devices.
> > > > >
> > > > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > > > Cc: Andreas Faerber <afaerber@suse.de>
> > > > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> > > >
> > > > Do you really need multiple notifiers?
> > > >
> > >
> > > I don't quite understand what you mean by multiple notifiers. Are you
> > suggesting that the PCI listener could be combined with the memory
> > listener?
> >
> >
> > Bus is already notified about the hotplug.
> > Do you need another notification, or can you override that one?
> >
>
> I'm not sure. IIRC there's some sort of 'coldplug' bypass for things that are present on the PCI bus before the guest is started, so I'm not sure the notification would happen.
AFAIK it happens for all devices including coldplug.
> > >
> > > > In any case, I think such a mechanism makes more sense on QOM level:
> > > > we have APIs to find objects of a given class and/or at a given path,
> > > > why not a mechanism to get notified when said objects are
> > added/removed.
> > > >
> > >
> > > Having a general object listener could work as long as notifications
> > > could be filtered such that the Xen code could get notifications
> > > purely for PCI devices.
> >
> > As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
> > to do the filtering.
> >
>
> That sounds plausible then. I'll investigate.
>
> > > The set of listeners clearly cannot be added
> > > to the object itself though, as you could then only register listeners
> > > after the object is created.
> > >
> > > Paul
> >
> > Yes.
> >
> >
> > One other thing you need to consider: do you want to be notified
> > when removal is requested, or after it happens?
> >
>
> The unmapping of the device from Xen needs to happen after it's really gone away, so I guess object destruction time it right for that one.
>
> Paul
>
> > > >
> > > >
> > > > > ---
> > > > > hw/pci/pci.c | 65
> > > > +++++++++++++++++++++++++++++++++++++++++++++++
> > > > > include/hw/pci/pci.h | 9 +++++++
> > > > > include/qemu/typedefs.h | 1 +
> > > > > 3 files changed, 75 insertions(+)
> > > > >
> > > > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > > > index 6ce75aa..53c955d 100644
> > > > > --- a/hw/pci/pci.c
> > > > > +++ b/hw/pci/pci.c
> > > > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > > > PCI_SUBDEVICE_ID_QEMU;
> > > > >
> > > > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > > > >
> > > > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > > > +
> > > > > +enum ListenerDirection { Forward, Reverse };
> > > > > +
> > > > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > > > + do { \
> > > > > + PCIListener *_listener; \
> > > > > + \
> > > > > + switch (_direction) { \
> > > > > + case Forward: \
> > > > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > > > + if (_listener->_callback) { \
> > > > > + _listener->_callback(_listener, ##_args); \
> > > > > + } \
> > > > > + } \
> > > > > + break; \
> > > > > + case Reverse: \
> > > > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > > > + pci_listeners, link) { \
> > > > > + if (_listener->_callback) { \
> > > > > + _listener->_callback(_listener, ##_args); \
> > > > > + } \
> > > > > + } \
> > > > > + break; \
> > > > > + default: \
> > > > > + abort(); \
> > > > > + } \
> > > > > + } while (0)
> > > > > +
> > > > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > > > +{
> > > > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > > > +
> > > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > > + }
> > > > > +
> > > > > + return 0;
> > > > > +}
> > > > > +
> > > > > +void pci_listener_register(PCIListener *listener)
> > > > > +{
> > > > > + PCIHostState *host;
> > > > > +
> > > > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > > > +
> > > > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > > > + PCIBus *bus = host->bus;
> > > > > +
> > > > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > > > + NULL, NULL);
> > > > > + }
> > > > > +}
> > > > > +
> > > > > +void pci_listener_unregister(PCIListener *listener)
> > > > > +{
> > > > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > > > +}
> > > > > +
> > > > > static int pci_bar(PCIDevice *d, int reg)
> > > > > {
> > > > > uint8_t type;
> > > > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > > > >
> > > > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > > > {
> > > > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > > > +
> > > > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > > > pci_config_free(pci_dev);
> > > > >
> > > > > @@ -878,6 +940,9 @@ static PCIDevice
> > *do_pci_register_device(PCIDevice
> > > > *pci_dev, PCIBus *bus,
> > > > > pci_dev->config_write = config_write;
> > > > > bus->devices[devfn] = pci_dev;
> > > > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > > > +
> > > > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > > > +
> > > > > return pci_dev;
> > > > > }
> > > > >
> > > > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > > > index c352c7b..6c21b37 100644
> > > > > --- a/include/hw/pci/pci.h
> > > > > +++ b/include/hw/pci/pci.h
> > > > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > > > };
> > > > >
> > > > > +struct PCIListener {
> > > > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > > > + QTAILQ_ENTRY(PCIListener) link;
> > > > > +};
> > > > > +
> > > > > +void pci_listener_register(PCIListener *listener);
> > > > > +void pci_listener_unregister(PCIListener *listener);
> > > > > +
> > > > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > > > uint8_t attr, MemoryRegion *memory);
> > > > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > > > index 04df51b..2b974c6 100644
> > > > > --- a/include/qemu/typedefs.h
> > > > > +++ b/include/qemu/typedefs.h
> > > > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > > > typedef struct PCIExpressHost PCIExpressHost;
> > > > > typedef struct PCIBus PCIBus;
> > > > > typedef struct PCIDevice PCIDevice;
> > > > > +typedef struct PCIListener PCIListener;
> > > > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > > > typedef struct PCIBridge PCIBridge;
> > > > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > > > --
> > > > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 10:08 ` Paul Durrant
2014-10-14 11:26 ` Michael S. Tsirkin
@ 2014-10-14 11:26 ` Michael S. Tsirkin
1 sibling, 0 replies; 19+ messages in thread
From: Michael S. Tsirkin @ 2014-10-14 11:26 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
On Tue, Oct 14, 2014 at 10:08:06AM +0000, Paul Durrant wrote:
> > -----Original Message-----
> > From: Michael S. Tsirkin [mailto:mst@redhat.com]
> > Sent: 14 October 2014 10:54
> > To: Paul Durrant
> > Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> > Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> > Borntraeger
> > Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
> >
> > On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> > > models explicitly register with Xen for config space accesses. This patch
> > > adds a PCI bus listener interface which can be used by the Xen interface
> > > code to monitor PCI buses for arrival and departure of devices.
> > >
> > > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > > Cc: Michael S. Tsirkin <mst@redhat.com>
> > > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > > Cc: Andreas Faerber <afaerber@suse.de>
> > > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
> >
> > Do you really need multiple notifiers?
> >
>
> I don't quite understand what you mean by multiple notifiers. Are you suggesting that the PCI listener could be combined with the memory listener?
Bus is already notified about the hotplug.
Do you need another notification, or can you override that one?
>
> > In any case, I think such a mechanism makes more sense on QOM level:
> > we have APIs to find objects of a given class and/or at a given path,
> > why not a mechanism to get notified when said objects are added/removed.
> >
>
> Having a general object listener could work as long as notifications
> could be filtered such that the Xen code could get notifications
> purely for PCI devices.
As all PCI devices inherit TYPE_PCI_DEVICE, it's easy enough
to do the filtering.
> The set of listeners clearly cannot be added
> to the object itself though, as you could then only register listeners
> after the object is created.
>
> Paul
Yes.
One other thing you need to consider: do you want to be notified
when removal is requested, or after it happens?
> >
> >
> > > ---
> > > hw/pci/pci.c | 65
> > +++++++++++++++++++++++++++++++++++++++++++++++
> > > include/hw/pci/pci.h | 9 +++++++
> > > include/qemu/typedefs.h | 1 +
> > > 3 files changed, 75 insertions(+)
> > >
> > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > > index 6ce75aa..53c955d 100644
> > > --- a/hw/pci/pci.c
> > > +++ b/hw/pci/pci.c
> > > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> > PCI_SUBDEVICE_ID_QEMU;
> > >
> > > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> > >
> > > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > > +
> > > +enum ListenerDirection { Forward, Reverse };
> > > +
> > > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > > + do { \
> > > + PCIListener *_listener; \
> > > + \
> > > + switch (_direction) { \
> > > + case Forward: \
> > > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > > + if (_listener->_callback) { \
> > > + _listener->_callback(_listener, ##_args); \
> > > + } \
> > > + } \
> > > + break; \
> > > + case Reverse: \
> > > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > > + pci_listeners, link) { \
> > > + if (_listener->_callback) { \
> > > + _listener->_callback(_listener, ##_args); \
> > > + } \
> > > + } \
> > > + break; \
> > > + default: \
> > > + abort(); \
> > > + } \
> > > + } while (0)
> > > +
> > > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > > +{
> > > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > > +
> > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > + }
> > > +
> > > + return 0;
> > > +}
> > > +
> > > +void pci_listener_register(PCIListener *listener)
> > > +{
> > > + PCIHostState *host;
> > > +
> > > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > > +
> > > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > > + PCIBus *bus = host->bus;
> > > +
> > > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > > + NULL, NULL);
> > > + }
> > > +}
> > > +
> > > +void pci_listener_unregister(PCIListener *listener)
> > > +{
> > > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > > +}
> > > +
> > > static int pci_bar(PCIDevice *d, int reg)
> > > {
> > > uint8_t type;
> > > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> > >
> > > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > > {
> > > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > > +
> > > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > > pci_config_free(pci_dev);
> > >
> > > @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice
> > *pci_dev, PCIBus *bus,
> > > pci_dev->config_write = config_write;
> > > bus->devices[devfn] = pci_dev;
> > > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > > +
> > > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > > +
> > > return pci_dev;
> > > }
> > >
> > > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > > index c352c7b..6c21b37 100644
> > > --- a/include/hw/pci/pci.h
> > > +++ b/include/hw/pci/pci.h
> > > @@ -303,6 +303,15 @@ struct PCIDevice {
> > > MSIVectorPollNotifier msix_vector_poll_notifier;
> > > };
> > >
> > > +struct PCIListener {
> > > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > > + QTAILQ_ENTRY(PCIListener) link;
> > > +};
> > > +
> > > +void pci_listener_register(PCIListener *listener);
> > > +void pci_listener_unregister(PCIListener *listener);
> > > +
> > > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > > uint8_t attr, MemoryRegion *memory);
> > > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > > index 04df51b..2b974c6 100644
> > > --- a/include/qemu/typedefs.h
> > > +++ b/include/qemu/typedefs.h
> > > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > > typedef struct PCIExpressHost PCIExpressHost;
> > > typedef struct PCIBus PCIBus;
> > > typedef struct PCIDevice PCIDevice;
> > > +typedef struct PCIListener PCIListener;
> > > typedef struct PCIExpressDevice PCIExpressDevice;
> > > typedef struct PCIBridge PCIBridge;
> > > typedef struct PCIEAERMsg PCIEAERMsg;
> > > --
> > > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 1/2] Add PCI bus listener interface
2014-10-14 9:53 ` [Qemu-devel] " Michael S. Tsirkin
2014-10-14 10:08 ` Paul Durrant
@ 2014-10-14 10:08 ` Paul Durrant
1 sibling, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-14 10:08 UTC (permalink / raw)
To: Michael S. Tsirkin
Cc: Peter Crosthwaite, Thomas Huth, qemu-devel@nongnu.org,
Christian Borntraeger, Paolo Bonzini,
xen-devel@lists.xenproject.org, Andreas Faerber
> -----Original Message-----
> From: Michael S. Tsirkin [mailto:mst@redhat.com]
> Sent: 14 October 2014 10:54
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Paolo
> Bonzini; Andreas Faerber; Thomas Huth; Peter Crosthwaite; Christian
> Borntraeger
> Subject: Re: [PATCH v2 1/2] Add PCI bus listener interface
>
> On Mon, Oct 13, 2014 at 01:52:46PM +0100, Paul Durrant wrote:
> > The Xen ioreq-server API, introduced in Xen 4.5, requires that PCI device
> > models explicitly register with Xen for config space accesses. This patch
> > adds a PCI bus listener interface which can be used by the Xen interface
> > code to monitor PCI buses for arrival and departure of devices.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
> > Cc: Michael S. Tsirkin <mst@redhat.com>
> > Cc: Paolo Bonzini <pbonzini@redhat.com>
> > Cc: Andreas Faerber <afaerber@suse.de>
> > Cc: Thomas Huth <thuth@linux.vnet.ibm.com>
> > Cc: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
> > Cc: Christian Borntraeger <borntraeger@de.ibm.com>
>
> Do you really need multiple notifiers?
>
I don't quite understand what you mean by multiple notifiers. Are you suggesting that the PCI listener could be combined with the memory listener?
> In any case, I think such a mechanism makes more sense on QOM level:
> we have APIs to find objects of a given class and/or at a given path,
> why not a mechanism to get notified when said objects are added/removed.
>
Having a general object listener could work as long as notifications could be filtered such that the Xen code could get notifications purely for PCI devices. The set of listeners clearly cannot be added to the object itself though, as you could then only register listeners after the object is created.
Paul
>
>
> > ---
> > hw/pci/pci.c | 65
> +++++++++++++++++++++++++++++++++++++++++++++++
> > include/hw/pci/pci.h | 9 +++++++
> > include/qemu/typedefs.h | 1 +
> > 3 files changed, 75 insertions(+)
> >
> > diff --git a/hw/pci/pci.c b/hw/pci/pci.c
> > index 6ce75aa..53c955d 100644
> > --- a/hw/pci/pci.c
> > +++ b/hw/pci/pci.c
> > @@ -122,6 +122,66 @@ static uint16_t pci_default_sub_device_id =
> PCI_SUBDEVICE_ID_QEMU;
> >
> > static QLIST_HEAD(, PCIHostState) pci_host_bridges;
> >
> > +static QTAILQ_HEAD(pci_listeners, PCIListener) pci_listeners
> > + = QTAILQ_HEAD_INITIALIZER(pci_listeners);
> > +
> > +enum ListenerDirection { Forward, Reverse };
> > +
> > +#define PCI_LISTENER_CALL(_callback, _direction, _args...) \
> > + do { \
> > + PCIListener *_listener; \
> > + \
> > + switch (_direction) { \
> > + case Forward: \
> > + QTAILQ_FOREACH(_listener, &pci_listeners, link) { \
> > + if (_listener->_callback) { \
> > + _listener->_callback(_listener, ##_args); \
> > + } \
> > + } \
> > + break; \
> > + case Reverse: \
> > + QTAILQ_FOREACH_REVERSE(_listener, &pci_listeners, \
> > + pci_listeners, link) { \
> > + if (_listener->_callback) { \
> > + _listener->_callback(_listener, ##_args); \
> > + } \
> > + } \
> > + break; \
> > + default: \
> > + abort(); \
> > + } \
> > + } while (0)
> > +
> > +static int pci_listener_add(DeviceState *dev, void *opaque)
> > +{
> > + if (object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
> > + PCIDevice *pci_dev = PCI_DEVICE(dev);
> > +
> > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > + }
> > +
> > + return 0;
> > +}
> > +
> > +void pci_listener_register(PCIListener *listener)
> > +{
> > + PCIHostState *host;
> > +
> > + QTAILQ_INSERT_TAIL(&pci_listeners, listener, link);
> > +
> > + QLIST_FOREACH(host, &pci_host_bridges, next) {
> > + PCIBus *bus = host->bus;
> > +
> > + qbus_walk_children(&bus->qbus, NULL, NULL, pci_listener_add,
> > + NULL, NULL);
> > + }
> > +}
> > +
> > +void pci_listener_unregister(PCIListener *listener)
> > +{
> > + QTAILQ_REMOVE(&pci_listeners, listener, link);
> > +}
> > +
> > static int pci_bar(PCIDevice *d, int reg)
> > {
> > uint8_t type;
> > @@ -795,6 +855,8 @@ static void pci_config_free(PCIDevice *pci_dev)
> >
> > static void do_pci_unregister_device(PCIDevice *pci_dev)
> > {
> > + PCI_LISTENER_CALL(device_del, Reverse, pci_dev);
> > +
> > pci_dev->bus->devices[pci_dev->devfn] = NULL;
> > pci_config_free(pci_dev);
> >
> > @@ -878,6 +940,9 @@ static PCIDevice *do_pci_register_device(PCIDevice
> *pci_dev, PCIBus *bus,
> > pci_dev->config_write = config_write;
> > bus->devices[devfn] = pci_dev;
> > pci_dev->version_id = 2; /* Current pci device vmstate version */
> > +
> > + PCI_LISTENER_CALL(device_add, Forward, pci_dev);
> > +
> > return pci_dev;
> > }
> >
> > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
> > index c352c7b..6c21b37 100644
> > --- a/include/hw/pci/pci.h
> > +++ b/include/hw/pci/pci.h
> > @@ -303,6 +303,15 @@ struct PCIDevice {
> > MSIVectorPollNotifier msix_vector_poll_notifier;
> > };
> >
> > +struct PCIListener {
> > + void (*device_add)(PCIListener *listener, PCIDevice *pci_dev);
> > + void (*device_del)(PCIListener *listener, PCIDevice *pci_dev);
> > + QTAILQ_ENTRY(PCIListener) link;
> > +};
> > +
> > +void pci_listener_register(PCIListener *listener);
> > +void pci_listener_unregister(PCIListener *listener);
> > +
> > void pci_register_bar(PCIDevice *pci_dev, int region_num,
> > uint8_t attr, MemoryRegion *memory);
> > void pci_register_vga(PCIDevice *pci_dev, MemoryRegion *mem,
> > diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
> > index 04df51b..2b974c6 100644
> > --- a/include/qemu/typedefs.h
> > +++ b/include/qemu/typedefs.h
> > @@ -54,6 +54,7 @@ typedef struct PCIHostState PCIHostState;
> > typedef struct PCIExpressHost PCIExpressHost;
> > typedef struct PCIBus PCIBus;
> > typedef struct PCIDevice PCIDevice;
> > +typedef struct PCIListener PCIListener;
> > typedef struct PCIExpressDevice PCIExpressDevice;
> > typedef struct PCIBridge PCIBridge;
> > typedef struct PCIEAERMsg PCIEAERMsg;
> > --
> > 1.7.10.4
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 12:52 [Qemu-devel] [PATCH v2 0/2] Xen: Use ioreq-server API Paul Durrant
2014-10-13 12:52 ` Paul Durrant
@ 2014-10-13 12:52 ` Paul Durrant
2014-10-13 15:52 ` Stefano Stabellini
2014-10-13 15:52 ` Stefano Stabellini
2014-10-13 12:52 ` Paul Durrant
2 siblings, 2 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 12:52 UTC (permalink / raw)
To: qemu-devel, xen-devel
Cc: Peter Maydell, Olaf Hering, Stefano Stabellini,
Alexey Kardashevskiy, Stefan Weil, Michael Tokarev,
Alexander Graf, Paul Durrant, Gerd Hoffmann, Stefan Hajnoczi,
Paolo Bonzini
The ioreq-server API added to Xen 4.5 offers better security than
the existing Xen/QEMU interface because the shared pages that are
used to pass emulation request/results back and forth are removed
from the guest's memory space before any requests are serviced.
This prevents the guest from mapping these pages (they are in a
well known location) and attempting to attack QEMU by synthesizing
its own request structures. Hence, this patch modifies configure
to detect whether the API is available, and adds the necessary
code to use the API if it is.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Stefan Weil <sw@weilnetz.de>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: Alexander Graf <agraf@suse.de>
---
configure | 29 ++++++
include/hw/xen/xen_common.h | 222 +++++++++++++++++++++++++++++++++++++++++++
trace-events | 8 ++
xen-hvm.c | 163 +++++++++++++++++++++++++++----
4 files changed, 403 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 9ac2600..c2db574 100755
--- a/configure
+++ b/configure
@@ -1876,6 +1876,32 @@ int main(void) {
xc_gnttab_open(NULL, 0);
xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
+ xc_hvm_create_ioreq_server(xc, 0, 0, NULL);
+ return 0;
+}
+EOF
+ compile_prog "" "$xen_libs"
+ then
+ xen_ctrl_version=450
+ xen=yes
+
+ elif
+ cat > $TMPC <<EOF &&
+#include <xenctrl.h>
+#include <xenstore.h>
+#include <stdint.h>
+#include <xen/hvm/hvm_info_table.h>
+#if !defined(HVM_MAX_VCPUS)
+# error HVM_MAX_VCPUS not defined
+#endif
+int main(void) {
+ xc_interface *xc;
+ xs_daemon_open();
+ xc = xc_interface_open(0, 0, 0);
+ xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
+ xc_gnttab_open(NULL, 0);
+ xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
+ xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
return 0;
}
EOF
@@ -4282,6 +4308,9 @@ if test -n "$sparc_cpu"; then
echo "Target Sparc Arch $sparc_cpu"
fi
echo "xen support $xen"
+if test "$xen" = "yes" ; then
+ echo "xen ctrl version $xen_ctrl_version"
+fi
echo "brlapi support $brlapi"
echo "bluez support $bluez"
echo "Documentation $docs"
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 07731b9..7040506 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -16,7 +16,9 @@
#include "hw/hw.h"
#include "hw/xen/xen.h"
+#include "hw/pci/pci.h"
#include "qemu/queue.h"
+#include "trace.h"
/*
* We don't support Xen prior to 3.3.0.
@@ -164,4 +166,224 @@ void destroy_hvm_domain(bool reboot);
/* shutdown/destroy current domain because of an error */
void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
+/* Xen before 4.5 */
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450
+
+#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
+#define HVM_PARAM_BUFIOREQ_EVTCHN 26
+#endif
+
+#define IOREQ_TYPE_PCI_CONFIG 2
+
+typedef uint32_t ioservid_t;
+
+static inline void xen_map_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_map_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_map_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+}
+
+static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+}
+
+static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t *ioservid)
+{
+ return 0;
+}
+
+static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t ioservid)
+{
+}
+
+static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ xen_pfn_t *ioreq_pfn,
+ xen_pfn_t *bufioreq_pfn,
+ evtchn_port_t *bufioreq_evtchn)
+{
+ unsigned long param;
+ int rc;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n");
+ return -1;
+ }
+
+ *ioreq_pfn = param;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n");
+ return -1;
+ }
+
+ *bufioreq_pfn = param;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
+ ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
+ return -1;
+ }
+
+ *bufioreq_evtchn = param;
+
+ return 0;
+}
+
+static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ bool enable)
+{
+ return 0;
+}
+
+/* Xen 4.5 */
+#else
+
+static inline void xen_map_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_map_mmio_range(ioservid, start_addr, end_addr);
+ xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1,
+ start_addr, end_addr);
+}
+
+static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr);
+ xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1,
+ start_addr, end_addr);
+}
+
+static inline void xen_map_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_map_portio_range(ioservid, start_addr, end_addr);
+ xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0,
+ start_addr, end_addr);
+}
+
+static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_unmap_portio_range(ioservid, start_addr, end_addr);
+ xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0,
+ start_addr, end_addr);
+}
+
+static inline void xen_map_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+ trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
+ xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid,
+ 0, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn),
+ PCI_FUNC(pci_dev->devfn));
+}
+
+static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+ trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
+ xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid,
+ 0, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn),
+ PCI_FUNC(pci_dev->devfn));
+}
+
+static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t *ioservid)
+{
+ int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid);
+
+ if (rc == 0) {
+ trace_xen_ioreq_server_create(*ioservid);
+ }
+
+ return rc;
+}
+
+static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t ioservid)
+{
+ trace_xen_ioreq_server_destroy(ioservid);
+ xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
+}
+
+static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ xen_pfn_t *ioreq_pfn,
+ xen_pfn_t *bufioreq_pfn,
+ evtchn_port_t *bufioreq_evtchn)
+{
+ return xc_hvm_get_ioreq_server_info(xc, dom, ioservid,
+ ioreq_pfn, bufioreq_pfn,
+ bufioreq_evtchn);
+}
+
+static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ bool enable)
+{
+ return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable);
+}
+
+#endif
+
#endif /* QEMU_HW_XEN_COMMON_H */
diff --git a/trace-events b/trace-events
index 011d105..3efcff7 100644
--- a/trace-events
+++ b/trace-events
@@ -895,6 +895,14 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages:
# xen-hvm.c
xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx"
xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i"
+xen_ioreq_server_create(uint32_t id) "id: %u"
+xen_ioreq_server_destroy(uint32_t id) "id: %u"
+xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
+xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
# xen-mapcache.c
xen_map_cache(uint64_t phys_addr) "want %#"PRIx64
diff --git a/xen-hvm.c b/xen-hvm.c
index 05e522c..5853735 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -62,9 +62,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
}
# define FMT_ioreq_size "u"
#endif
-#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
-#define HVM_PARAM_BUFIOREQ_EVTCHN 26
-#endif
#define BUFFER_IO_MAX_DELAY 100
@@ -78,6 +75,7 @@ typedef struct XenPhysmap {
} XenPhysmap;
typedef struct XenIOState {
+ ioservid_t ioservid;
shared_iopage_t *shared_page;
buffered_iopage_t *buffered_io_page;
QEMUTimer *buffered_io_timer;
@@ -92,6 +90,8 @@ typedef struct XenIOState {
struct xs_handle *xenstore;
MemoryListener memory_listener;
+ MemoryListener io_listener;
+ PCIListener pci_listener;
QLIST_HEAD(, XenPhysmap) physmap;
hwaddr free_phys_offset;
const XenPhysmap *log_for_dirtybit;
@@ -480,6 +480,13 @@ static void xen_region_add(MemoryListener *listener,
MemoryRegionSection *section)
{
memory_region_ref(section->mr);
+
+ if (section->mr != &ram_memory) {
+ XenIOState *state = container_of(listener, XenIOState, memory_listener);
+
+ xen_map_memory_section(xen_xc, xen_domid, state->ioservid, section);
+ }
+
xen_set_memory(listener, section, true);
}
@@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener *listener,
MemoryRegionSection *section)
{
xen_set_memory(listener, section, false);
+
+ if (section->mr != &ram_memory) {
+ XenIOState *state = container_of(listener, XenIOState, memory_listener);
+
+ xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, section);
+ }
+
memory_region_unref(section->mr);
}
+static void xen_io_add(MemoryListener *listener,
+ MemoryRegionSection *section)
+{
+ XenIOState *state = container_of(listener, XenIOState, io_listener);
+
+ memory_region_ref(section->mr);
+
+ xen_map_io_section(xen_xc, xen_domid, state->ioservid, section);
+}
+
+static void xen_io_del(MemoryListener *listener,
+ MemoryRegionSection *section)
+{
+ XenIOState *state = container_of(listener, XenIOState, io_listener);
+
+ xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section);
+
+ memory_region_unref(section->mr);
+}
+
+static void xen_pci_add(PCIListener *listener,
+ PCIDevice *pci_dev)
+{
+ XenIOState *state = container_of(listener, XenIOState, pci_listener);
+
+ xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
+}
+
+static void xen_pci_del(PCIListener *listener,
+ PCIDevice *pci_dev)
+{
+ XenIOState *state = container_of(listener, XenIOState, pci_listener);
+
+ xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
+}
+
static void xen_sync_dirty_bitmap(XenIOState *state,
hwaddr start_addr,
ram_addr_t size)
@@ -590,6 +640,17 @@ static MemoryListener xen_memory_listener = {
.priority = 10,
};
+static MemoryListener xen_io_listener = {
+ .region_add = xen_io_add,
+ .region_del = xen_io_del,
+ .priority = 10,
+};
+
+static PCIListener xen_pci_listener = {
+ .device_add = xen_pci_add,
+ .device_del = xen_pci_del,
+};
+
/* get the ioreq packets from share mem */
static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
{
@@ -792,6 +853,27 @@ static void handle_ioreq(ioreq_t *req)
case IOREQ_TYPE_INVALIDATE:
xen_invalidate_map_cache();
break;
+ case IOREQ_TYPE_PCI_CONFIG: {
+ uint32_t sbdf = req->addr >> 32;
+ uint32_t val;
+
+ /* Fake a write to port 0xCF8 so that
+ * the config space access will target the
+ * correct device model.
+ */
+ val = (1u << 31) |
+ ((req->addr & 0x0f00) << 16) |
+ ((sbdf & 0xffff) << 8) |
+ (req->addr & 0xfc);
+ do_outp(0xcf8, 4, val);
+
+ /* Now issue the config space access via
+ * port 0xCFC
+ */
+ req->addr = 0xcfc | (req->addr & 0x03);
+ cpu_ioreq_pio(req);
+ break;
+ }
default:
hw_error("Invalid ioreq type 0x%x\n", req->type);
}
@@ -979,13 +1061,33 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
}
+static void xen_hvm_pre_save(void *opaque)
+{
+ XenIOState *state = opaque;
+
+ /* Stop servicing emulation requests */
+ xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, 0);
+ xen_destroy_ioreq_server(xen_xc, xen_domid, state->ioservid);
+}
+
+static const VMStateDescription vmstate_xen_hvm = {
+ .name = "xen-hvm",
+ .version_id = 4,
+ .minimum_version_id = 4,
+ .pre_save = xen_hvm_pre_save,
+ .fields = (VMStateField[]) {
+ VMSTATE_END_OF_LIST()
+ },
+};
+
/* return 0 means OK, or -1 means critical issue -- will exit(1) */
int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
MemoryRegion **ram_memory)
{
int i, rc;
- unsigned long ioreq_pfn;
- unsigned long bufioreq_evtchn;
+ xen_pfn_t ioreq_pfn;
+ xen_pfn_t bufioreq_pfn;
+ evtchn_port_t bufioreq_evtchn;
XenIOState *state;
state = g_malloc0(sizeof (XenIOState));
@@ -1002,6 +1104,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
return -1;
}
+ rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid);
+ if (rc < 0) {
+ perror("xen: ioreq server create");
+ return -1;
+ }
+
state->exit.notify = xen_exit_notifier;
qemu_add_exit_notifier(&state->exit);
@@ -1011,8 +1119,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
state->wakeup.notify = xen_wakeup_notifier;
qemu_register_wakeup_notifier(&state->wakeup);
- xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn);
+ rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid,
+ &ioreq_pfn, &bufioreq_pfn,
+ &bufioreq_evtchn);
+ if (rc < 0) {
+ hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT,
+ errno, xen_xc);
+ }
+
DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
+ DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
+ DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
+
state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
PROT_READ|PROT_WRITE, ioreq_pfn);
if (state->shared_page == NULL) {
@@ -1020,14 +1138,20 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
errno, xen_xc);
}
- xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn);
- DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn);
- state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE, ioreq_pfn);
+ state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid,
+ XC_PAGE_SIZE,
+ PROT_READ|PROT_WRITE,
+ bufioreq_pfn);
if (state->buffered_io_page == NULL) {
hw_error("map buffered IO page returned error %d", errno);
}
+ rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true);
+ if (rc < 0) {
+ hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT,
+ errno, xen_xc);
+ }
+
state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t));
/* FIXME: how about if we overflow the page here? */
@@ -1035,22 +1159,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
xen_vcpu_eport(state->shared_page, i));
if (rc == -1) {
- fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
+ fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno);
return -1;
}
state->ioreq_local_port[i] = rc;
}
- rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN,
- &bufioreq_evtchn);
- if (rc < 0) {
- fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
- return -1;
- }
rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
- (uint32_t)bufioreq_evtchn);
+ bufioreq_evtchn);
if (rc == -1) {
- fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
+ fprintf(stderr, "buffered evtchn bind error %d\n", errno);
return -1;
}
state->bufioreq_local_port = rc;
@@ -1060,12 +1178,19 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory);
qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+ vmstate_register(NULL, 0, &vmstate_xen_hvm, state);
state->memory_listener = xen_memory_listener;
QLIST_INIT(&state->physmap);
memory_listener_register(&state->memory_listener, &address_space_memory);
state->log_for_dirtybit = NULL;
+ state->io_listener = xen_io_listener;
+ memory_listener_register(&state->io_listener, &address_space_io);
+
+ state->pci_listener = xen_pci_listener;
+ pci_listener_register(&state->pci_listener);
+
/* Initialize backend core & drivers */
if (xen_be_init() != 0) {
fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 12:52 ` [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available Paul Durrant
@ 2014-10-13 15:52 ` Stefano Stabellini
2014-10-13 16:41 ` Paul Durrant
2014-10-13 16:41 ` [Qemu-devel] " Paul Durrant
2014-10-13 15:52 ` Stefano Stabellini
1 sibling, 2 replies; 19+ messages in thread
From: Stefano Stabellini @ 2014-10-13 15:52 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Maydell, Olaf Hering, Stefano Stabellini,
Alexey Kardashevskiy, Stefan Weil, Michael Tokarev, qemu-devel,
Alexander Graf, Gerd Hoffmann, Stefan Hajnoczi, Paolo Bonzini,
xen-devel
On Mon, 13 Oct 2014, Paul Durrant wrote:
> The ioreq-server API added to Xen 4.5 offers better security than
> the existing Xen/QEMU interface because the shared pages that are
> used to pass emulation request/results back and forth are removed
> from the guest's memory space before any requests are serviced.
> This prevents the guest from mapping these pages (they are in a
> well known location) and attempting to attack QEMU by synthesizing
> its own request structures. Hence, this patch modifies configure
> to detect whether the API is available, and adds the necessary
> code to use the API if it is.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
I think the patch is pretty good, just one comment below.
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Michael Tokarev <mjt@tls.msk.ru>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Stefan Weil <sw@weilnetz.de>
> Cc: Olaf Hering <olaf@aepfle.de>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
> Cc: Alexander Graf <agraf@suse.de>
> ---
> configure | 29 ++++++
> include/hw/xen/xen_common.h | 222 +++++++++++++++++++++++++++++++++++++++++++
> trace-events | 8 ++
> xen-hvm.c | 163 +++++++++++++++++++++++++++----
> 4 files changed, 403 insertions(+), 19 deletions(-)
>
> diff --git a/configure b/configure
> index 9ac2600..c2db574 100755
> --- a/configure
> +++ b/configure
> @@ -1876,6 +1876,32 @@ int main(void) {
> xc_gnttab_open(NULL, 0);
> xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
> + xc_hvm_create_ioreq_server(xc, 0, 0, NULL);
> + return 0;
> +}
> +EOF
> + compile_prog "" "$xen_libs"
> + then
> + xen_ctrl_version=450
> + xen=yes
> +
> + elif
> + cat > $TMPC <<EOF &&
> +#include <xenctrl.h>
> +#include <xenstore.h>
> +#include <stdint.h>
> +#include <xen/hvm/hvm_info_table.h>
> +#if !defined(HVM_MAX_VCPUS)
> +# error HVM_MAX_VCPUS not defined
> +#endif
> +int main(void) {
> + xc_interface *xc;
> + xs_daemon_open();
> + xc = xc_interface_open(0, 0, 0);
> + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> + xc_gnttab_open(NULL, 0);
> + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
> return 0;
> }
> EOF
> @@ -4282,6 +4308,9 @@ if test -n "$sparc_cpu"; then
> echo "Target Sparc Arch $sparc_cpu"
> fi
> echo "xen support $xen"
> +if test "$xen" = "yes" ; then
> + echo "xen ctrl version $xen_ctrl_version"
> +fi
> echo "brlapi support $brlapi"
> echo "bluez support $bluez"
> echo "Documentation $docs"
> diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
> index 07731b9..7040506 100644
> --- a/include/hw/xen/xen_common.h
> +++ b/include/hw/xen/xen_common.h
> @@ -16,7 +16,9 @@
>
> #include "hw/hw.h"
> #include "hw/xen/xen.h"
> +#include "hw/pci/pci.h"
> #include "qemu/queue.h"
> +#include "trace.h"
>
> /*
> * We don't support Xen prior to 3.3.0.
> @@ -164,4 +166,224 @@ void destroy_hvm_domain(bool reboot);
> /* shutdown/destroy current domain because of an error */
> void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
>
> +/* Xen before 4.5 */
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450
> +
> +#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
> +#define HVM_PARAM_BUFIOREQ_EVTCHN 26
> +#endif
> +
> +#define IOREQ_TYPE_PCI_CONFIG 2
> +
> +typedef uint32_t ioservid_t;
> +
> +static inline void xen_map_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_map_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_map_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> +}
> +
> +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> +}
> +
> +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t *ioservid)
> +{
> + return 0;
> +}
> +
> +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t ioservid)
> +{
> +}
> +
> +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + xen_pfn_t *ioreq_pfn,
> + xen_pfn_t *bufioreq_pfn,
> + evtchn_port_t *bufioreq_evtchn)
> +{
> + unsigned long param;
> + int rc;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n");
> + return -1;
> + }
> +
> + *ioreq_pfn = param;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n");
> + return -1;
> + }
> +
> + *bufioreq_pfn = param;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
> + ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
> + return -1;
> + }
> +
> + *bufioreq_evtchn = param;
> +
> + return 0;
> +}
> +
> +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + bool enable)
> +{
> + return 0;
> +}
> +
> +/* Xen 4.5 */
> +#else
> +
> +static inline void xen_map_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_map_mmio_range(ioservid, start_addr, end_addr);
> + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr);
> + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_map_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_map_portio_range(ioservid, start_addr, end_addr);
> + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_unmap_portio_range(ioservid, start_addr, end_addr);
> + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_map_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> + trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
> + xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid,
> + 0, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn),
> + PCI_FUNC(pci_dev->devfn));
> +}
> +
> +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> + trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
> + xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid,
> + 0, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn),
> + PCI_FUNC(pci_dev->devfn));
> +}
> +
> +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t *ioservid)
> +{
> + int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid);
> +
> + if (rc == 0) {
> + trace_xen_ioreq_server_create(*ioservid);
> + }
> +
> + return rc;
> +}
> +
> +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t ioservid)
> +{
> + trace_xen_ioreq_server_destroy(ioservid);
> + xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
> +}
> +
> +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + xen_pfn_t *ioreq_pfn,
> + xen_pfn_t *bufioreq_pfn,
> + evtchn_port_t *bufioreq_evtchn)
> +{
> + return xc_hvm_get_ioreq_server_info(xc, dom, ioservid,
> + ioreq_pfn, bufioreq_pfn,
> + bufioreq_evtchn);
> +}
> +
> +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + bool enable)
> +{
> + return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable);
> +}
> +
> +#endif
> +
> #endif /* QEMU_HW_XEN_COMMON_H */
> diff --git a/trace-events b/trace-events
> index 011d105..3efcff7 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -895,6 +895,14 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages:
> # xen-hvm.c
> xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx"
> xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i"
> +xen_ioreq_server_create(uint32_t id) "id: %u"
> +xen_ioreq_server_destroy(uint32_t id) "id: %u"
> +xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
> +xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
>
> # xen-mapcache.c
> xen_map_cache(uint64_t phys_addr) "want %#"PRIx64
> diff --git a/xen-hvm.c b/xen-hvm.c
> index 05e522c..5853735 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -62,9 +62,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> }
> # define FMT_ioreq_size "u"
> #endif
> -#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
> -#define HVM_PARAM_BUFIOREQ_EVTCHN 26
> -#endif
>
> #define BUFFER_IO_MAX_DELAY 100
>
> @@ -78,6 +75,7 @@ typedef struct XenPhysmap {
> } XenPhysmap;
>
> typedef struct XenIOState {
> + ioservid_t ioservid;
> shared_iopage_t *shared_page;
> buffered_iopage_t *buffered_io_page;
> QEMUTimer *buffered_io_timer;
> @@ -92,6 +90,8 @@ typedef struct XenIOState {
>
> struct xs_handle *xenstore;
> MemoryListener memory_listener;
> + MemoryListener io_listener;
> + PCIListener pci_listener;
> QLIST_HEAD(, XenPhysmap) physmap;
> hwaddr free_phys_offset;
> const XenPhysmap *log_for_dirtybit;
> @@ -480,6 +480,13 @@ static void xen_region_add(MemoryListener *listener,
> MemoryRegionSection *section)
> {
> memory_region_ref(section->mr);
> +
> + if (section->mr != &ram_memory) {
> + XenIOState *state = container_of(listener, XenIOState, memory_listener);
> +
> + xen_map_memory_section(xen_xc, xen_domid, state->ioservid, section);
> + }
> +
> xen_set_memory(listener, section, true);
> }
>
> @@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener *listener,
> MemoryRegionSection *section)
> {
> xen_set_memory(listener, section, false);
> +
> + if (section->mr != &ram_memory) {
> + XenIOState *state = container_of(listener, XenIOState, memory_listener);
> +
> + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, section);
> + }
> +
> memory_region_unref(section->mr);
> }
I would prefer if you could move the xen_unmap_memory_section and
xen_map_memory_section calls to xen_set_memory, where we already have a
ram_memory check. Could you reuse it?
> +static void xen_io_add(MemoryListener *listener,
> + MemoryRegionSection *section)
> +{
> + XenIOState *state = container_of(listener, XenIOState, io_listener);
> +
> + memory_region_ref(section->mr);
> +
> + xen_map_io_section(xen_xc, xen_domid, state->ioservid, section);
> +}
> +
> +static void xen_io_del(MemoryListener *listener,
> + MemoryRegionSection *section)
> +{
> + XenIOState *state = container_of(listener, XenIOState, io_listener);
> +
> + xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section);
> +
> + memory_region_unref(section->mr);
> +}
> +
> +static void xen_pci_add(PCIListener *listener,
> + PCIDevice *pci_dev)
> +{
> + XenIOState *state = container_of(listener, XenIOState, pci_listener);
> +
> + xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
> +}
> +
> +static void xen_pci_del(PCIListener *listener,
> + PCIDevice *pci_dev)
> +{
> + XenIOState *state = container_of(listener, XenIOState, pci_listener);
> +
> + xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
> +}
> +
> static void xen_sync_dirty_bitmap(XenIOState *state,
> hwaddr start_addr,
> ram_addr_t size)
> @@ -590,6 +640,17 @@ static MemoryListener xen_memory_listener = {
> .priority = 10,
> };
>
> +static MemoryListener xen_io_listener = {
> + .region_add = xen_io_add,
> + .region_del = xen_io_del,
> + .priority = 10,
> +};
> +
> +static PCIListener xen_pci_listener = {
> + .device_add = xen_pci_add,
> + .device_del = xen_pci_del,
> +};
> +
> /* get the ioreq packets from share mem */
> static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
> {
> @@ -792,6 +853,27 @@ static void handle_ioreq(ioreq_t *req)
> case IOREQ_TYPE_INVALIDATE:
> xen_invalidate_map_cache();
> break;
> + case IOREQ_TYPE_PCI_CONFIG: {
> + uint32_t sbdf = req->addr >> 32;
> + uint32_t val;
> +
> + /* Fake a write to port 0xCF8 so that
> + * the config space access will target the
> + * correct device model.
> + */
> + val = (1u << 31) |
> + ((req->addr & 0x0f00) << 16) |
> + ((sbdf & 0xffff) << 8) |
> + (req->addr & 0xfc);
> + do_outp(0xcf8, 4, val);
> +
> + /* Now issue the config space access via
> + * port 0xCFC
> + */
> + req->addr = 0xcfc | (req->addr & 0x03);
> + cpu_ioreq_pio(req);
> + break;
> + }
> default:
> hw_error("Invalid ioreq type 0x%x\n", req->type);
> }
> @@ -979,13 +1061,33 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
> xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
> }
>
> +static void xen_hvm_pre_save(void *opaque)
> +{
> + XenIOState *state = opaque;
> +
> + /* Stop servicing emulation requests */
> + xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, 0);
> + xen_destroy_ioreq_server(xen_xc, xen_domid, state->ioservid);
> +}
> +
> +static const VMStateDescription vmstate_xen_hvm = {
> + .name = "xen-hvm",
> + .version_id = 4,
> + .minimum_version_id = 4,
> + .pre_save = xen_hvm_pre_save,
> + .fields = (VMStateField[]) {
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> /* return 0 means OK, or -1 means critical issue -- will exit(1) */
> int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> MemoryRegion **ram_memory)
> {
> int i, rc;
> - unsigned long ioreq_pfn;
> - unsigned long bufioreq_evtchn;
> + xen_pfn_t ioreq_pfn;
> + xen_pfn_t bufioreq_pfn;
> + evtchn_port_t bufioreq_evtchn;
> XenIOState *state;
>
> state = g_malloc0(sizeof (XenIOState));
> @@ -1002,6 +1104,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> return -1;
> }
>
> + rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid);
> + if (rc < 0) {
> + perror("xen: ioreq server create");
> + return -1;
> + }
> +
> state->exit.notify = xen_exit_notifier;
> qemu_add_exit_notifier(&state->exit);
>
> @@ -1011,8 +1119,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> state->wakeup.notify = xen_wakeup_notifier;
> qemu_register_wakeup_notifier(&state->wakeup);
>
> - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn);
> + rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid,
> + &ioreq_pfn, &bufioreq_pfn,
> + &bufioreq_evtchn);
> + if (rc < 0) {
> + hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT,
> + errno, xen_xc);
> + }
> +
> DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
> + DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
> + DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
> +
> state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
> PROT_READ|PROT_WRITE, ioreq_pfn);
> if (state->shared_page == NULL) {
> @@ -1020,14 +1138,20 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> errno, xen_xc);
> }
>
> - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn);
> - DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn);
> - state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
> - PROT_READ|PROT_WRITE, ioreq_pfn);
> + state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid,
> + XC_PAGE_SIZE,
> + PROT_READ|PROT_WRITE,
> + bufioreq_pfn);
> if (state->buffered_io_page == NULL) {
> hw_error("map buffered IO page returned error %d", errno);
> }
>
> + rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true);
> + if (rc < 0) {
> + hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT,
> + errno, xen_xc);
> + }
> +
> state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t));
>
> /* FIXME: how about if we overflow the page here? */
> @@ -1035,22 +1159,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
> xen_vcpu_eport(state->shared_page, i));
> if (rc == -1) {
> - fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
> + fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno);
> return -1;
> }
> state->ioreq_local_port[i] = rc;
> }
>
> - rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN,
> - &bufioreq_evtchn);
> - if (rc < 0) {
> - fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
> - return -1;
> - }
> rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
> - (uint32_t)bufioreq_evtchn);
> + bufioreq_evtchn);
> if (rc == -1) {
> - fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
> + fprintf(stderr, "buffered evtchn bind error %d\n", errno);
> return -1;
> }
> state->bufioreq_local_port = rc;
> @@ -1060,12 +1178,19 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory);
>
> qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
> + vmstate_register(NULL, 0, &vmstate_xen_hvm, state);
>
> state->memory_listener = xen_memory_listener;
> QLIST_INIT(&state->physmap);
> memory_listener_register(&state->memory_listener, &address_space_memory);
> state->log_for_dirtybit = NULL;
>
> + state->io_listener = xen_io_listener;
> + memory_listener_register(&state->io_listener, &address_space_io);
> +
> + state->pci_listener = xen_pci_listener;
> + pci_listener_register(&state->pci_listener);
> +
> /* Initialize backend core & drivers */
> if (xen_be_init() != 0) {
> fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__);
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 15:52 ` Stefano Stabellini
@ 2014-10-13 16:41 ` Paul Durrant
2014-10-13 16:41 ` [Qemu-devel] " Paul Durrant
1 sibling, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 16:41 UTC (permalink / raw)
Cc: Peter Maydell, Olaf Hering, Alexey Kardashevskiy, Stefan Weil,
Michael Tokarev, qemu-devel@nongnu.org, Alexander Graf,
Stefano Stabellini, Gerd Hoffmann, Stefan Hajnoczi, Paolo Bonzini,
xen-devel@lists.xenproject.org
> -----Original Message-----
> From: Stefano Stabellini [mailto:stefano.stabellini@eu.citrix.com]
> Sent: 13 October 2014 16:53
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Stefano
> Stabellini; Peter Maydell; Paolo Bonzini; Michael Tokarev; Stefan Hajnoczi;
> Stefan Weil; Olaf Hering; Gerd Hoffmann; Alexey Kardashevskiy; Alexander
> Graf
> Subject: Re: [PATCH v2 2/2] Xen: Use the ioreq-server API when available
>
> On Mon, 13 Oct 2014, Paul Durrant wrote:
> > The ioreq-server API added to Xen 4.5 offers better security than
> > the existing Xen/QEMU interface because the shared pages that are
> > used to pass emulation request/results back and forth are removed
> > from the guest's memory space before any requests are serviced.
> > This prevents the guest from mapping these pages (they are in a
> > well known location) and attempting to attack QEMU by synthesizing
> > its own request structures. Hence, this patch modifies configure
> > to detect whether the API is available, and adds the necessary
> > code to use the API if it is.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
>
> I think the patch is pretty good, just one comment below.
>
[snip]
> > @@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener
> *listener,
> > MemoryRegionSection *section)
> > {
> > xen_set_memory(listener, section, false);
> > +
> > + if (section->mr != &ram_memory) {
> > + XenIOState *state = container_of(listener, XenIOState,
> memory_listener);
> > +
> > + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid,
> section);
> > + }
> > +
> > memory_region_unref(section->mr);
> > }
>
> I would prefer if you could move the xen_unmap_memory_section and
> xen_map_memory_section calls to xen_set_memory, where we already
> have a
> ram_memory check. Could you reuse it?
>
Sure, I can do that.
Paul
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 15:52 ` Stefano Stabellini
2014-10-13 16:41 ` Paul Durrant
@ 2014-10-13 16:41 ` Paul Durrant
1 sibling, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 16:41 UTC (permalink / raw)
To: Stefano Stabellini
Cc: Peter Maydell, Olaf Hering, Alexey Kardashevskiy, Stefan Weil,
Michael Tokarev, qemu-devel@nongnu.org, Alexander Graf,
Gerd Hoffmann, Stefan Hajnoczi, Paolo Bonzini,
xen-devel@lists.xenproject.org
> -----Original Message-----
> From: Stefano Stabellini [mailto:stefano.stabellini@eu.citrix.com]
> Sent: 13 October 2014 16:53
> To: Paul Durrant
> Cc: qemu-devel@nongnu.org; xen-devel@lists.xenproject.org; Stefano
> Stabellini; Peter Maydell; Paolo Bonzini; Michael Tokarev; Stefan Hajnoczi;
> Stefan Weil; Olaf Hering; Gerd Hoffmann; Alexey Kardashevskiy; Alexander
> Graf
> Subject: Re: [PATCH v2 2/2] Xen: Use the ioreq-server API when available
>
> On Mon, 13 Oct 2014, Paul Durrant wrote:
> > The ioreq-server API added to Xen 4.5 offers better security than
> > the existing Xen/QEMU interface because the shared pages that are
> > used to pass emulation request/results back and forth are removed
> > from the guest's memory space before any requests are serviced.
> > This prevents the guest from mapping these pages (they are in a
> > well known location) and attempting to attack QEMU by synthesizing
> > its own request structures. Hence, this patch modifies configure
> > to detect whether the API is available, and adds the necessary
> > code to use the API if it is.
> >
> > Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
>
> I think the patch is pretty good, just one comment below.
>
[snip]
> > @@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener
> *listener,
> > MemoryRegionSection *section)
> > {
> > xen_set_memory(listener, section, false);
> > +
> > + if (section->mr != &ram_memory) {
> > + XenIOState *state = container_of(listener, XenIOState,
> memory_listener);
> > +
> > + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid,
> section);
> > + }
> > +
> > memory_region_unref(section->mr);
> > }
>
> I would prefer if you could move the xen_unmap_memory_section and
> xen_map_memory_section calls to xen_set_memory, where we already
> have a
> ram_memory check. Could you reuse it?
>
Sure, I can do that.
Paul
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 12:52 ` [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available Paul Durrant
2014-10-13 15:52 ` Stefano Stabellini
@ 2014-10-13 15:52 ` Stefano Stabellini
1 sibling, 0 replies; 19+ messages in thread
From: Stefano Stabellini @ 2014-10-13 15:52 UTC (permalink / raw)
To: Paul Durrant
Cc: Peter Maydell, Olaf Hering, Stefano Stabellini,
Alexey Kardashevskiy, Stefan Weil, Michael Tokarev, qemu-devel,
Alexander Graf, Gerd Hoffmann, Stefan Hajnoczi, Paolo Bonzini,
xen-devel
On Mon, 13 Oct 2014, Paul Durrant wrote:
> The ioreq-server API added to Xen 4.5 offers better security than
> the existing Xen/QEMU interface because the shared pages that are
> used to pass emulation request/results back and forth are removed
> from the guest's memory space before any requests are serviced.
> This prevents the guest from mapping these pages (they are in a
> well known location) and attempting to attack QEMU by synthesizing
> its own request structures. Hence, this patch modifies configure
> to detect whether the API is available, and adds the necessary
> code to use the API if it is.
>
> Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
I think the patch is pretty good, just one comment below.
> Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
> Cc: Peter Maydell <peter.maydell@linaro.org>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Michael Tokarev <mjt@tls.msk.ru>
> Cc: Stefan Hajnoczi <stefanha@redhat.com>
> Cc: Stefan Weil <sw@weilnetz.de>
> Cc: Olaf Hering <olaf@aepfle.de>
> Cc: Gerd Hoffmann <kraxel@redhat.com>
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
> Cc: Alexander Graf <agraf@suse.de>
> ---
> configure | 29 ++++++
> include/hw/xen/xen_common.h | 222 +++++++++++++++++++++++++++++++++++++++++++
> trace-events | 8 ++
> xen-hvm.c | 163 +++++++++++++++++++++++++++----
> 4 files changed, 403 insertions(+), 19 deletions(-)
>
> diff --git a/configure b/configure
> index 9ac2600..c2db574 100755
> --- a/configure
> +++ b/configure
> @@ -1876,6 +1876,32 @@ int main(void) {
> xc_gnttab_open(NULL, 0);
> xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
> + xc_hvm_create_ioreq_server(xc, 0, 0, NULL);
> + return 0;
> +}
> +EOF
> + compile_prog "" "$xen_libs"
> + then
> + xen_ctrl_version=450
> + xen=yes
> +
> + elif
> + cat > $TMPC <<EOF &&
> +#include <xenctrl.h>
> +#include <xenstore.h>
> +#include <stdint.h>
> +#include <xen/hvm/hvm_info_table.h>
> +#if !defined(HVM_MAX_VCPUS)
> +# error HVM_MAX_VCPUS not defined
> +#endif
> +int main(void) {
> + xc_interface *xc;
> + xs_daemon_open();
> + xc = xc_interface_open(0, 0, 0);
> + xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
> + xc_gnttab_open(NULL, 0);
> + xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
> + xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
> return 0;
> }
> EOF
> @@ -4282,6 +4308,9 @@ if test -n "$sparc_cpu"; then
> echo "Target Sparc Arch $sparc_cpu"
> fi
> echo "xen support $xen"
> +if test "$xen" = "yes" ; then
> + echo "xen ctrl version $xen_ctrl_version"
> +fi
> echo "brlapi support $brlapi"
> echo "bluez support $bluez"
> echo "Documentation $docs"
> diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
> index 07731b9..7040506 100644
> --- a/include/hw/xen/xen_common.h
> +++ b/include/hw/xen/xen_common.h
> @@ -16,7 +16,9 @@
>
> #include "hw/hw.h"
> #include "hw/xen/xen.h"
> +#include "hw/pci/pci.h"
> #include "qemu/queue.h"
> +#include "trace.h"
>
> /*
> * We don't support Xen prior to 3.3.0.
> @@ -164,4 +166,224 @@ void destroy_hvm_domain(bool reboot);
> /* shutdown/destroy current domain because of an error */
> void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
>
> +/* Xen before 4.5 */
> +#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450
> +
> +#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
> +#define HVM_PARAM_BUFIOREQ_EVTCHN 26
> +#endif
> +
> +#define IOREQ_TYPE_PCI_CONFIG 2
> +
> +typedef uint32_t ioservid_t;
> +
> +static inline void xen_map_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_map_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> +}
> +
> +static inline void xen_map_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> +}
> +
> +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> +}
> +
> +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t *ioservid)
> +{
> + return 0;
> +}
> +
> +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t ioservid)
> +{
> +}
> +
> +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + xen_pfn_t *ioreq_pfn,
> + xen_pfn_t *bufioreq_pfn,
> + evtchn_port_t *bufioreq_evtchn)
> +{
> + unsigned long param;
> + int rc;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n");
> + return -1;
> + }
> +
> + *ioreq_pfn = param;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n");
> + return -1;
> + }
> +
> + *bufioreq_pfn = param;
> +
> + rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
> + ¶m);
> + if (rc < 0) {
> + fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
> + return -1;
> + }
> +
> + *bufioreq_evtchn = param;
> +
> + return 0;
> +}
> +
> +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + bool enable)
> +{
> + return 0;
> +}
> +
> +/* Xen 4.5 */
> +#else
> +
> +static inline void xen_map_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_map_mmio_range(ioservid, start_addr, end_addr);
> + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr);
> + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_map_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_map_portio_range(ioservid, start_addr, end_addr);
> + xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + MemoryRegionSection *section)
> +{
> + hwaddr start_addr = section->offset_within_address_space;
> + ram_addr_t size = int128_get64(section->size);
> + hwaddr end_addr = start_addr + size - 1;
> +
> + trace_xen_unmap_portio_range(ioservid, start_addr, end_addr);
> + xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0,
> + start_addr, end_addr);
> +}
> +
> +static inline void xen_map_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> + trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
> + xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid,
> + 0, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn),
> + PCI_FUNC(pci_dev->devfn));
> +}
> +
> +static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + PCIDevice *pci_dev)
> +{
> + trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
> + xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid,
> + 0, pci_bus_num(pci_dev->bus),
> + PCI_SLOT(pci_dev->devfn),
> + PCI_FUNC(pci_dev->devfn));
> +}
> +
> +static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t *ioservid)
> +{
> + int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid);
> +
> + if (rc == 0) {
> + trace_xen_ioreq_server_create(*ioservid);
> + }
> +
> + return rc;
> +}
> +
> +static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
> + ioservid_t ioservid)
> +{
> + trace_xen_ioreq_server_destroy(ioservid);
> + xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
> +}
> +
> +static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + xen_pfn_t *ioreq_pfn,
> + xen_pfn_t *bufioreq_pfn,
> + evtchn_port_t *bufioreq_evtchn)
> +{
> + return xc_hvm_get_ioreq_server_info(xc, dom, ioservid,
> + ioreq_pfn, bufioreq_pfn,
> + bufioreq_evtchn);
> +}
> +
> +static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
> + ioservid_t ioservid,
> + bool enable)
> +{
> + return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable);
> +}
> +
> +#endif
> +
> #endif /* QEMU_HW_XEN_COMMON_H */
> diff --git a/trace-events b/trace-events
> index 011d105..3efcff7 100644
> --- a/trace-events
> +++ b/trace-events
> @@ -895,6 +895,14 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages:
> # xen-hvm.c
> xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx"
> xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i"
> +xen_ioreq_server_create(uint32_t id) "id: %u"
> +xen_ioreq_server_destroy(uint32_t id) "id: %u"
> +xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
> +xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
> +xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
>
> # xen-mapcache.c
> xen_map_cache(uint64_t phys_addr) "want %#"PRIx64
> diff --git a/xen-hvm.c b/xen-hvm.c
> index 05e522c..5853735 100644
> --- a/xen-hvm.c
> +++ b/xen-hvm.c
> @@ -62,9 +62,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
> }
> # define FMT_ioreq_size "u"
> #endif
> -#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
> -#define HVM_PARAM_BUFIOREQ_EVTCHN 26
> -#endif
>
> #define BUFFER_IO_MAX_DELAY 100
>
> @@ -78,6 +75,7 @@ typedef struct XenPhysmap {
> } XenPhysmap;
>
> typedef struct XenIOState {
> + ioservid_t ioservid;
> shared_iopage_t *shared_page;
> buffered_iopage_t *buffered_io_page;
> QEMUTimer *buffered_io_timer;
> @@ -92,6 +90,8 @@ typedef struct XenIOState {
>
> struct xs_handle *xenstore;
> MemoryListener memory_listener;
> + MemoryListener io_listener;
> + PCIListener pci_listener;
> QLIST_HEAD(, XenPhysmap) physmap;
> hwaddr free_phys_offset;
> const XenPhysmap *log_for_dirtybit;
> @@ -480,6 +480,13 @@ static void xen_region_add(MemoryListener *listener,
> MemoryRegionSection *section)
> {
> memory_region_ref(section->mr);
> +
> + if (section->mr != &ram_memory) {
> + XenIOState *state = container_of(listener, XenIOState, memory_listener);
> +
> + xen_map_memory_section(xen_xc, xen_domid, state->ioservid, section);
> + }
> +
> xen_set_memory(listener, section, true);
> }
>
> @@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener *listener,
> MemoryRegionSection *section)
> {
> xen_set_memory(listener, section, false);
> +
> + if (section->mr != &ram_memory) {
> + XenIOState *state = container_of(listener, XenIOState, memory_listener);
> +
> + xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, section);
> + }
> +
> memory_region_unref(section->mr);
> }
I would prefer if you could move the xen_unmap_memory_section and
xen_map_memory_section calls to xen_set_memory, where we already have a
ram_memory check. Could you reuse it?
> +static void xen_io_add(MemoryListener *listener,
> + MemoryRegionSection *section)
> +{
> + XenIOState *state = container_of(listener, XenIOState, io_listener);
> +
> + memory_region_ref(section->mr);
> +
> + xen_map_io_section(xen_xc, xen_domid, state->ioservid, section);
> +}
> +
> +static void xen_io_del(MemoryListener *listener,
> + MemoryRegionSection *section)
> +{
> + XenIOState *state = container_of(listener, XenIOState, io_listener);
> +
> + xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section);
> +
> + memory_region_unref(section->mr);
> +}
> +
> +static void xen_pci_add(PCIListener *listener,
> + PCIDevice *pci_dev)
> +{
> + XenIOState *state = container_of(listener, XenIOState, pci_listener);
> +
> + xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
> +}
> +
> +static void xen_pci_del(PCIListener *listener,
> + PCIDevice *pci_dev)
> +{
> + XenIOState *state = container_of(listener, XenIOState, pci_listener);
> +
> + xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
> +}
> +
> static void xen_sync_dirty_bitmap(XenIOState *state,
> hwaddr start_addr,
> ram_addr_t size)
> @@ -590,6 +640,17 @@ static MemoryListener xen_memory_listener = {
> .priority = 10,
> };
>
> +static MemoryListener xen_io_listener = {
> + .region_add = xen_io_add,
> + .region_del = xen_io_del,
> + .priority = 10,
> +};
> +
> +static PCIListener xen_pci_listener = {
> + .device_add = xen_pci_add,
> + .device_del = xen_pci_del,
> +};
> +
> /* get the ioreq packets from share mem */
> static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
> {
> @@ -792,6 +853,27 @@ static void handle_ioreq(ioreq_t *req)
> case IOREQ_TYPE_INVALIDATE:
> xen_invalidate_map_cache();
> break;
> + case IOREQ_TYPE_PCI_CONFIG: {
> + uint32_t sbdf = req->addr >> 32;
> + uint32_t val;
> +
> + /* Fake a write to port 0xCF8 so that
> + * the config space access will target the
> + * correct device model.
> + */
> + val = (1u << 31) |
> + ((req->addr & 0x0f00) << 16) |
> + ((sbdf & 0xffff) << 8) |
> + (req->addr & 0xfc);
> + do_outp(0xcf8, 4, val);
> +
> + /* Now issue the config space access via
> + * port 0xCFC
> + */
> + req->addr = 0xcfc | (req->addr & 0x03);
> + cpu_ioreq_pio(req);
> + break;
> + }
> default:
> hw_error("Invalid ioreq type 0x%x\n", req->type);
> }
> @@ -979,13 +1061,33 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
> xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
> }
>
> +static void xen_hvm_pre_save(void *opaque)
> +{
> + XenIOState *state = opaque;
> +
> + /* Stop servicing emulation requests */
> + xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, 0);
> + xen_destroy_ioreq_server(xen_xc, xen_domid, state->ioservid);
> +}
> +
> +static const VMStateDescription vmstate_xen_hvm = {
> + .name = "xen-hvm",
> + .version_id = 4,
> + .minimum_version_id = 4,
> + .pre_save = xen_hvm_pre_save,
> + .fields = (VMStateField[]) {
> + VMSTATE_END_OF_LIST()
> + },
> +};
> +
> /* return 0 means OK, or -1 means critical issue -- will exit(1) */
> int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> MemoryRegion **ram_memory)
> {
> int i, rc;
> - unsigned long ioreq_pfn;
> - unsigned long bufioreq_evtchn;
> + xen_pfn_t ioreq_pfn;
> + xen_pfn_t bufioreq_pfn;
> + evtchn_port_t bufioreq_evtchn;
> XenIOState *state;
>
> state = g_malloc0(sizeof (XenIOState));
> @@ -1002,6 +1104,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> return -1;
> }
>
> + rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid);
> + if (rc < 0) {
> + perror("xen: ioreq server create");
> + return -1;
> + }
> +
> state->exit.notify = xen_exit_notifier;
> qemu_add_exit_notifier(&state->exit);
>
> @@ -1011,8 +1119,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> state->wakeup.notify = xen_wakeup_notifier;
> qemu_register_wakeup_notifier(&state->wakeup);
>
> - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn);
> + rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid,
> + &ioreq_pfn, &bufioreq_pfn,
> + &bufioreq_evtchn);
> + if (rc < 0) {
> + hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT,
> + errno, xen_xc);
> + }
> +
> DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
> + DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
> + DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
> +
> state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
> PROT_READ|PROT_WRITE, ioreq_pfn);
> if (state->shared_page == NULL) {
> @@ -1020,14 +1138,20 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> errno, xen_xc);
> }
>
> - xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn);
> - DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn);
> - state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
> - PROT_READ|PROT_WRITE, ioreq_pfn);
> + state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid,
> + XC_PAGE_SIZE,
> + PROT_READ|PROT_WRITE,
> + bufioreq_pfn);
> if (state->buffered_io_page == NULL) {
> hw_error("map buffered IO page returned error %d", errno);
> }
>
> + rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true);
> + if (rc < 0) {
> + hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT,
> + errno, xen_xc);
> + }
> +
> state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t));
>
> /* FIXME: how about if we overflow the page here? */
> @@ -1035,22 +1159,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
> xen_vcpu_eport(state->shared_page, i));
> if (rc == -1) {
> - fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
> + fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno);
> return -1;
> }
> state->ioreq_local_port[i] = rc;
> }
>
> - rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN,
> - &bufioreq_evtchn);
> - if (rc < 0) {
> - fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
> - return -1;
> - }
> rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
> - (uint32_t)bufioreq_evtchn);
> + bufioreq_evtchn);
> if (rc == -1) {
> - fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
> + fprintf(stderr, "buffered evtchn bind error %d\n", errno);
> return -1;
> }
> state->bufioreq_local_port = rc;
> @@ -1060,12 +1178,19 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
> xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory);
>
> qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
> + vmstate_register(NULL, 0, &vmstate_xen_hvm, state);
>
> state->memory_listener = xen_memory_listener;
> QLIST_INIT(&state->physmap);
> memory_listener_register(&state->memory_listener, &address_space_memory);
> state->log_for_dirtybit = NULL;
>
> + state->io_listener = xen_io_listener;
> + memory_listener_register(&state->io_listener, &address_space_io);
> +
> + state->pci_listener = xen_pci_listener;
> + pci_listener_register(&state->pci_listener);
> +
> /* Initialize backend core & drivers */
> if (xen_be_init() != 0) {
> fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__);
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2 2/2] Xen: Use the ioreq-server API when available
2014-10-13 12:52 [Qemu-devel] [PATCH v2 0/2] Xen: Use ioreq-server API Paul Durrant
2014-10-13 12:52 ` Paul Durrant
2014-10-13 12:52 ` [Qemu-devel] [PATCH v2 2/2] Xen: Use the ioreq-server API when available Paul Durrant
@ 2014-10-13 12:52 ` Paul Durrant
2 siblings, 0 replies; 19+ messages in thread
From: Paul Durrant @ 2014-10-13 12:52 UTC (permalink / raw)
To: qemu-devel, xen-devel
Cc: Peter Maydell, Olaf Hering, Stefano Stabellini,
Alexey Kardashevskiy, Stefan Weil, Michael Tokarev,
Alexander Graf, Paul Durrant, Gerd Hoffmann, Stefan Hajnoczi,
Paolo Bonzini
The ioreq-server API added to Xen 4.5 offers better security than
the existing Xen/QEMU interface because the shared pages that are
used to pass emulation request/results back and forth are removed
from the guest's memory space before any requests are serviced.
This prevents the guest from mapping these pages (they are in a
well known location) and attempting to attack QEMU by synthesizing
its own request structures. Hence, this patch modifies configure
to detect whether the API is available, and adds the necessary
code to use the API if it is.
Signed-off-by: Paul Durrant <paul.durrant@citrix.com>
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Cc: Stefan Weil <sw@weilnetz.de>
Cc: Olaf Hering <olaf@aepfle.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Cc: Alexander Graf <agraf@suse.de>
---
configure | 29 ++++++
include/hw/xen/xen_common.h | 222 +++++++++++++++++++++++++++++++++++++++++++
trace-events | 8 ++
xen-hvm.c | 163 +++++++++++++++++++++++++++----
4 files changed, 403 insertions(+), 19 deletions(-)
diff --git a/configure b/configure
index 9ac2600..c2db574 100755
--- a/configure
+++ b/configure
@@ -1876,6 +1876,32 @@ int main(void) {
xc_gnttab_open(NULL, 0);
xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
+ xc_hvm_create_ioreq_server(xc, 0, 0, NULL);
+ return 0;
+}
+EOF
+ compile_prog "" "$xen_libs"
+ then
+ xen_ctrl_version=450
+ xen=yes
+
+ elif
+ cat > $TMPC <<EOF &&
+#include <xenctrl.h>
+#include <xenstore.h>
+#include <stdint.h>
+#include <xen/hvm/hvm_info_table.h>
+#if !defined(HVM_MAX_VCPUS)
+# error HVM_MAX_VCPUS not defined
+#endif
+int main(void) {
+ xc_interface *xc;
+ xs_daemon_open();
+ xc = xc_interface_open(0, 0, 0);
+ xc_hvm_set_mem_type(0, 0, HVMMEM_ram_ro, 0, 0);
+ xc_gnttab_open(NULL, 0);
+ xc_domain_add_to_physmap(0, 0, XENMAPSPACE_gmfn, 0, 0);
+ xc_hvm_inject_msi(xc, 0, 0xf0000000, 0x00000000);
return 0;
}
EOF
@@ -4282,6 +4308,9 @@ if test -n "$sparc_cpu"; then
echo "Target Sparc Arch $sparc_cpu"
fi
echo "xen support $xen"
+if test "$xen" = "yes" ; then
+ echo "xen ctrl version $xen_ctrl_version"
+fi
echo "brlapi support $brlapi"
echo "bluez support $bluez"
echo "Documentation $docs"
diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h
index 07731b9..7040506 100644
--- a/include/hw/xen/xen_common.h
+++ b/include/hw/xen/xen_common.h
@@ -16,7 +16,9 @@
#include "hw/hw.h"
#include "hw/xen/xen.h"
+#include "hw/pci/pci.h"
#include "qemu/queue.h"
+#include "trace.h"
/*
* We don't support Xen prior to 3.3.0.
@@ -164,4 +166,224 @@ void destroy_hvm_domain(bool reboot);
/* shutdown/destroy current domain because of an error */
void xen_shutdown_fatal_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
+/* Xen before 4.5 */
+#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 450
+
+#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
+#define HVM_PARAM_BUFIOREQ_EVTCHN 26
+#endif
+
+#define IOREQ_TYPE_PCI_CONFIG 2
+
+typedef uint32_t ioservid_t;
+
+static inline void xen_map_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_map_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+}
+
+static inline void xen_map_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+}
+
+static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+}
+
+static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t *ioservid)
+{
+ return 0;
+}
+
+static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t ioservid)
+{
+}
+
+static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ xen_pfn_t *ioreq_pfn,
+ xen_pfn_t *bufioreq_pfn,
+ evtchn_port_t *bufioreq_evtchn)
+{
+ unsigned long param;
+ int rc;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_IOREQ_PFN, ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_IOREQ_PFN\n");
+ return -1;
+ }
+
+ *ioreq_pfn = param;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_PFN, ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_PFN\n");
+ return -1;
+ }
+
+ *bufioreq_pfn = param;
+
+ rc = xc_get_hvm_param(xc, dom, HVM_PARAM_BUFIOREQ_EVTCHN,
+ ¶m);
+ if (rc < 0) {
+ fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
+ return -1;
+ }
+
+ *bufioreq_evtchn = param;
+
+ return 0;
+}
+
+static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ bool enable)
+{
+ return 0;
+}
+
+/* Xen 4.5 */
+#else
+
+static inline void xen_map_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_map_mmio_range(ioservid, start_addr, end_addr);
+ xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 1,
+ start_addr, end_addr);
+}
+
+static inline void xen_unmap_memory_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_unmap_mmio_range(ioservid, start_addr, end_addr);
+ xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 1,
+ start_addr, end_addr);
+}
+
+static inline void xen_map_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_map_portio_range(ioservid, start_addr, end_addr);
+ xc_hvm_map_io_range_to_ioreq_server(xc, dom, ioservid, 0,
+ start_addr, end_addr);
+}
+
+static inline void xen_unmap_io_section(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ MemoryRegionSection *section)
+{
+ hwaddr start_addr = section->offset_within_address_space;
+ ram_addr_t size = int128_get64(section->size);
+ hwaddr end_addr = start_addr + size - 1;
+
+ trace_xen_unmap_portio_range(ioservid, start_addr, end_addr);
+ xc_hvm_unmap_io_range_from_ioreq_server(xc, dom, ioservid, 0,
+ start_addr, end_addr);
+}
+
+static inline void xen_map_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+ trace_xen_map_pcidev(ioservid, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
+ xc_hvm_map_pcidev_to_ioreq_server(xc, dom, ioservid,
+ 0, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn),
+ PCI_FUNC(pci_dev->devfn));
+}
+
+static inline void xen_unmap_pcidev(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ PCIDevice *pci_dev)
+{
+ trace_xen_unmap_pcidev(ioservid, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn), PCI_FUNC(pci_dev->devfn));
+ xc_hvm_unmap_pcidev_from_ioreq_server(xc, dom, ioservid,
+ 0, pci_bus_num(pci_dev->bus),
+ PCI_SLOT(pci_dev->devfn),
+ PCI_FUNC(pci_dev->devfn));
+}
+
+static inline int xen_create_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t *ioservid)
+{
+ int rc = xc_hvm_create_ioreq_server(xc, dom, 1, ioservid);
+
+ if (rc == 0) {
+ trace_xen_ioreq_server_create(*ioservid);
+ }
+
+ return rc;
+}
+
+static inline void xen_destroy_ioreq_server(XenXC xc, domid_t dom,
+ ioservid_t ioservid)
+{
+ trace_xen_ioreq_server_destroy(ioservid);
+ xc_hvm_destroy_ioreq_server(xc, dom, ioservid);
+}
+
+static inline int xen_get_ioreq_server_info(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ xen_pfn_t *ioreq_pfn,
+ xen_pfn_t *bufioreq_pfn,
+ evtchn_port_t *bufioreq_evtchn)
+{
+ return xc_hvm_get_ioreq_server_info(xc, dom, ioservid,
+ ioreq_pfn, bufioreq_pfn,
+ bufioreq_evtchn);
+}
+
+static inline int xen_set_ioreq_server_state(XenXC xc, domid_t dom,
+ ioservid_t ioservid,
+ bool enable)
+{
+ return xc_hvm_set_ioreq_server_state(xc, dom, ioservid, enable);
+}
+
+#endif
+
#endif /* QEMU_HW_XEN_COMMON_H */
diff --git a/trace-events b/trace-events
index 011d105..3efcff7 100644
--- a/trace-events
+++ b/trace-events
@@ -895,6 +895,14 @@ pvscsi_tx_rings_num_pages(const char* label, uint32_t num) "Number of %s pages:
# xen-hvm.c
xen_ram_alloc(unsigned long ram_addr, unsigned long size) "requested: %#lx, size %#lx"
xen_client_set_memory(uint64_t start_addr, unsigned long size, bool log_dirty) "%#"PRIx64" size %#lx, log_dirty %i"
+xen_ioreq_server_create(uint32_t id) "id: %u"
+xen_ioreq_server_destroy(uint32_t id) "id: %u"
+xen_map_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_unmap_mmio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64
+xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
+xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x"
# xen-mapcache.c
xen_map_cache(uint64_t phys_addr) "want %#"PRIx64
diff --git a/xen-hvm.c b/xen-hvm.c
index 05e522c..5853735 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -62,9 +62,6 @@ static inline ioreq_t *xen_vcpu_ioreq(shared_iopage_t *shared_page, int vcpu)
}
# define FMT_ioreq_size "u"
#endif
-#ifndef HVM_PARAM_BUFIOREQ_EVTCHN
-#define HVM_PARAM_BUFIOREQ_EVTCHN 26
-#endif
#define BUFFER_IO_MAX_DELAY 100
@@ -78,6 +75,7 @@ typedef struct XenPhysmap {
} XenPhysmap;
typedef struct XenIOState {
+ ioservid_t ioservid;
shared_iopage_t *shared_page;
buffered_iopage_t *buffered_io_page;
QEMUTimer *buffered_io_timer;
@@ -92,6 +90,8 @@ typedef struct XenIOState {
struct xs_handle *xenstore;
MemoryListener memory_listener;
+ MemoryListener io_listener;
+ PCIListener pci_listener;
QLIST_HEAD(, XenPhysmap) physmap;
hwaddr free_phys_offset;
const XenPhysmap *log_for_dirtybit;
@@ -480,6 +480,13 @@ static void xen_region_add(MemoryListener *listener,
MemoryRegionSection *section)
{
memory_region_ref(section->mr);
+
+ if (section->mr != &ram_memory) {
+ XenIOState *state = container_of(listener, XenIOState, memory_listener);
+
+ xen_map_memory_section(xen_xc, xen_domid, state->ioservid, section);
+ }
+
xen_set_memory(listener, section, true);
}
@@ -487,9 +494,52 @@ static void xen_region_del(MemoryListener *listener,
MemoryRegionSection *section)
{
xen_set_memory(listener, section, false);
+
+ if (section->mr != &ram_memory) {
+ XenIOState *state = container_of(listener, XenIOState, memory_listener);
+
+ xen_unmap_memory_section(xen_xc, xen_domid, state->ioservid, section);
+ }
+
memory_region_unref(section->mr);
}
+static void xen_io_add(MemoryListener *listener,
+ MemoryRegionSection *section)
+{
+ XenIOState *state = container_of(listener, XenIOState, io_listener);
+
+ memory_region_ref(section->mr);
+
+ xen_map_io_section(xen_xc, xen_domid, state->ioservid, section);
+}
+
+static void xen_io_del(MemoryListener *listener,
+ MemoryRegionSection *section)
+{
+ XenIOState *state = container_of(listener, XenIOState, io_listener);
+
+ xen_unmap_io_section(xen_xc, xen_domid, state->ioservid, section);
+
+ memory_region_unref(section->mr);
+}
+
+static void xen_pci_add(PCIListener *listener,
+ PCIDevice *pci_dev)
+{
+ XenIOState *state = container_of(listener, XenIOState, pci_listener);
+
+ xen_map_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
+}
+
+static void xen_pci_del(PCIListener *listener,
+ PCIDevice *pci_dev)
+{
+ XenIOState *state = container_of(listener, XenIOState, pci_listener);
+
+ xen_unmap_pcidev(xen_xc, xen_domid, state->ioservid, pci_dev);
+}
+
static void xen_sync_dirty_bitmap(XenIOState *state,
hwaddr start_addr,
ram_addr_t size)
@@ -590,6 +640,17 @@ static MemoryListener xen_memory_listener = {
.priority = 10,
};
+static MemoryListener xen_io_listener = {
+ .region_add = xen_io_add,
+ .region_del = xen_io_del,
+ .priority = 10,
+};
+
+static PCIListener xen_pci_listener = {
+ .device_add = xen_pci_add,
+ .device_del = xen_pci_del,
+};
+
/* get the ioreq packets from share mem */
static ioreq_t *cpu_get_ioreq_from_shared_memory(XenIOState *state, int vcpu)
{
@@ -792,6 +853,27 @@ static void handle_ioreq(ioreq_t *req)
case IOREQ_TYPE_INVALIDATE:
xen_invalidate_map_cache();
break;
+ case IOREQ_TYPE_PCI_CONFIG: {
+ uint32_t sbdf = req->addr >> 32;
+ uint32_t val;
+
+ /* Fake a write to port 0xCF8 so that
+ * the config space access will target the
+ * correct device model.
+ */
+ val = (1u << 31) |
+ ((req->addr & 0x0f00) << 16) |
+ ((sbdf & 0xffff) << 8) |
+ (req->addr & 0xfc);
+ do_outp(0xcf8, 4, val);
+
+ /* Now issue the config space access via
+ * port 0xCFC
+ */
+ req->addr = 0xcfc | (req->addr & 0x03);
+ cpu_ioreq_pio(req);
+ break;
+ }
default:
hw_error("Invalid ioreq type 0x%x\n", req->type);
}
@@ -979,13 +1061,33 @@ static void xen_wakeup_notifier(Notifier *notifier, void *data)
xc_set_hvm_param(xen_xc, xen_domid, HVM_PARAM_ACPI_S_STATE, 0);
}
+static void xen_hvm_pre_save(void *opaque)
+{
+ XenIOState *state = opaque;
+
+ /* Stop servicing emulation requests */
+ xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, 0);
+ xen_destroy_ioreq_server(xen_xc, xen_domid, state->ioservid);
+}
+
+static const VMStateDescription vmstate_xen_hvm = {
+ .name = "xen-hvm",
+ .version_id = 4,
+ .minimum_version_id = 4,
+ .pre_save = xen_hvm_pre_save,
+ .fields = (VMStateField[]) {
+ VMSTATE_END_OF_LIST()
+ },
+};
+
/* return 0 means OK, or -1 means critical issue -- will exit(1) */
int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
MemoryRegion **ram_memory)
{
int i, rc;
- unsigned long ioreq_pfn;
- unsigned long bufioreq_evtchn;
+ xen_pfn_t ioreq_pfn;
+ xen_pfn_t bufioreq_pfn;
+ evtchn_port_t bufioreq_evtchn;
XenIOState *state;
state = g_malloc0(sizeof (XenIOState));
@@ -1002,6 +1104,12 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
return -1;
}
+ rc = xen_create_ioreq_server(xen_xc, xen_domid, &state->ioservid);
+ if (rc < 0) {
+ perror("xen: ioreq server create");
+ return -1;
+ }
+
state->exit.notify = xen_exit_notifier;
qemu_add_exit_notifier(&state->exit);
@@ -1011,8 +1119,18 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
state->wakeup.notify = xen_wakeup_notifier;
qemu_register_wakeup_notifier(&state->wakeup);
- xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_IOREQ_PFN, &ioreq_pfn);
+ rc = xen_get_ioreq_server_info(xen_xc, xen_domid, state->ioservid,
+ &ioreq_pfn, &bufioreq_pfn,
+ &bufioreq_evtchn);
+ if (rc < 0) {
+ hw_error("failed to get ioreq server info: error %d handle=" XC_INTERFACE_FMT,
+ errno, xen_xc);
+ }
+
DPRINTF("shared page at pfn %lx\n", ioreq_pfn);
+ DPRINTF("buffered io page at pfn %lx\n", bufioreq_pfn);
+ DPRINTF("buffered io evtchn is %x\n", bufioreq_evtchn);
+
state->shared_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
PROT_READ|PROT_WRITE, ioreq_pfn);
if (state->shared_page == NULL) {
@@ -1020,14 +1138,20 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
errno, xen_xc);
}
- xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_PFN, &ioreq_pfn);
- DPRINTF("buffered io page at pfn %lx\n", ioreq_pfn);
- state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid, XC_PAGE_SIZE,
- PROT_READ|PROT_WRITE, ioreq_pfn);
+ state->buffered_io_page = xc_map_foreign_range(xen_xc, xen_domid,
+ XC_PAGE_SIZE,
+ PROT_READ|PROT_WRITE,
+ bufioreq_pfn);
if (state->buffered_io_page == NULL) {
hw_error("map buffered IO page returned error %d", errno);
}
+ rc = xen_set_ioreq_server_state(xen_xc, xen_domid, state->ioservid, true);
+ if (rc < 0) {
+ hw_error("failed to enable ioreq server info: error %d handle=" XC_INTERFACE_FMT,
+ errno, xen_xc);
+ }
+
state->ioreq_local_port = g_malloc0(max_cpus * sizeof (evtchn_port_t));
/* FIXME: how about if we overflow the page here? */
@@ -1035,22 +1159,16 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
xen_vcpu_eport(state->shared_page, i));
if (rc == -1) {
- fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
+ fprintf(stderr, "shared evtchn %d bind error %d\n", i, errno);
return -1;
}
state->ioreq_local_port[i] = rc;
}
- rc = xc_get_hvm_param(xen_xc, xen_domid, HVM_PARAM_BUFIOREQ_EVTCHN,
- &bufioreq_evtchn);
- if (rc < 0) {
- fprintf(stderr, "failed to get HVM_PARAM_BUFIOREQ_EVTCHN\n");
- return -1;
- }
rc = xc_evtchn_bind_interdomain(state->xce_handle, xen_domid,
- (uint32_t)bufioreq_evtchn);
+ bufioreq_evtchn);
if (rc == -1) {
- fprintf(stderr, "bind interdomain ioctl error %d\n", errno);
+ fprintf(stderr, "buffered evtchn bind error %d\n", errno);
return -1;
}
state->bufioreq_local_port = rc;
@@ -1060,12 +1178,19 @@ int xen_hvm_init(ram_addr_t *below_4g_mem_size, ram_addr_t *above_4g_mem_size,
xen_ram_init(below_4g_mem_size, above_4g_mem_size, ram_size, ram_memory);
qemu_add_vm_change_state_handler(xen_hvm_change_state_handler, state);
+ vmstate_register(NULL, 0, &vmstate_xen_hvm, state);
state->memory_listener = xen_memory_listener;
QLIST_INIT(&state->physmap);
memory_listener_register(&state->memory_listener, &address_space_memory);
state->log_for_dirtybit = NULL;
+ state->io_listener = xen_io_listener;
+ memory_listener_register(&state->io_listener, &address_space_io);
+
+ state->pci_listener = xen_pci_listener;
+ pci_listener_register(&state->pci_listener);
+
/* Initialize backend core & drivers */
if (xen_be_init() != 0) {
fprintf(stderr, "%s: xen backend core setup failed\n", __FUNCTION__);
--
1.7.10.4
^ permalink raw reply related [flat|nested] 19+ messages in thread