vdpa: Add missing tracing to batch mapping functions
PATCH 1/1 vdpa: Add missing tracing to batch mapping functions
These functions were not traced properly.
--- hw/virtio/vhost-vdpa.c | 2 ++ hw/virtio/trace-events | 2 ++ 2 files changed, 4 insertions(+)
hw/virtio/vhost-vdpa.c +2 -0
@@ -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));
hw/virtio/trace-events +2 -0
@@ -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
Quoted 42 lines · Eugenio Pérez
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(+)hw/virtio/vhost-vdpa.c +2
-0@@ -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));hw/virtio/trace-events +2
-1@@ -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 --
Quoted 2 lines
2.27.0
Quoted 7 lines · Eugenio Pérez
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(+)
Quoted 38 lines
hw/virtio/vhost-vdpa.c +2
-0@@ -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));hw/virtio/trace-events +0
-0@@ -25,6 +25,8 @@ vhost_user_postcopy_waker_nomatch(const char *rb, uint64_t rb_offset) "%s + 0x%" # vhost-vdpa.cvhost_vdpa_dma_map(void *vdpa, int fd,
uint32_tmsg_type,uint64_tiova,uint64_tsize,uint64_tuaddr,uint8_tperm,uint8_ttype) "vdpa:%p fd: %dmsg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" uaddr: 0x%"PRIx64" perm: 0x%"PRIx8" type: %"PRIu8vhost_vdpa_dma_unmap(void *vdpa, int fd, uint32_t msg_type, uint64_t iova, uint64_t size, uint8_t type)"vdpa:%p fd: %dmsg_type: %"PRIu32" iova: 0x%"PRIx64" size: 0x%"PRIx64" type: %"PRIu8hw/virtio/trace-events +2
-0+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%"PRIx64vhost_vdpa_add_status(void *dev, uint8_t status)"dev: %p status: 0x%"PRIx8
--
2.27.0
Quoted 3 lines · Eugenio Pérez
These functions were not traced properly.
Signed-off-by Eugenio Pérez <[email protected]>
Quoted 41 lines
--- hw/virtio/vhost-vdpa.c | 2 ++ hw/virtio/trace-events | 2 ++ 2 files changed, 4 insertions(+)hw/virtio/vhost-vdpa.c +2
-0@@ -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));hw/virtio/trace-events +2
-1@@ -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
Laurent Vivier
AppliedLe 05/04/2022 à 08:36, Eugenio Pérez a écrit :
Quoted 42 lines
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(+)hw/virtio/vhost-vdpa.c +2
-0@@ -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));hw/virtio/trace-events +2
-1@@ -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 --
Quoted 3 lines
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,
Laurent
Quoted 50 lines · Laurent Vivier
Quoted 42 lines · Eugenio Pérez
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(+)hw/virtio/vhost-vdpa.c +2
-0@@ -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));hw/virtio/trace-events +2
-1@@ -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 --Quoted 3 lines
2.27.0
Applied to my trivial-patches branch.
Quoted 3 lines
(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.
Quoted 5 lines
Thanks,
Laurent