On Mon, Jul 10, 2023 at 5:19 AM Jason Wang <[email protected]> wrote:
>
> On Fri, Jul 7, 2023 at 3:12 AM Eugenio Pérez <[email protected]> wrote:
> >
> > The vhost-vdpa net backend needs to enable vrings in a different order
> > than default, so export it.
> >
> > No functional change intended except for tracing, that now includes the
> > (virtio) index being enabled and the return value of the ioctl.
> >
> > Still ignoring return value of this function if called from
> > vhost_vdpa_dev_start, as reorganize calling code around it is out of
> > the scope of this series.
> >
> > Signed-off-by: Eugenio Pérez <[email protected]>
> > ---
> > include/hw/virtio/vhost-vdpa.h | 1 +
> > hw/virtio/vhost-vdpa.c | 28 ++++++++++++++++++++--------
> > hw/virtio/trace-events | 2 +-
> > 3 files changed, 22 insertions(+), 9 deletions(-)
> >
> > diff --git a/include/hw/virtio/vhost-vdpa.h b/include/hw/virtio/vhost-vdpa.h
> > index e64bfc7f98..5407d54fd7 100644
> > --- a/include/hw/virtio/vhost-vdpa.h
> > +++ b/include/hw/virtio/vhost-vdpa.h
> > @@ -57,6 +57,7 @@ typedef struct vhost_vdpa {
> > } VhostVDPA;
> >
> > int vhost_vdpa_get_iova_range(int fd, struct vhost_vdpa_iova_range
> > *iova_range);
> > +int vhost_vdpa_set_vring_ready(struct vhost_vdpa *v, unsigned idx);
> >
> > int vhost_vdpa_dma_map(struct vhost_vdpa *v, uint32_t asid, hwaddr iova,
> > hwaddr size, void *vaddr, bool readonly);
> > diff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c
> > index 3c575a9a6e..5978d970ee 100644
> > --- a/hw/virtio/vhost-vdpa.c
> > +++ b/hw/virtio/vhost-vdpa.c
> > @@ -528,6 +528,19 @@ int vhost_vdpa_get_iova_range(int fd, struct
> > vhost_vdpa_iova_range *iova_range)
> > return ret < 0 ? -errno : 0;
> > }
> >
> > +int vhost_vdpa_set_vring_ready(struct vhost_vdpa *v, unsigned idx)
> > +{
> > + struct vhost_dev *dev = v->dev;
> > + struct vhost_vring_state state = {
> > + .index = idx,
> > + .num = 1,
> > + };
> > + int r = vhost_vdpa_call(dev, VHOST_VDPA_SET_VRING_ENABLE, &state);
> > +
> > + trace_vhost_vdpa_set_vring_ready(dev, idx, r);
> > + return r;
> > +}
> > +
> > /*
> > * The use of this function is for requests that only need to be
> > * applied once. Typically such request occurs at the beginning
> > @@ -872,16 +885,15 @@ static int vhost_vdpa_get_vq_index(struct vhost_dev
> > *dev, int idx)
> > return idx;
> > }
> >
> > -static int vhost_vdpa_set_vring_ready(struct vhost_dev *dev)
> > +static int vhost_vdpa_set_vrings_ready(struct vhost_dev *dev)
> > {
> > + struct vhost_vdpa *v = dev->opaque;
> > int i;
> > - trace_vhost_vdpa_set_vring_ready(dev);
> > +
> > + assert(dev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_VDPA);
>
> Nit: any reason we need to add this assert in this patch?
>
Other vhost_ops asserts, but sure we can leave it out.
Thanks!
> Thanks
>
> > +
> > for (i = 0; i < dev->nvqs; ++i) {
> > - struct vhost_vring_state state = {
> > - .index = dev->vq_index + i,
> > - .num = 1,
> > - };
> > - vhost_vdpa_call(dev, VHOST_VDPA_SET_VRING_ENABLE, &state);
> > + vhost_vdpa_set_vring_ready(v, dev->vq_index + i);
> > }
> > return 0;
> > }
> > @@ -1294,7 +1306,7 @@ static int vhost_vdpa_dev_start(struct vhost_dev
> > *dev, bool started)
> > if (unlikely(!ok)) {
> > return -1;
> > }
> > - vhost_vdpa_set_vring_ready(dev);
> > + vhost_vdpa_set_vrings_ready(dev);
> > } else {
> > vhost_vdpa_suspend(dev);
> > vhost_vdpa_svqs_stop(dev);
> > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events
> > index 8f8d05cf9b..4f6a6ba428 100644
> > --- a/hw/virtio/trace-events
> > +++ b/hw/virtio/trace-events
> > @@ -46,7 +46,7 @@ vhost_vdpa_set_features(void *dev, uint64_t features)
> > "dev: %p features: 0x%"PRI
> > vhost_vdpa_get_device_id(void *dev, uint32_t device_id) "dev: %p device_id
> > %"PRIu32
> > vhost_vdpa_reset_device(void *dev, uint8_t status) "dev: %p status:
> > 0x%"PRIx8
> > vhost_vdpa_get_vq_index(void *dev, int idx, int vq_idx) "dev: %p idx: %d
> > vq idx: %d"
> > -vhost_vdpa_set_vring_ready(void *dev) "dev: %p"
> > +vhost_vdpa_set_vring_ready(void *dev, unsigned i, int r) "dev: %p, idx:
> > %u, r: %d"
> > vhost_vdpa_dump_config(void *dev, const char *line) "dev: %p %s"
> > vhost_vdpa_set_config(void *dev, uint32_t offset, uint32_t size, uint32_t
> > flags) "dev: %p offset: %"PRIu32" size: %"PRIu32" flags: 0x%"PRIx32
> > vhost_vdpa_get_config(void *dev, void *config, uint32_t config_len) "dev:
> > %p config: %p config_len: %"PRIu32
> > --
> > 2.39.3
> >
>
