| Message ID | 1604345694-48400-1-git-send-email-steven.sistare@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V1] vfio-pci: improved tracing | expand |
On Mon, 2 Nov 2020 11:34:54 -0800 Steve Sistare <steven.sistare@oracle.com> wrote: > Print more info for existing trace points: > trace_kvm_irqchip_add_msi_route > trace_pci_update_mappings_del > trace_pci_update_mappings_add > > Add new trace points: > trace_kvm_irqchip_assign_irqfd > trace_msix_table_mmio_write > trace_vfio_dma_unmap > trace_vfio_dma_map > trace_vfio_region > trace_vfio_region_mmap > trace_ram_block_add > > Sample output: (timestamps deleted for clarity) > > ram_block_add host=0x7f4497e00000, maxlen=0x40000000, mr = {"pc.ram", rw} > > vfio_region 0000:3a:10.0 [3]: len 0x4000 @ +0x30000000000, cap +0x20, flags 0xf > > vfio_region_mmap "0000:3a:10.0 BAR 0 mmaps[0]" [0x0 - 0x3fff] maps to 0x7f44e3eb9000 > > msix_table_mmio_write vfio-pci, @ 16, val 0xfee01004, len 4 > > kvm_irqchip_add_msi_route dev vfio-pci, vector 1, virq 25, msg {addr 0xfee01004, data 0x40b1} > > kvm_irqchip_assign_irqfd fd=164, virq=25, rfd=-1 returns 0 > > vfio_dma_map fd 24, iova 0xa0000, len 0x10000, va 0x7f4495800000, rw > vfio_dma_unmap fd 24, iova 0xfebf5000, len 0x3000 > > pci_update_mappings_add vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" > pci_update_mappings_del vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" > > Signed-off-by: Steve Sistare <steven.sistare@oracle.com> > --- > accel/kvm/kvm-all.c | 8 ++++++-- > accel/kvm/trace-events | 3 ++- > exec.c | 3 +++ > hw/pci/msix.c | 1 + > hw/pci/pci.c | 10 ++++++---- > hw/pci/trace-events | 5 +++-- > hw/vfio/common.c | 11 ++++++++++- > hw/vfio/trace-events | 5 ++++- > trace-events | 2 ++ > 9 files changed, 37 insertions(+), 11 deletions(-) This might be easier to process if it were split into kvm+exec, pci, and vfio patches so each maintainer could take their chunk, but I'll toss this out in case one of the other maintainers wants to roll it in: Acked-by: Alex Williamson <alex.williamson@redhat.com> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> Thanks, Alex > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 63ef6af..01d0561 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -46,6 +46,7 @@ > #include "sysemu/reset.h" > > #include "hw/boards.h" > +#include "trace-root.h" > > /* This check must be after config-host.h is included */ > #ifdef CONFIG_EVENTFD > @@ -1670,7 +1671,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) > } > > trace_kvm_irqchip_add_msi_route(dev ? dev->name : (char *)"N/A", > - vector, virq); > + vector, virq, msg.address, msg.data); > > kvm_add_routing_entry(s, &kroute); > kvm_arch_add_msi_route_post(&kroute, vector, dev); > @@ -1715,6 +1716,7 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, > EventNotifier *resample, int virq, > bool assign) > { > + int ret; > int fd = event_notifier_get_fd(event); > int rfd = resample ? event_notifier_get_fd(resample) : -1; > > @@ -1758,7 +1760,9 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, > return -ENOSYS; > } > > - return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); > + ret = kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); > + trace_kvm_irqchip_assign_irqfd(fd, virq, rfd, ret); > + return ret; > } > > int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) > diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events > index a68eb66..c4ed199 100644 > --- a/accel/kvm/trace-events > +++ b/accel/kvm/trace-events > @@ -9,7 +9,8 @@ kvm_device_ioctl(int fd, int type, void *arg) "dev fd %d, type 0x%x, arg %p" > kvm_failed_reg_get(uint64_t id, const char *msg) "Warning: Unable to retrieve ONEREG %" PRIu64 " from KVM: %s" > kvm_failed_reg_set(uint64_t id, const char *msg) "Warning: Unable to set ONEREG %" PRIu64 " to KVM: %s" > kvm_irqchip_commit_routes(void) "" > -kvm_irqchip_add_msi_route(char *name, int vector, int virq) "dev %s vector %d virq %d" > +kvm_irqchip_add_msi_route(char *name, int vector, int virq, uint64_t addr, uint32_t data) "dev %s, vector %d, virq %d, msg {addr 0x%"PRIx64", data 0x%x}" > +kvm_irqchip_assign_irqfd(int fd, int virq, int rfd, int status) "fd=%d, virq=%d, rfd=%d returns %d" > kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d" > kvm_irqchip_release_virq(int virq) "virq %d" > kvm_set_ioeventfd_mmio(int fd, uint64_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) "fd: %d @0x%" PRIx64 " val=0x%x assign: %d size: %d match: %d" > diff --git a/exec.c b/exec.c > index 6f381f9..5d05154 100644 > --- a/exec.c > +++ b/exec.c > @@ -2309,6 +2309,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) > } > ram_block_notify_add(new_block->host, new_block->max_length); > } > + trace_ram_block_add(new_block->host, new_block->max_length, > + memory_region_name(new_block->mr), > + new_block->mr->readonly ? "ro" : "rw"); > } > > #ifdef CONFIG_POSIX > diff --git a/hw/pci/msix.c b/hw/pci/msix.c > index 67e34f3..65a2882 100644 > --- a/hw/pci/msix.c > +++ b/hw/pci/msix.c > @@ -189,6 +189,7 @@ static void msix_table_mmio_write(void *opaque, hwaddr addr, > int vector = addr / PCI_MSIX_ENTRY_SIZE; > bool was_masked; > > + trace_msix_table_mmio_write(dev->name, addr, val, size); > was_masked = msix_is_masked(dev, vector); > pci_set_long(dev->msix_table + addr, val); > msix_handle_mask_update(dev, vector, was_masked); > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index de0fae1..1bc1533 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1321,9 +1321,11 @@ static void pci_update_mappings(PCIDevice *d) > PCIIORegion *r; > int i; > pcibus_t new_addr; > + const char *name; > > for(i = 0; i < PCI_NUM_REGIONS; i++) { > r = &d->io_regions[i]; > + name = r->memory ? r->memory->name : ""; > > /* this region isn't registered */ > if (!r->size) > @@ -1337,18 +1339,18 @@ static void pci_update_mappings(PCIDevice *d) > > /* now do the real mapping */ > if (r->addr != PCI_BAR_UNMAPPED) { > - trace_pci_update_mappings_del(d, pci_dev_bus_num(d), > + trace_pci_update_mappings_del(d->name, d, pci_dev_bus_num(d), > PCI_SLOT(d->devfn), > PCI_FUNC(d->devfn), > - i, r->addr, r->size); > + i, r->addr, r->size, name); > memory_region_del_subregion(r->address_space, r->memory); > } > r->addr = new_addr; > if (r->addr != PCI_BAR_UNMAPPED) { > - trace_pci_update_mappings_add(d, pci_dev_bus_num(d), > + trace_pci_update_mappings_add(d->name, d, pci_dev_bus_num(d), > PCI_SLOT(d->devfn), > PCI_FUNC(d->devfn), > - i, r->addr, r->size); > + i, r->addr, r->size, name); > memory_region_add_subregion_overlap(r->address_space, > r->addr, r->memory, 1); > } > diff --git a/hw/pci/trace-events b/hw/pci/trace-events > index def4b39..56fc6c6 100644 > --- a/hw/pci/trace-events > +++ b/hw/pci/trace-events > @@ -1,8 +1,8 @@ > # See docs/devel/tracing.txt for syntax documentation. > > # pci.c > -pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 > -pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 > +pci_update_mappings_del(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" > +pci_update_mappings_add(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" > > # pci_host.c > pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" > @@ -10,3 +10,4 @@ pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, uns > > # msix.c > msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d" > +msix_table_mmio_write(char *name, uint64_t addr, uint64_t val, unsigned size) "%s, @ %"PRId64", val 0x%"PRIx64", len %d" > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 3335714..50b8202 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -299,6 +299,8 @@ static int vfio_dma_unmap(VFIOContainer *container, > .size = size, > }; > > + trace_vfio_dma_unmap(container->fd, iova, size); > + > while (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) { > /* > * The type1 backend has an off-by-one bug in the kernel (71a7d3d78e3c > @@ -336,6 +338,9 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova, > .size = size, > }; > > + trace_vfio_dma_map(container->fd, iova, size, vaddr, > + (readonly ? "r" : "rw")); > + > if (!readonly) { > map.flags |= VFIO_DMA_MAP_FLAG_WRITE; > } > @@ -976,7 +981,8 @@ int vfio_region_mmap(VFIORegion *region) > trace_vfio_region_mmap(memory_region_name(®ion->mmaps[i].mem), > region->mmaps[i].offset, > region->mmaps[i].offset + > - region->mmaps[i].size - 1); > + region->mmaps[i].size - 1, > + region->mmaps[i].mmap); > } > > return 0; > @@ -1639,6 +1645,9 @@ retry: > goto retry; > } > > + trace_vfio_region(vbasedev->name, index, (*info)->size, (*info)->offset, > + (*info)->cap_offset, (*info)->flags); > + > return 0; > } > > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index b1ef55a..78a3cfa 100644 > --- a/hw/vfio/trace-events > +++ b/hw/vfio/trace-events > @@ -107,7 +107,7 @@ vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, > vfio_put_base_device(int fd) "close vdev->fd=%d" > vfio_region_setup(const char *dev, int index, const char *name, unsigned long flags, unsigned long offset, unsigned long size) "Device %s, region %d \"%s\", flags: 0x%lx, offset: 0x%lx, size: 0x%lx" > vfio_region_mmap_fault(const char *name, int index, unsigned long offset, unsigned long size, int fault) "Region %s mmaps[%d], [0x%lx - 0x%lx], fault: %d" > -vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Region %s [0x%lx - 0x%lx]" > +vfio_region_mmap(const char *name, unsigned long offset, unsigned long end, void *addr) "\"%s\" [0x%lx - 0x%lx] maps to %p" > vfio_region_exit(const char *name, int index) "Device %s, region %d" > vfio_region_finalize(const char *name, int index) "Device %s, region %d" > vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps enabled: %d" > @@ -115,6 +115,9 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic > vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" > vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8" > vfio_dma_unmap_overflow_workaround(void) "" > +vfio_dma_unmap(int fd, uint64_t iova, uint64_t size) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64 > +vfio_dma_map(int fd, uint64_t iova, uint64_t size, void *addr, const char *access) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64", va %p, %s" > +vfio_region(const char *name, int index, uint64_t size, uint64_t offset, int cap_offset, int flags) "%s [%d]: len 0x%"PRIx64" @ +0x%"PRIx64", cap +0x%x, flags 0x%x" > > # platform.c > vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d" > diff --git a/trace-events b/trace-events > index 42107eb..e05238a 100644 > --- a/trace-events > +++ b/trace-events > @@ -107,6 +107,8 @@ qmp_job_complete(void *job) "job %p" > qmp_job_finalize(void *job) "job %p" > qmp_job_dismiss(void *job) "job %p" > > +# exec.c > +ram_block_add(void *host, uint64_t maxlen, const char *name, const char *mode) "host=%p, maxlen=0x%"PRIx64", mr = {\"%s\", %s}" > > ### Guest events, keep at bottom >
On Mon, Nov 02, 2020 at 11:34:54AM -0800, Steve Sistare wrote: > Print more info for existing trace points: > trace_kvm_irqchip_add_msi_route > trace_pci_update_mappings_del > trace_pci_update_mappings_add > > Add new trace points: > trace_kvm_irqchip_assign_irqfd > trace_msix_table_mmio_write > trace_vfio_dma_unmap > trace_vfio_dma_map > trace_vfio_region > trace_vfio_region_mmap > trace_ram_block_add > > Sample output: (timestamps deleted for clarity) > > ram_block_add host=0x7f4497e00000, maxlen=0x40000000, mr = {"pc.ram", rw} > > vfio_region 0000:3a:10.0 [3]: len 0x4000 @ +0x30000000000, cap +0x20, flags 0xf > > vfio_region_mmap "0000:3a:10.0 BAR 0 mmaps[0]" [0x0 - 0x3fff] maps to 0x7f44e3eb9000 > > msix_table_mmio_write vfio-pci, @ 16, val 0xfee01004, len 4 > > kvm_irqchip_add_msi_route dev vfio-pci, vector 1, virq 25, msg {addr 0xfee01004, data 0x40b1} > > kvm_irqchip_assign_irqfd fd=164, virq=25, rfd=-1 returns 0 > > vfio_dma_map fd 24, iova 0xa0000, len 0x10000, va 0x7f4495800000, rw > vfio_dma_unmap fd 24, iova 0xfebf5000, len 0x3000 > > pci_update_mappings_add vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" > pci_update_mappings_del vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" > > Signed-off-by: Steve Sistare <steven.sistare@oracle.com> pci bits: Acked-by: Michael S. Tsirkin <mst@redhat.com> > --- > accel/kvm/kvm-all.c | 8 ++++++-- > accel/kvm/trace-events | 3 ++- > exec.c | 3 +++ > hw/pci/msix.c | 1 + > hw/pci/pci.c | 10 ++++++---- > hw/pci/trace-events | 5 +++-- > hw/vfio/common.c | 11 ++++++++++- > hw/vfio/trace-events | 5 ++++- > trace-events | 2 ++ > 9 files changed, 37 insertions(+), 11 deletions(-) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index 63ef6af..01d0561 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -46,6 +46,7 @@ > #include "sysemu/reset.h" > > #include "hw/boards.h" > +#include "trace-root.h" > > /* This check must be after config-host.h is included */ > #ifdef CONFIG_EVENTFD > @@ -1670,7 +1671,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) > } > > trace_kvm_irqchip_add_msi_route(dev ? dev->name : (char *)"N/A", > - vector, virq); > + vector, virq, msg.address, msg.data); > > kvm_add_routing_entry(s, &kroute); > kvm_arch_add_msi_route_post(&kroute, vector, dev); > @@ -1715,6 +1716,7 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, > EventNotifier *resample, int virq, > bool assign) > { > + int ret; > int fd = event_notifier_get_fd(event); > int rfd = resample ? event_notifier_get_fd(resample) : -1; > > @@ -1758,7 +1760,9 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, > return -ENOSYS; > } > > - return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); > + ret = kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); > + trace_kvm_irqchip_assign_irqfd(fd, virq, rfd, ret); > + return ret; > } > > int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) > diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events > index a68eb66..c4ed199 100644 > --- a/accel/kvm/trace-events > +++ b/accel/kvm/trace-events > @@ -9,7 +9,8 @@ kvm_device_ioctl(int fd, int type, void *arg) "dev fd %d, type 0x%x, arg %p" > kvm_failed_reg_get(uint64_t id, const char *msg) "Warning: Unable to retrieve ONEREG %" PRIu64 " from KVM: %s" > kvm_failed_reg_set(uint64_t id, const char *msg) "Warning: Unable to set ONEREG %" PRIu64 " to KVM: %s" > kvm_irqchip_commit_routes(void) "" > -kvm_irqchip_add_msi_route(char *name, int vector, int virq) "dev %s vector %d virq %d" > +kvm_irqchip_add_msi_route(char *name, int vector, int virq, uint64_t addr, uint32_t data) "dev %s, vector %d, virq %d, msg {addr 0x%"PRIx64", data 0x%x}" > +kvm_irqchip_assign_irqfd(int fd, int virq, int rfd, int status) "fd=%d, virq=%d, rfd=%d returns %d" > kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d" > kvm_irqchip_release_virq(int virq) "virq %d" > kvm_set_ioeventfd_mmio(int fd, uint64_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) "fd: %d @0x%" PRIx64 " val=0x%x assign: %d size: %d match: %d" > diff --git a/exec.c b/exec.c > index 6f381f9..5d05154 100644 > --- a/exec.c > +++ b/exec.c > @@ -2309,6 +2309,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) > } > ram_block_notify_add(new_block->host, new_block->max_length); > } > + trace_ram_block_add(new_block->host, new_block->max_length, > + memory_region_name(new_block->mr), > + new_block->mr->readonly ? "ro" : "rw"); > } > > #ifdef CONFIG_POSIX > diff --git a/hw/pci/msix.c b/hw/pci/msix.c > index 67e34f3..65a2882 100644 > --- a/hw/pci/msix.c > +++ b/hw/pci/msix.c > @@ -189,6 +189,7 @@ static void msix_table_mmio_write(void *opaque, hwaddr addr, > int vector = addr / PCI_MSIX_ENTRY_SIZE; > bool was_masked; > > + trace_msix_table_mmio_write(dev->name, addr, val, size); > was_masked = msix_is_masked(dev, vector); > pci_set_long(dev->msix_table + addr, val); > msix_handle_mask_update(dev, vector, was_masked); > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index de0fae1..1bc1533 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -1321,9 +1321,11 @@ static void pci_update_mappings(PCIDevice *d) > PCIIORegion *r; > int i; > pcibus_t new_addr; > + const char *name; > > for(i = 0; i < PCI_NUM_REGIONS; i++) { > r = &d->io_regions[i]; > + name = r->memory ? r->memory->name : ""; > > /* this region isn't registered */ > if (!r->size) > @@ -1337,18 +1339,18 @@ static void pci_update_mappings(PCIDevice *d) > > /* now do the real mapping */ > if (r->addr != PCI_BAR_UNMAPPED) { > - trace_pci_update_mappings_del(d, pci_dev_bus_num(d), > + trace_pci_update_mappings_del(d->name, d, pci_dev_bus_num(d), > PCI_SLOT(d->devfn), > PCI_FUNC(d->devfn), > - i, r->addr, r->size); > + i, r->addr, r->size, name); > memory_region_del_subregion(r->address_space, r->memory); > } > r->addr = new_addr; > if (r->addr != PCI_BAR_UNMAPPED) { > - trace_pci_update_mappings_add(d, pci_dev_bus_num(d), > + trace_pci_update_mappings_add(d->name, d, pci_dev_bus_num(d), > PCI_SLOT(d->devfn), > PCI_FUNC(d->devfn), > - i, r->addr, r->size); > + i, r->addr, r->size, name); > memory_region_add_subregion_overlap(r->address_space, > r->addr, r->memory, 1); > } > diff --git a/hw/pci/trace-events b/hw/pci/trace-events > index def4b39..56fc6c6 100644 > --- a/hw/pci/trace-events > +++ b/hw/pci/trace-events > @@ -1,8 +1,8 @@ > # See docs/devel/tracing.txt for syntax documentation. > > # pci.c > -pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 > -pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 > +pci_update_mappings_del(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" > +pci_update_mappings_add(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" > > # pci_host.c > pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" > @@ -10,3 +10,4 @@ pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, uns > > # msix.c > msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d" > +msix_table_mmio_write(char *name, uint64_t addr, uint64_t val, unsigned size) "%s, @ %"PRId64", val 0x%"PRIx64", len %d" > diff --git a/hw/vfio/common.c b/hw/vfio/common.c > index 3335714..50b8202 100644 > --- a/hw/vfio/common.c > +++ b/hw/vfio/common.c > @@ -299,6 +299,8 @@ static int vfio_dma_unmap(VFIOContainer *container, > .size = size, > }; > > + trace_vfio_dma_unmap(container->fd, iova, size); > + > while (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) { > /* > * The type1 backend has an off-by-one bug in the kernel (71a7d3d78e3c > @@ -336,6 +338,9 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova, > .size = size, > }; > > + trace_vfio_dma_map(container->fd, iova, size, vaddr, > + (readonly ? "r" : "rw")); > + > if (!readonly) { > map.flags |= VFIO_DMA_MAP_FLAG_WRITE; > } > @@ -976,7 +981,8 @@ int vfio_region_mmap(VFIORegion *region) > trace_vfio_region_mmap(memory_region_name(®ion->mmaps[i].mem), > region->mmaps[i].offset, > region->mmaps[i].offset + > - region->mmaps[i].size - 1); > + region->mmaps[i].size - 1, > + region->mmaps[i].mmap); > } > > return 0; > @@ -1639,6 +1645,9 @@ retry: > goto retry; > } > > + trace_vfio_region(vbasedev->name, index, (*info)->size, (*info)->offset, > + (*info)->cap_offset, (*info)->flags); > + > return 0; > } > > diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events > index b1ef55a..78a3cfa 100644 > --- a/hw/vfio/trace-events > +++ b/hw/vfio/trace-events > @@ -107,7 +107,7 @@ vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, > vfio_put_base_device(int fd) "close vdev->fd=%d" > vfio_region_setup(const char *dev, int index, const char *name, unsigned long flags, unsigned long offset, unsigned long size) "Device %s, region %d \"%s\", flags: 0x%lx, offset: 0x%lx, size: 0x%lx" > vfio_region_mmap_fault(const char *name, int index, unsigned long offset, unsigned long size, int fault) "Region %s mmaps[%d], [0x%lx - 0x%lx], fault: %d" > -vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Region %s [0x%lx - 0x%lx]" > +vfio_region_mmap(const char *name, unsigned long offset, unsigned long end, void *addr) "\"%s\" [0x%lx - 0x%lx] maps to %p" > vfio_region_exit(const char *name, int index) "Device %s, region %d" > vfio_region_finalize(const char *name, int index) "Device %s, region %d" > vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps enabled: %d" > @@ -115,6 +115,9 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic > vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" > vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8" > vfio_dma_unmap_overflow_workaround(void) "" > +vfio_dma_unmap(int fd, uint64_t iova, uint64_t size) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64 > +vfio_dma_map(int fd, uint64_t iova, uint64_t size, void *addr, const char *access) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64", va %p, %s" > +vfio_region(const char *name, int index, uint64_t size, uint64_t offset, int cap_offset, int flags) "%s [%d]: len 0x%"PRIx64" @ +0x%"PRIx64", cap +0x%x, flags 0x%x" > > # platform.c > vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d" > diff --git a/trace-events b/trace-events > index 42107eb..e05238a 100644 > --- a/trace-events > +++ b/trace-events > @@ -107,6 +107,8 @@ qmp_job_complete(void *job) "job %p" > qmp_job_finalize(void *job) "job %p" > qmp_job_dismiss(void *job) "job %p" > > +# exec.c > +ram_block_add(void *host, uint64_t maxlen, const char *name, const char *mode) "host=%p, maxlen=0x%"PRIx64", mr = {\"%s\", %s}" > > ### Guest events, keep at bottom > > -- > 1.8.3.1
diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c index 63ef6af..01d0561 100644 --- a/accel/kvm/kvm-all.c +++ b/accel/kvm/kvm-all.c @@ -46,6 +46,7 @@ #include "sysemu/reset.h" #include "hw/boards.h" +#include "trace-root.h" /* This check must be after config-host.h is included */ #ifdef CONFIG_EVENTFD @@ -1670,7 +1671,7 @@ int kvm_irqchip_add_msi_route(KVMState *s, int vector, PCIDevice *dev) } trace_kvm_irqchip_add_msi_route(dev ? dev->name : (char *)"N/A", - vector, virq); + vector, virq, msg.address, msg.data); kvm_add_routing_entry(s, &kroute); kvm_arch_add_msi_route_post(&kroute, vector, dev); @@ -1715,6 +1716,7 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, EventNotifier *resample, int virq, bool assign) { + int ret; int fd = event_notifier_get_fd(event); int rfd = resample ? event_notifier_get_fd(resample) : -1; @@ -1758,7 +1760,9 @@ static int kvm_irqchip_assign_irqfd(KVMState *s, EventNotifier *event, return -ENOSYS; } - return kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); + ret = kvm_vm_ioctl(s, KVM_IRQFD, &irqfd); + trace_kvm_irqchip_assign_irqfd(fd, virq, rfd, ret); + return ret; } int kvm_irqchip_add_adapter_route(KVMState *s, AdapterInfo *adapter) diff --git a/accel/kvm/trace-events b/accel/kvm/trace-events index a68eb66..c4ed199 100644 --- a/accel/kvm/trace-events +++ b/accel/kvm/trace-events @@ -9,7 +9,8 @@ kvm_device_ioctl(int fd, int type, void *arg) "dev fd %d, type 0x%x, arg %p" kvm_failed_reg_get(uint64_t id, const char *msg) "Warning: Unable to retrieve ONEREG %" PRIu64 " from KVM: %s" kvm_failed_reg_set(uint64_t id, const char *msg) "Warning: Unable to set ONEREG %" PRIu64 " to KVM: %s" kvm_irqchip_commit_routes(void) "" -kvm_irqchip_add_msi_route(char *name, int vector, int virq) "dev %s vector %d virq %d" +kvm_irqchip_add_msi_route(char *name, int vector, int virq, uint64_t addr, uint32_t data) "dev %s, vector %d, virq %d, msg {addr 0x%"PRIx64", data 0x%x}" +kvm_irqchip_assign_irqfd(int fd, int virq, int rfd, int status) "fd=%d, virq=%d, rfd=%d returns %d" kvm_irqchip_update_msi_route(int virq) "Updating MSI route virq=%d" kvm_irqchip_release_virq(int virq) "virq %d" kvm_set_ioeventfd_mmio(int fd, uint64_t addr, uint32_t val, bool assign, uint32_t size, bool datamatch) "fd: %d @0x%" PRIx64 " val=0x%x assign: %d size: %d match: %d" diff --git a/exec.c b/exec.c index 6f381f9..5d05154 100644 --- a/exec.c +++ b/exec.c @@ -2309,6 +2309,9 @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared) } ram_block_notify_add(new_block->host, new_block->max_length); } + trace_ram_block_add(new_block->host, new_block->max_length, + memory_region_name(new_block->mr), + new_block->mr->readonly ? "ro" : "rw"); } #ifdef CONFIG_POSIX diff --git a/hw/pci/msix.c b/hw/pci/msix.c index 67e34f3..65a2882 100644 --- a/hw/pci/msix.c +++ b/hw/pci/msix.c @@ -189,6 +189,7 @@ static void msix_table_mmio_write(void *opaque, hwaddr addr, int vector = addr / PCI_MSIX_ENTRY_SIZE; bool was_masked; + trace_msix_table_mmio_write(dev->name, addr, val, size); was_masked = msix_is_masked(dev, vector); pci_set_long(dev->msix_table + addr, val); msix_handle_mask_update(dev, vector, was_masked); diff --git a/hw/pci/pci.c b/hw/pci/pci.c index de0fae1..1bc1533 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1321,9 +1321,11 @@ static void pci_update_mappings(PCIDevice *d) PCIIORegion *r; int i; pcibus_t new_addr; + const char *name; for(i = 0; i < PCI_NUM_REGIONS; i++) { r = &d->io_regions[i]; + name = r->memory ? r->memory->name : ""; /* this region isn't registered */ if (!r->size) @@ -1337,18 +1339,18 @@ static void pci_update_mappings(PCIDevice *d) /* now do the real mapping */ if (r->addr != PCI_BAR_UNMAPPED) { - trace_pci_update_mappings_del(d, pci_dev_bus_num(d), + trace_pci_update_mappings_del(d->name, d, pci_dev_bus_num(d), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), - i, r->addr, r->size); + i, r->addr, r->size, name); memory_region_del_subregion(r->address_space, r->memory); } r->addr = new_addr; if (r->addr != PCI_BAR_UNMAPPED) { - trace_pci_update_mappings_add(d, pci_dev_bus_num(d), + trace_pci_update_mappings_add(d->name, d, pci_dev_bus_num(d), PCI_SLOT(d->devfn), PCI_FUNC(d->devfn), - i, r->addr, r->size); + i, r->addr, r->size, name); memory_region_add_subregion_overlap(r->address_space, r->addr, r->memory, 1); } diff --git a/hw/pci/trace-events b/hw/pci/trace-events index def4b39..56fc6c6 100644 --- a/hw/pci/trace-events +++ b/hw/pci/trace-events @@ -1,8 +1,8 @@ # See docs/devel/tracing.txt for syntax documentation. # pci.c -pci_update_mappings_del(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 -pci_update_mappings_add(void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size) "d=%p %02x:%02x.%x %d,0x%"PRIx64"+0x%"PRIx64 +pci_update_mappings_del(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" +pci_update_mappings_add(const char *dname, void *d, uint32_t bus, uint32_t slot, uint32_t func, int bar, uint64_t addr, uint64_t size, const char *name) "%s d=%p %02x:%02x.%x [%d] @ 0x%"PRIx64" len 0x%"PRIx64" \"%s\"" # pci_host.c pci_cfg_read(const char *dev, unsigned devid, unsigned fnid, unsigned offs, unsigned val) "%s %02u:%u @0x%x -> 0x%x" @@ -10,3 +10,4 @@ pci_cfg_write(const char *dev, unsigned devid, unsigned fnid, unsigned offs, uns # msix.c msix_write_config(char *name, bool enabled, bool masked) "dev %s enabled %d masked %d" +msix_table_mmio_write(char *name, uint64_t addr, uint64_t val, unsigned size) "%s, @ %"PRId64", val 0x%"PRIx64", len %d" diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 3335714..50b8202 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -299,6 +299,8 @@ static int vfio_dma_unmap(VFIOContainer *container, .size = size, }; + trace_vfio_dma_unmap(container->fd, iova, size); + while (ioctl(container->fd, VFIO_IOMMU_UNMAP_DMA, &unmap)) { /* * The type1 backend has an off-by-one bug in the kernel (71a7d3d78e3c @@ -336,6 +338,9 @@ static int vfio_dma_map(VFIOContainer *container, hwaddr iova, .size = size, }; + trace_vfio_dma_map(container->fd, iova, size, vaddr, + (readonly ? "r" : "rw")); + if (!readonly) { map.flags |= VFIO_DMA_MAP_FLAG_WRITE; } @@ -976,7 +981,8 @@ int vfio_region_mmap(VFIORegion *region) trace_vfio_region_mmap(memory_region_name(®ion->mmaps[i].mem), region->mmaps[i].offset, region->mmaps[i].offset + - region->mmaps[i].size - 1); + region->mmaps[i].size - 1, + region->mmaps[i].mmap); } return 0; @@ -1639,6 +1645,9 @@ retry: goto retry; } + trace_vfio_region(vbasedev->name, index, (*info)->size, (*info)->offset, + (*info)->cap_offset, (*info)->flags); + return 0; } diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events index b1ef55a..78a3cfa 100644 --- a/hw/vfio/trace-events +++ b/hw/vfio/trace-events @@ -107,7 +107,7 @@ vfio_get_device(const char * name, unsigned int flags, unsigned int num_regions, vfio_put_base_device(int fd) "close vdev->fd=%d" vfio_region_setup(const char *dev, int index, const char *name, unsigned long flags, unsigned long offset, unsigned long size) "Device %s, region %d \"%s\", flags: 0x%lx, offset: 0x%lx, size: 0x%lx" vfio_region_mmap_fault(const char *name, int index, unsigned long offset, unsigned long size, int fault) "Region %s mmaps[%d], [0x%lx - 0x%lx], fault: %d" -vfio_region_mmap(const char *name, unsigned long offset, unsigned long end) "Region %s [0x%lx - 0x%lx]" +vfio_region_mmap(const char *name, unsigned long offset, unsigned long end, void *addr) "\"%s\" [0x%lx - 0x%lx] maps to %p" vfio_region_exit(const char *name, int index) "Device %s, region %d" vfio_region_finalize(const char *name, int index) "Device %s, region %d" vfio_region_mmaps_set_enabled(const char *name, bool enabled) "Region %s mmaps enabled: %d" @@ -115,6 +115,9 @@ vfio_region_sparse_mmap_header(const char *name, int index, int nr_areas) "Devic vfio_region_sparse_mmap_entry(int i, unsigned long start, unsigned long end) "sparse entry %d [0x%lx - 0x%lx]" vfio_get_dev_region(const char *name, int index, uint32_t type, uint32_t subtype) "%s index %d, %08x/%0x8" vfio_dma_unmap_overflow_workaround(void) "" +vfio_dma_unmap(int fd, uint64_t iova, uint64_t size) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64 +vfio_dma_map(int fd, uint64_t iova, uint64_t size, void *addr, const char *access) "fd %d, iova 0x%"PRIx64", len 0x%"PRIx64", va %p, %s" +vfio_region(const char *name, int index, uint64_t size, uint64_t offset, int cap_offset, int flags) "%s [%d]: len 0x%"PRIx64" @ +0x%"PRIx64", cap +0x%x, flags 0x%x" # platform.c vfio_platform_base_device_init(char *name, int groupid) "%s belongs to group #%d" diff --git a/trace-events b/trace-events index 42107eb..e05238a 100644 --- a/trace-events +++ b/trace-events @@ -107,6 +107,8 @@ qmp_job_complete(void *job) "job %p" qmp_job_finalize(void *job) "job %p" qmp_job_dismiss(void *job) "job %p" +# exec.c +ram_block_add(void *host, uint64_t maxlen, const char *name, const char *mode) "host=%p, maxlen=0x%"PRIx64", mr = {\"%s\", %s}" ### Guest events, keep at bottom
Print more info for existing trace points: trace_kvm_irqchip_add_msi_route trace_pci_update_mappings_del trace_pci_update_mappings_add Add new trace points: trace_kvm_irqchip_assign_irqfd trace_msix_table_mmio_write trace_vfio_dma_unmap trace_vfio_dma_map trace_vfio_region trace_vfio_region_mmap trace_ram_block_add Sample output: (timestamps deleted for clarity) ram_block_add host=0x7f4497e00000, maxlen=0x40000000, mr = {"pc.ram", rw} vfio_region 0000:3a:10.0 [3]: len 0x4000 @ +0x30000000000, cap +0x20, flags 0xf vfio_region_mmap "0000:3a:10.0 BAR 0 mmaps[0]" [0x0 - 0x3fff] maps to 0x7f44e3eb9000 msix_table_mmio_write vfio-pci, @ 16, val 0xfee01004, len 4 kvm_irqchip_add_msi_route dev vfio-pci, vector 1, virq 25, msg {addr 0xfee01004, data 0x40b1} kvm_irqchip_assign_irqfd fd=164, virq=25, rfd=-1 returns 0 vfio_dma_map fd 24, iova 0xa0000, len 0x10000, va 0x7f4495800000, rw vfio_dma_unmap fd 24, iova 0xfebf5000, len 0x3000 pci_update_mappings_add vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" pci_update_mappings_del vfio-pci d=0x563d101e7050 00:07.0 [3] @ 0xfebf4000 len 0x4000 "0000:3a:10.0 base BAR 3" Signed-off-by: Steve Sistare <steven.sistare@oracle.com> --- accel/kvm/kvm-all.c | 8 ++++++-- accel/kvm/trace-events | 3 ++- exec.c | 3 +++ hw/pci/msix.c | 1 + hw/pci/pci.c | 10 ++++++---- hw/pci/trace-events | 5 +++-- hw/vfio/common.c | 11 ++++++++++- hw/vfio/trace-events | 5 ++++- trace-events | 2 ++ 9 files changed, 37 insertions(+), 11 deletions(-)