| Message ID | 20210602034750.23377-6-lulu@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | vhost-vdpa: add support for configure interrupt | expand |
在 2021/6/2 上午11:47, Cindy Lu 写道: > Add new call back function in vhost-vdpa, this call back function only > supported in vhost-vdpa backend > > Signed-off-by: Cindy Lu <lulu@redhat.com> > --- > hw/virtio/trace-events | 2 ++ > hw/virtio/vhost-vdpa.c | 7 +++++++ > 2 files changed, 9 insertions(+) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index c62727f879..60a15f0186 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -52,6 +52,8 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index: > vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64 > vhost_vdpa_set_owner(void *dev) "dev: %p" > vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64 > +vhost_vdpa_set_config_call(void *dev, int *fd)"dev: %p fd: %p" This tracing information is sub-optimal, I think we should show the fd instead of its address here. Other looks good. Thanks > + > > # virtio.c > virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u" > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > index 01d2101d09..9ba2a2bed4 100644 > --- a/hw/virtio/vhost-vdpa.c > +++ b/hw/virtio/vhost-vdpa.c > @@ -545,6 +545,12 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev, > trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd); > return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file); > } > +static int vhost_vdpa_set_config_call(struct vhost_dev *dev, > + int *fd) > +{ > + trace_vhost_vdpa_set_config_call(dev, fd); > + return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, fd); > +} > > static int vhost_vdpa_get_features(struct vhost_dev *dev, > uint64_t *features) > @@ -611,4 +617,5 @@ const VhostOps vdpa_ops = { > .vhost_get_device_id = vhost_vdpa_get_device_id, > .vhost_vq_get_addr = vhost_vdpa_vq_get_addr, > .vhost_force_iommu = vhost_vdpa_force_iommu, > + .vhost_set_config_call = vhost_vdpa_set_config_call, > };
On Thu, Jun 3, 2021 at 2:06 PM Jason Wang <jasowang@redhat.com> wrote: > > > 在 2021/6/2 上午11:47, Cindy Lu 写道: > > Add new call back function in vhost-vdpa, this call back function only > > supported in vhost-vdpa backend > > > > Signed-off-by: Cindy Lu <lulu@redhat.com> > > --- > > hw/virtio/trace-events | 2 ++ > > hw/virtio/vhost-vdpa.c | 7 +++++++ > > 2 files changed, 9 insertions(+) > > > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > > index c62727f879..60a15f0186 100644 > > --- a/hw/virtio/trace-events > > +++ b/hw/virtio/trace-events > > @@ -52,6 +52,8 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index: > > vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64 > > vhost_vdpa_set_owner(void *dev) "dev: %p" > > vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64 > > +vhost_vdpa_set_config_call(void *dev, int *fd)"dev: %p fd: %p" > > > This tracing information is sub-optimal, I think we should show the fd > instead of its address here. > > Other looks good. > > Thanks > > sure, I will fix this > > + > > > > # virtio.c > > virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u" > > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c > > index 01d2101d09..9ba2a2bed4 100644 > > --- a/hw/virtio/vhost-vdpa.c > > +++ b/hw/virtio/vhost-vdpa.c > > @@ -545,6 +545,12 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev, > > trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd); > > return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file); > > } > > +static int vhost_vdpa_set_config_call(struct vhost_dev *dev, > > + int *fd) > > +{ > > + trace_vhost_vdpa_set_config_call(dev, fd); > > + return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, fd); > > +} > > > > static int vhost_vdpa_get_features(struct vhost_dev *dev, > > uint64_t *features) > > @@ -611,4 +617,5 @@ const VhostOps vdpa_ops = { > > .vhost_get_device_id = vhost_vdpa_get_device_id, > > .vhost_vq_get_addr = vhost_vdpa_vq_get_addr, > > .vhost_force_iommu = vhost_vdpa_force_iommu, > > + .vhost_set_config_call = vhost_vdpa_set_config_call, > > }; >
diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events index c62727f879..60a15f0186 100644 --- a/hw/virtio/trace-events +++ b/hw/virtio/trace-events @@ -52,6 +52,8 @@ vhost_vdpa_set_vring_call(void *dev, unsigned int index, int fd) "dev: %p index: vhost_vdpa_get_features(void *dev, uint64_t features) "dev: %p features: 0x%"PRIx64 vhost_vdpa_set_owner(void *dev) "dev: %p" vhost_vdpa_vq_get_addr(void *dev, void *vq, uint64_t desc_user_addr, uint64_t avail_user_addr, uint64_t used_user_addr) "dev: %p vq: %p desc_user_addr: 0x%"PRIx64" avail_user_addr: 0x%"PRIx64" used_user_addr: 0x%"PRIx64 +vhost_vdpa_set_config_call(void *dev, int *fd)"dev: %p fd: %p" + # virtio.c virtqueue_alloc_element(void *elem, size_t sz, unsigned in_num, unsigned out_num) "elem %p size %zd in_num %u out_num %u" diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c index 01d2101d09..9ba2a2bed4 100644 --- a/hw/virtio/vhost-vdpa.c +++ b/hw/virtio/vhost-vdpa.c @@ -545,6 +545,12 @@ static int vhost_vdpa_set_vring_call(struct vhost_dev *dev, trace_vhost_vdpa_set_vring_call(dev, file->index, file->fd); return vhost_vdpa_call(dev, VHOST_SET_VRING_CALL, file); } +static int vhost_vdpa_set_config_call(struct vhost_dev *dev, + int *fd) +{ + trace_vhost_vdpa_set_config_call(dev, fd); + return vhost_vdpa_call(dev, VHOST_VDPA_SET_CONFIG_CALL, fd); +} static int vhost_vdpa_get_features(struct vhost_dev *dev, uint64_t *features) @@ -611,4 +617,5 @@ const VhostOps vdpa_ops = { .vhost_get_device_id = vhost_vdpa_get_device_id, .vhost_vq_get_addr = vhost_vdpa_vq_get_addr, .vhost_force_iommu = vhost_vdpa_force_iommu, + .vhost_set_config_call = vhost_vdpa_set_config_call, };
Add new call back function in vhost-vdpa, this call back function only supported in vhost-vdpa backend Signed-off-by: Cindy Lu <lulu@redhat.com> --- hw/virtio/trace-events | 2 ++ hw/virtio/vhost-vdpa.c | 7 +++++++ 2 files changed, 9 insertions(+)