On Tue, Apr 26, 2022 at 12:40 PM Laurent Vivier <[email protected]> wrote: > > Le 05/04/2022 à 08:36, Eugenio Pérez a écrit : > > These functions were not traced properly. > > > > Signed-off-by: Eugenio Pérez <[email protected]> > > --- > > hw/virtio/vhost-vdpa.c | 2 ++ > > hw/virtio/trace-events | 2 ++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > > index 8adf7c0b92..9e5fe15d03 100644 > > --- a/hw/virtio/vhost-vdpa.c > > +++ b/hw/virtio/vhost-vdpa.c > > @@ -129,6 +129,7 @@ static void vhost_vdpa_listener_begin_batch(struct > > vhost_vdpa *v) > > .iotlb.type = VHOST_IOTLB_BATCH_BEGIN, > > }; > > > > + trace_vhost_vdpa_listener_begin_batch(v, fd, msg.type, msg.iotlb.type); > > if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) { > > error_report("failed to write, fd=%d, errno=%d (%s)", > > fd, errno, strerror(errno)); > > @@ -163,6 +164,7 @@ static void vhost_vdpa_listener_commit(MemoryListener > > *listener) > > msg.type = v->msg_type; > > msg.iotlb.type = VHOST_IOTLB_BATCH_END; > > > > + trace_vhost_vdpa_listener_commit(v, fd, msg.type, msg.iotlb.type); > > if (write(fd, &msg, sizeof(msg)) != sizeof(msg)) { > > error_report("failed to write, fd=%d, errno=%d (%s)", > > fd, errno, strerror(errno)); > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > > index a5102eac9e..333348d9d5 100644 > > --- a/hw/virtio/trace-events > > +++ b/hw/virtio/trace-events > > @@ -25,6 +25,8 @@ vhost_user_postcopy_waker_nomatch(const char *rb, > > uint64_t rb_offset) "%s + 0x%" > > # vhost-vdpa.c > > vhost_vdpa_dma_map(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, > > uint64_t size, uint64_t uaddr, uint8_t perm, uint8_t type) "vdpa:%p fd: %d > > msg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" > > perm: 0x%"PRIx8" type: %"PRIu8 > > vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t > > iova, uint64_t size, uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" > > iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8 > > +vhost_vdpa_listener_begin_batch(void *v, int fd, uint32_t msg_type, > > uint8_t type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 > > +vhost_vdpa_listener_commit(void *v, int fd, uint32_t msg_type, uint8_t > > type) "vdpa:%p fd: %d msg_type: %"PRIu32" type: %"PRIu8 > > vhost_vdpa_listener_region_add(void *vdpa, uint64_t iova, uint64_t llend, > > void *vaddr, bool readonly) "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64" > > vaddr: %p read-only: %d" > > vhost_vdpa_listener_region_del(void *vdpa, uint64_t iova, uint64_t llend) > > "vdpa: %p iova 0x%"PRIx64" llend 0x%"PRIx64 > > vhost_vdpa_add_status(void *dev, uint8_t status) "dev: %p status: > > 0x%"PRIx8 > > -- > > 2.27.0 > > > > > > Applied to my trivial-patches branch. > > (I know you have an (identicial) v7 of this patch in a series, but as this > one is reviewed, acked > and sent to trivial I've merged it). >
Thanks! The v7 is about the series as a whole, not only about this patch, so everything is right. > > Thanks, > Laurent > >
