Re: [PATCH 5/6] hw/vfio/common: Add vfio_listener_region_del_iommu trace event

[Cédric Le Goater]

On 7/16/24 11:45, Eric Auger wrote:

Trace when VFIO gets notified about the deletion of an IOMMU MR.
Also trace the name of the region in the add_iommu trace message.

Signed-off-by: Eric Auger <eric.au...@redhat.com>

Reviewed-by: Cédric Le Goater <c...@redhat.com>

Thanks,

C.

---
  hw/vfio/common.c     | 3 ++-
  hw/vfio/trace-events | 3 ++-
  2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index 6d15b36e0b..cfc44a4569 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -599,7 +599,7 @@ static void vfio_listener_region_add(MemoryListener 
*listener,
          IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);
          int iommu_idx;

- trace_vfio_listener_region_add_iommu(iova, end);

+        trace_vfio_listener_region_add_iommu(section->mr->name, iova, end);
          /*
           * FIXME: For VFIO iommu types which have KVM acceleration to
           * avoid bouncing all map/unmaps through qemu this way, this
@@ -725,6 +725,7 @@ static void vfio_listener_region_del(MemoryListener 
*listener,
      if (memory_region_is_iommu(section->mr)) {
          VFIOGuestIOMMU *giommu;

+ trace_vfio_listener_region_del_iommu(section->mr->name);

          QLIST_FOREACH(giommu, &bcontainer->giommu_list, giommu_next) {
              if (MEMORY_REGION(giommu->iommu_mr) == section->mr &&
                  giommu->n.start == section->offset_within_region) {
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index e16179b507..98bd4dccea 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -95,7 +95,8 @@ vfio_region_read(char *name, int index, uint64_t addr, 
unsigned size, uint64_t d
  vfio_iommu_map_notify(const char *op, uint64_t iova_start, uint64_t iova_end) "iommu %s @ 
0x%"PRIx64" - 0x%"PRIx64
  vfio_listener_region_skip(const char *name, uint64_t start, uint64_t end) "SKIPPING %s 
0x%"PRIx64" - 0x%"PRIx64
  vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to liobn fd 
%d"
-vfio_listener_region_add_iommu(uint64_t start, uint64_t end) "region_add [iommu] 
0x%"PRIx64" - 0x%"PRIx64
+vfio_listener_region_add_iommu(const char* name, uint64_t start, uint64_t end) "region_add 
[iommu] %s 0x%"PRIx64" - 0x%"PRIx64
+vfio_listener_region_del_iommu(const char *name) "region_del [iommu] %s"
  vfio_listener_region_add_ram(uint64_t iova_start, uint64_t iova_end, void *vaddr) "region_add [ram] 
0x%"PRIx64" - 0x%"PRIx64" [%p]"
  vfio_known_safe_misalignment(const char *name, uint64_t iova, uint64_t offset_within_region, uintptr_t page_size) 
"Region \"%s\" iova=0x%"PRIx64" offset_within_region=0x%"PRIx64" 
qemu_real_host_page_size=0x%"PRIxPTR
  vfio_listener_region_add_no_dma_map(const char *name, uint64_t iova, uint64_t size, uint64_t page_size) "Region 
\"%s\" 0x%"PRIx64" size=0x%"PRIx64" is not aligned to 0x%"PRIx64" and cannot be mapped 
for DMA"