[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 3/6] virtio: support adding sub-regions for notif
From: |
Tiwei Bie |
Subject: |
[Qemu-devel] [PATCH v1 3/6] virtio: support adding sub-regions for notify region |
Date: |
Thu, 25 Jan 2018 12:03:25 +0800 |
Provide APIs to support querying whether the page-per-vq
is enabled and adding sub-regions for notify region.
Signed-off-by: Tiwei Bie <address@hidden>
---
Makefile.target | 4 ++++
hw/virtio/virtio-pci.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++
hw/virtio/virtio-pci.h | 5 +++++
hw/virtio/virtio.c | 39 +++++++++++++++++++++++++++++++++++++
include/hw/virtio/virtio.h | 5 +++++
include/qemu/osdep.h | 1 +
6 files changed, 102 insertions(+)
diff --git a/Makefile.target b/Makefile.target
index f9a9da7e7c..bdde6f94d2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -39,6 +39,9 @@ STPFILES=
config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak
+config-devices.h: config-devices.h-timestamp
+config-devices.h-timestamp: config-devices.mak
+
ifdef CONFIG_TRACE_SYSTEMTAP
stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp
@@ -224,4 +227,5 @@ ifdef CONFIG_TRACE_SYSTEMTAP
endif
GENERATED_FILES += config-target.h
+GENERATED_FILES += config-devices.h
Makefile: $(GENERATED_FILES)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index e92837c42b..a7d790c411 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -1534,6 +1534,54 @@ static void
virtio_pci_modern_io_region_unmap(VirtIOPCIProxy *proxy,
®ion->mr);
}
+static VirtIOPCIProxy *virtio_device_to_virtio_pci_proxy(VirtIODevice *vdev)
+{
+ VirtIOPCIProxy *proxy = NULL;
+
+ if (vdev->device_id == VIRTIO_ID_NET) {
+ VirtIONetPCI *d = container_of(vdev, VirtIONetPCI, vdev.parent_obj);
+ proxy = &d->parent_obj;
+ }
+
+ return proxy;
+}
+
+bool virtio_pci_page_per_vq_enabled(VirtIODevice *vdev)
+{
+ VirtIOPCIProxy *proxy = virtio_device_to_virtio_pci_proxy(vdev);
+
+ if (proxy == NULL) {
+ return false;
+ }
+
+ return !!(proxy->flags & VIRTIO_PCI_FLAG_PAGE_PER_VQ);
+}
+
+int virtio_pci_notify_region_map(VirtIODevice *vdev, int queue_idx,
+ MemoryRegion *mr)
+{
+ VirtIOPCIProxy *proxy = virtio_device_to_virtio_pci_proxy(vdev);
+ int offset;
+
+ if (proxy == NULL || !virtio_pci_modern(proxy)) {
+ return -1;
+ }
+
+ offset = virtio_pci_queue_mem_mult(proxy) * queue_idx;
+ memory_region_add_subregion(&proxy->notify.mr, offset, mr);
+
+ return 0;
+}
+
+void virtio_pci_notify_region_unmap(VirtIODevice *vdev, MemoryRegion *mr)
+{
+ VirtIOPCIProxy *proxy = virtio_device_to_virtio_pci_proxy(vdev);
+
+ if (proxy != NULL) {
+ memory_region_del_subregion(&proxy->notify.mr, mr);
+ }
+}
+
static void virtio_pci_pre_plugged(DeviceState *d, Error **errp)
{
VirtIOPCIProxy *proxy = VIRTIO_PCI(d);
diff --git a/hw/virtio/virtio-pci.h b/hw/virtio/virtio-pci.h
index 12d3a90686..41dbc3d274 100644
--- a/hw/virtio/virtio-pci.h
+++ b/hw/virtio/virtio-pci.h
@@ -209,6 +209,11 @@ static inline void
virtio_pci_disable_modern(VirtIOPCIProxy *proxy)
proxy->disable_modern = true;
}
+bool virtio_pci_page_per_vq_enabled(VirtIODevice *vdev);
+int virtio_pci_notify_region_map(VirtIODevice *vdev, int queue_idx,
+ MemoryRegion *mr);
+void virtio_pci_notify_region_unmap(VirtIODevice *vdev, MemoryRegion *mr);
+
/*
* virtio-scsi-pci: This extends VirtioPCIProxy.
*/
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index ad564b0132..325349c8b9 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -22,6 +22,7 @@
#include "qemu/atomic.h"
#include "hw/virtio/virtio-bus.h"
#include "hw/virtio/virtio-access.h"
+#include "hw/virtio/virtio-pci.h"
#include "sysemu/dma.h"
/*
@@ -2661,6 +2662,44 @@ void virtio_device_release_ioeventfd(VirtIODevice *vdev)
virtio_bus_release_ioeventfd(vbus);
}
+bool virtio_device_parent_is_pci_device(VirtIODevice *vdev)
+{
+ BusState *qbus = qdev_get_parent_bus(DEVICE(vdev));
+ const char *typename = object_get_typename(OBJECT(qbus->parent));
+
+ return strstr(typename, "pci") != NULL;
+}
+
+bool virtio_device_page_per_vq_enabled(VirtIODevice *vdev)
+{
+#ifdef CONFIG_VIRTIO_PCI
+ if (virtio_device_parent_is_pci_device(vdev)) {
+ return virtio_pci_page_per_vq_enabled(vdev);
+ }
+#endif
+ return false;
+}
+
+int virtio_device_notify_region_map(VirtIODevice *vdev, int queue_idx,
+ MemoryRegion *mr)
+{
+#ifdef CONFIG_VIRTIO_PCI
+ if (virtio_device_parent_is_pci_device(vdev)) {
+ return virtio_pci_notify_region_map(vdev, queue_idx, mr);
+ }
+#endif
+ return -1;
+}
+
+void virtio_device_notify_region_unmap(VirtIODevice *vdev, MemoryRegion *mr)
+{
+#ifdef CONFIG_VIRTIO_PCI
+ if (virtio_device_parent_is_pci_device(vdev)) {
+ virtio_pci_notify_region_unmap(vdev, mr);
+ }
+#endif
+}
+
static void virtio_device_class_init(ObjectClass *klass, void *data)
{
/* Set the default value here. */
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 098bdaaea3..b14accdb08 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -285,6 +285,11 @@ void virtio_device_stop_ioeventfd(VirtIODevice *vdev);
int virtio_device_grab_ioeventfd(VirtIODevice *vdev);
void virtio_device_release_ioeventfd(VirtIODevice *vdev);
bool virtio_device_ioeventfd_enabled(VirtIODevice *vdev);
+bool virtio_device_parent_is_pci_device(VirtIODevice *vdev);
+bool virtio_device_page_per_vq_enabled(VirtIODevice *vdev);
+int virtio_device_notify_region_map(VirtIODevice *vdev, int queue_idx,
+ MemoryRegion *mr);
+void virtio_device_notify_region_unmap(VirtIODevice *vdev, MemoryRegion *mr);
EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq);
void virtio_queue_host_notifier_read(EventNotifier *n);
void virtio_queue_aio_set_host_notifier_handler(VirtQueue *vq, AioContext *ctx,
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index e8568a0a54..1975db7dac 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -30,6 +30,7 @@
#include "config-host.h"
#ifdef NEED_CPU_H
#include "config-target.h"
+#include "config-devices.h"
#else
#include "exec/poison.h"
#endif
--
2.13.3
- [Qemu-devel] [PATCH v1 0/6] Extend vhost-user to support VFIO based accelerators, Tiwei Bie, 2018/01/24
- [Qemu-devel] [PATCH v1 3/6] virtio: support adding sub-regions for notify region,
Tiwei Bie <=
- [Qemu-devel] [PATCH v1 1/6] vhost-user: support receiving file descriptors in slave_read, Tiwei Bie, 2018/01/24
- [Qemu-devel] [PATCH v1 2/6] vhost-user: introduce shared vhost-user state, Tiwei Bie, 2018/01/24
- [Qemu-devel] [PATCH v1 4/6] vfio: support getting VFIOGroup from groupfd, Tiwei Bie, 2018/01/24
- [Qemu-devel] [PATCH v1 5/6] vfio: remove DPRINTF() definition from vfio-common.h, Tiwei Bie, 2018/01/24
- [Qemu-devel] [PATCH v1 6/6] vhost-user: add VFIO based accelerators support, Tiwei Bie, 2018/01/24
- Re: [Qemu-devel] [PATCH v1 0/6] Extend vhost-user to support VFIO based accelerators, Stefan Hajnoczi, 2018/01/25