diff mbox series

[v10,06/10] virtio-iommu: Add notify_flag_changed() memory region callback

Message ID 20201008171558.410886-7-jean-philippe@linaro.org
State Superseded
Headers show
Series virtio-iommu: VFIO integration | expand

Commit Message

Jean-Philippe Brucker Oct. 8, 2020, 5:15 p.m. UTC 
From: Bharat Bhushan <bbhushan2@marvell.com>

Add notify_flag_changed() to notice when memory listeners are added and
removed.

Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
v10:
* Use notifier flags instead of notifiers_list
* Homogenize tracepoints
---
 hw/virtio/virtio-iommu.c | 14 ++++++++++++++
 hw/virtio/trace-events   |  2 ++
 2 files changed, 16 insertions(+)

Comments

Eric Auger Oct. 16, 2020, 8:18 a.m. UTC | #1 
Hi Jean,

On 10/8/20 7:15 PM, Jean-Philippe Brucker wrote:
> From: Bharat Bhushan <bbhushan2@marvell.com>

> 

> Add notify_flag_changed() to notice when memory listeners are added and

> removed.

> 

> Signed-off-by: Bharat Bhushan <bbhushan2@marvell.com>

> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

> ---

> v10:

> * Use notifier flags instead of notifiers_list

> * Homogenize tracepoints

> ---

>  hw/virtio/virtio-iommu.c | 14 ++++++++++++++

>  hw/virtio/trace-events   |  2 ++

>  2 files changed, 16 insertions(+)

> 

> diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c

> index d2b96846134..8823bfc804a 100644

> --- a/hw/virtio/virtio-iommu.c

> +++ b/hw/virtio/virtio-iommu.c

> @@ -901,6 +901,19 @@ unlock:

>      qemu_mutex_unlock(&s->mutex);

>  }

>  

> +static int virtio_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu_mr,

> +                                            IOMMUNotifierFlag old,

> +                                            IOMMUNotifierFlag new,

> +                                            Error **errp)

> +{

> +    if (old == IOMMU_NOTIFIER_NONE) {

> +        trace_virtio_iommu_notify_flag_add(iommu_mr->parent_obj.name);

> +    } else if (new == IOMMU_NOTIFIER_NONE) {

> +        trace_virtio_iommu_notify_flag_del(iommu_mr->parent_obj.name);

> +    }

> +    return 0;

> +}

> +

>  static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)

>  {

>      VirtIODevice *vdev = VIRTIO_DEVICE(dev);

> @@ -1132,6 +1145,7 @@ static void virtio_iommu_memory_region_class_init(ObjectClass *klass,

>  

>      imrc->translate = virtio_iommu_translate;

>      imrc->replay = virtio_iommu_replay;

> +    imrc->notify_flag_changed = virtio_iommu_notify_flag_changed;

>  }

>  

>  static const TypeInfo virtio_iommu_info = {

> diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events

> index 16f4729db4b..9108992bcc3 100644

> --- a/hw/virtio/trace-events

> +++ b/hw/virtio/trace-events

> @@ -109,6 +109,8 @@ virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start,

>  virtio_iommu_notify_map(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64

>  virtio_iommu_notify_unmap(const char *name, uint64_t virt_start, uint64_t virt_end) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64

>  virtio_iommu_remap(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64

> +virtio_iommu_notify_flag_add(const char *name) "add notifier mr=%s"

Maybe "add notifier %d to mr=%s"
> +virtio_iommu_notify_flag_del(const char *name) "del notifier mr=%s"

from?
>  

>  # virtio-mem.c

>  virtio_mem_send_response(uint16_t type) "type=%" PRIu16

> 


Besides
Acked-by: Eric Auger <eric.auger@redhat.com>


Thanks

Eric
diff mbox series

Patch

diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c
index d2b96846134..8823bfc804a 100644
--- a/hw/virtio/virtio-iommu.c
+++ b/hw/virtio/virtio-iommu.c
@@ -901,6 +901,19 @@  unlock:
     qemu_mutex_unlock(&s->mutex);
 }
 
+static int virtio_iommu_notify_flag_changed(IOMMUMemoryRegion *iommu_mr,
+                                            IOMMUNotifierFlag old,
+                                            IOMMUNotifierFlag new,
+                                            Error **errp)
+{
+    if (old == IOMMU_NOTIFIER_NONE) {
+        trace_virtio_iommu_notify_flag_add(iommu_mr->parent_obj.name);
+    } else if (new == IOMMU_NOTIFIER_NONE) {
+        trace_virtio_iommu_notify_flag_del(iommu_mr->parent_obj.name);
+    }
+    return 0;
+}
+
 static void virtio_iommu_device_realize(DeviceState *dev, Error **errp)
 {
     VirtIODevice *vdev = VIRTIO_DEVICE(dev);
@@ -1132,6 +1145,7 @@  static void virtio_iommu_memory_region_class_init(ObjectClass *klass,
 
     imrc->translate = virtio_iommu_translate;
     imrc->replay = virtio_iommu_replay;
+    imrc->notify_flag_changed = virtio_iommu_notify_flag_changed;
 }
 
 static const TypeInfo virtio_iommu_info = {
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index 16f4729db4b..9108992bcc3 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -109,6 +109,8 @@  virtio_iommu_fill_resv_property(uint32_t devid, uint8_t subtype, uint64_t start,
 virtio_iommu_notify_map(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64
 virtio_iommu_notify_unmap(const char *name, uint64_t virt_start, uint64_t virt_end) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64
 virtio_iommu_remap(const char *name, uint64_t virt_start, uint64_t virt_end, uint64_t phys_start) "mr=%s virt_start=0x%"PRIx64" virt_end=0x%"PRIx64" phys_start=0x%"PRIx64
+virtio_iommu_notify_flag_add(const char *name) "add notifier mr=%s"
+virtio_iommu_notify_flag_del(const char *name) "del notifier mr=%s"
 
 # virtio-mem.c
 virtio_mem_send_response(uint16_t type) "type=%" PRIu16