Hi, On 3/8/22 13:35, Xuan Zhuo wrote: > find_vqs() adds a new parameter sizes to specify the size of each vq > vring. > > 0 means use the maximum size supported by the backend. > > In the split scenario, the meaning of size is the largest size, because > it may be limited by memory, the virtio core will try a smaller size. > And the size is power of 2. > > Signed-off-by: Xuan Zhuo <xuanzhuo@xxxxxxxxxxxxxxxxx> > --- > arch/um/drivers/virtio_uml.c | 2 +- > drivers/platform/mellanox/mlxbf-tmfifo.c | 3 ++- > drivers/remoteproc/remoteproc_virtio.c | 2 +- > drivers/s390/virtio/virtio_ccw.c | 2 +- > drivers/virtio/virtio_mmio.c | 2 +- > drivers/virtio/virtio_pci_common.c | 2 +- > drivers/virtio/virtio_pci_common.h | 2 +- > drivers/virtio/virtio_pci_modern.c | 5 +++-- > drivers/virtio/virtio_vdpa.c | 2 +- > include/linux/virtio_config.h | 11 +++++++---- > 10 files changed, 19 insertions(+), 14 deletions(-) I assume this will be merged through the virtio tree, here is my ack for merging the drivers/platform/mellanox/ part through the virtio tree: Acked-by: Hans de Goede <hdegoede@xxxxxxxxxx> Regards, Hans > > diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c > index ba562d68dc04..055b91ccbe8a 100644 > --- a/arch/um/drivers/virtio_uml.c > +++ b/arch/um/drivers/virtio_uml.c > @@ -998,7 +998,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev, > static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev); > int i, queue_idx = 0, rc; > diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c > index 38800e86ed8a..aea7aa218b22 100644 > --- a/drivers/platform/mellanox/mlxbf-tmfifo.c > +++ b/drivers/platform/mellanox/mlxbf-tmfifo.c > @@ -929,7 +929,8 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, > + u32 sizes[]) > { > struct mlxbf_tmfifo_vdev *tm_vdev = mlxbf_vdev_to_tmfifo(vdev); > struct mlxbf_tmfifo_vring *vring; > diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c > index 70ab496d0431..3a167bec5b09 100644 > --- a/drivers/remoteproc/remoteproc_virtio.c > +++ b/drivers/remoteproc/remoteproc_virtio.c > @@ -157,7 +157,7 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool * ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > int i, ret, queue_idx = 0; > > diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c > index d35e7a3f7067..b74e08c71534 100644 > --- a/drivers/s390/virtio/virtio_ccw.c > +++ b/drivers/s390/virtio/virtio_ccw.c > @@ -632,7 +632,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_ccw_device *vcdev = to_vc_device(vdev); > unsigned long *indicatorp = NULL; > diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c > index a41abc8051b9..55d575f6ef2d 100644 > --- a/drivers/virtio/virtio_mmio.c > +++ b/drivers/virtio/virtio_mmio.c > @@ -462,7 +462,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); > int irq = platform_get_irq(vm_dev->pdev, 0); > diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c > index 863d3a8a0956..8e8fa7e5ad80 100644 > --- a/drivers/virtio/virtio_pci_common.c > +++ b/drivers/virtio/virtio_pci_common.c > @@ -428,7 +428,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned nvqs, > int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > int err; > > diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h > index 23f6c5c678d5..9dbf1d555dff 100644 > --- a/drivers/virtio/virtio_pci_common.h > +++ b/drivers/virtio/virtio_pci_common.h > @@ -114,7 +114,7 @@ void vp_del_vqs(struct virtio_device *vdev); > int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc); > + struct irq_affinity *desc, u32 sizes[]); > const char *vp_bus_name(struct virtio_device *vdev); > > /* Setup the affinity for a virtqueue: > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 3c67d3607802..342795175c29 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -343,11 +343,12 @@ static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], > vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_pci_device *vp_dev = to_vp_device(vdev); > struct virtqueue *vq; > - int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, desc); > + int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, desc, > + sizes); > > if (rc) > return rc; > diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c > index 7767a7f0119b..ee08d01ee8b1 100644 > --- a/drivers/virtio/virtio_vdpa.c > +++ b/drivers/virtio/virtio_vdpa.c > @@ -268,7 +268,7 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev); > struct vdpa_device *vdpa = vd_get_vdpa(vdev); > diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h > index 0b81fbe17c85..5157524d8036 100644 > --- a/include/linux/virtio_config.h > +++ b/include/linux/virtio_config.h > @@ -57,6 +57,7 @@ struct virtio_shm_region { > * include a NULL entry for vqs that do not need a callback > * names: array of virtqueue names (mainly for debugging) > * include a NULL entry for vqs unused by driver > + * sizes: array of virtqueue sizes > * Returns 0 on success or error status > * @del_vqs: free virtqueues found by find_vqs(). > * @get_features: get the array of feature bits for this device. > @@ -98,7 +99,8 @@ struct virtio_config_ops { > int (*find_vqs)(struct virtio_device *, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc); > + struct irq_affinity *desc, > + u32 sizes[]); > void (*del_vqs)(struct virtio_device *); > u64 (*get_features)(struct virtio_device *vdev); > int (*finalize_features)(struct virtio_device *vdev); > @@ -205,7 +207,7 @@ struct virtqueue *virtio_find_single_vq(struct virtio_device *vdev, > const char *names[] = { n }; > struct virtqueue *vq; > int err = vdev->config->find_vqs(vdev, 1, &vq, callbacks, names, NULL, > - NULL); > + NULL, NULL); > if (err < 0) > return ERR_PTR(err); > return vq; > @@ -217,7 +219,8 @@ int virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs, > const char * const names[], > struct irq_affinity *desc) > { > - return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, desc); > + return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, > + desc, NULL); > } > > static inline > @@ -227,7 +230,7 @@ int virtio_find_vqs_ctx(struct virtio_device *vdev, unsigned nvqs, > struct irq_affinity *desc) > { > return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, > - desc); > + desc, NULL); > } > > /**