Re: [PATCH 37/40] vdpa: add vhost_vdpa_set_dev_vring_base trace for svq mode

[Jason Wang]

On Fri, Dec 8, 2023 at 2:51 AM Si-Wei Liu  wrote:
>
> For better debuggability and observability.
>
> Signed-off-by: Si-Wei Liu 

Acked-by: Jason Wang 

Thanks

Re: [PATCH 37/40] vdpa: add vhost_vdpa_set_dev_vring_base trace for svq mode

[Eugenio Perez Martin]

On Thu, Dec 7, 2023 at 7:51 PM Si-Wei Liu  wrote:
>
> For better debuggability and observability.
>
> Signed-off-by: Si-Wei Liu 

Reviewed-by: Eugenio Pérez 

> ---
>  hw/virtio/trace-events | 2 +-
>  hw/virtio/vhost-vdpa.c | 5 -
>  2 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
> index a8d3321..5085607 100644
> --- a/hw/virtio/trace-events
> +++ b/hw/virtio/trace-events
> @@ -57,7 +57,7 @@ vhost_vdpa_dev_start(void *dev, bool started) "dev: %p 
> started: %d"
>  vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, 
> int refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: 
> %d fd: %d log: %p"
>  vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, 
> uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, 
> uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 
> 0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" 
> log_guest_addr: 0x%"PRIx64
>  vhost_vdpa_set_vring_num(void *dev, unsigned int index, unsigned int num) 
> "dev: %p index: %u num: %u"
> -vhost_vdpa_set_vring_base(void *dev, unsigned int index, unsigned int num) 
> "dev: %p index: %u num: %u"
> +vhost_vdpa_set_dev_vring_base(void *dev, unsigned int index, unsigned int 
> num, bool svq) "dev: %p index: %u num: %u svq: %d"
>  vhost_vdpa_get_vring_base(void *dev, unsigned int index, unsigned int num, 
> bool svq) "dev: %p index: %u num: %u svq: %d"
>  vhost_vdpa_set_vring_kick(void *dev, unsigned int index, int fd) "dev: %p 
> index: %u fd: %d"
>  vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p 
> index: %u fd: %d"
> diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> index d66936f..ff4f218 100644
> --- a/hw/virtio/vhost-vdpa.c
> +++ b/hw/virtio/vhost-vdpa.c
> @@ -1043,7 +1043,10 @@ static int vhost_vdpa_get_config(struct vhost_dev 
> *dev, uint8_t *config,
>  static int vhost_vdpa_set_dev_vring_base(struct vhost_dev *dev,
>   struct vhost_vring_state *ring)
>  {
> -trace_vhost_vdpa_set_vring_base(dev, ring->index, ring->num);
> +struct vhost_vdpa *v = dev->opaque;
> +
> +trace_vhost_vdpa_set_dev_vring_base(dev, ring->index, ring->num,
> +v->shadow_vqs_enabled);
>  return vhost_vdpa_call(dev, VHOST_SET_VRING_BASE, ring);
>  }
>
> --
> 1.8.3.1
>

[PATCH 37/40] vdpa: add vhost_vdpa_set_dev_vring_base trace for svq mode

[Si-Wei Liu]

For better debuggability and observability.

Signed-off-by: Si-Wei Liu 
---
 hw/virtio/trace-events | 2 +-
 hw/virtio/vhost-vdpa.c | 5 -
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
index a8d3321..5085607 100644
--- a/hw/virtio/trace-events
+++ b/hw/virtio/trace-events
@@ -57,7 +57,7 @@ vhost_vdpa_dev_start(void *dev, bool started) "dev: %p 
started: %d"
 vhost_vdpa_set_log_base(void *dev, uint64_t base, unsigned long long size, int 
refcnt, int fd, void *log) "dev: %p base: 0x%"PRIx64" size: %llu refcnt: %d fd: 
%d log: %p"
 vhost_vdpa_set_vring_addr(void *dev, unsigned int index, unsigned int flags, 
uint64_t desc_user_addr, uint64_t used_user_addr, uint64_t avail_user_addr, 
uint64_t log_guest_addr) "dev: %p index: %u flags: 0x%x desc_user_addr: 
0x%"PRIx64" used_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" 
log_guest_addr: 0x%"PRIx64
 vhost_vdpa_set_vring_num(void *dev, unsigned int index, unsigned int num) 
"dev: %p index: %u num: %u"
-vhost_vdpa_set_vring_base(void *dev, unsigned int index, unsigned int num) 
"dev: %p index: %u num: %u"
+vhost_vdpa_set_dev_vring_base(void *dev, unsigned int index, unsigned int num, 
bool svq) "dev: %p index: %u num: %u svq: %d"
 vhost_vdpa_get_vring_base(void *dev, unsigned int index, unsigned int num, 
bool svq) "dev: %p index: %u num: %u svq: %d"
 vhost_vdpa_set_vring_kick(void *dev, unsigned int index, int fd) "dev: %p 
index: %u fd: %d"
 vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p 
index: %u fd: %d"
diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
index d66936f..ff4f218 100644
--- a/hw/virtio/vhost-vdpa.c
+++ b/hw/virtio/vhost-vdpa.c
@@ -1043,7 +1043,10 @@ static int vhost_vdpa_get_config(struct vhost_dev *dev, 
uint8_t *config,
 static int vhost_vdpa_set_dev_vring_base(struct vhost_dev *dev,
  struct vhost_vring_state *ring)
 {
-trace_vhost_vdpa_set_vring_base(dev, ring->index, ring->num);
+struct vhost_vdpa *v = dev->opaque;
+
+trace_vhost_vdpa_set_dev_vring_base(dev, ring->index, ring->num,
+v->shadow_vqs_enabled);
 return vhost_vdpa_call(dev, VHOST_SET_VRING_BASE, ring);
 }
 
-- 
1.8.3.1