From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: Jason Wang <jasowang@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>,
Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Hans de Goede <hdegoede@redhat.com>,
Mark Gross <markgross@kernel.org>,
Vadim Pasternak <vadimp@nvidia.com>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Cornelia Huck <cohuck@redhat.com>,
Halil Pasic <pasic@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Sven Schnelle <svens@linux.ibm.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Jesper Dangaard Brouer <hawk@kernel.org>,
John Fastabend <john.fastabend@gmail.com>,
Johannes Berg <johannes.berg@intel.com>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
linux-um@lists.infradead.org,
platform-driver-x86@vger.kernel.org,
linux-remoteproc@vger.kernel.org, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, bpf@vger.kernel.org,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: Re: [PATCH v7 18/26] virtio: find_vqs() add arg sizes
Date: Wed, 9 Mar 2022 17:34:32 +0800 [thread overview]
Message-ID: <1646818472.5069678-10-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <0fb55c37-69a6-a700-504b-e8d78b86fed4@redhat.com>
On Wed, 9 Mar 2022 16:59:32 +0800, Jason Wang <jasowang@redhat.com> wrote:
>
> 在 2022/3/8 下午8:35, Xuan Zhuo 写道:
> > 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@linux.alibaba.com>
> > ---
> > 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(-)
> >
> > 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[],
>
>
> Nit: Let's be consistent here, e.g move sizes before ctx (this is what
> next patch did and seems cleaner).
OK.
Thanks.
>
> Thanks
>
>
> > 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);
> > }
> >
> > /**
>
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
next prev parent reply other threads:[~2022-03-09 9:34 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 12:34 [PATCH v7 00/26] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 01/26] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-03-09 4:48 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 02/26] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-09 6:14 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 03/26] virtio: add helper virtqueue_get_vring_max_size() Xuan Zhuo
2022-03-09 6:16 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 04/26] virtio_ring: split: extract the logic of creating vring Xuan Zhuo
2022-03-09 6:46 ` Jason Wang
2022-03-09 9:20 ` Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 05/26] virtio_ring: split: extract the logic of init vq and attach vring Xuan Zhuo
2022-03-09 7:36 ` Jason Wang
2022-03-09 9:21 ` Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 06/26] virtio_ring: packed: extract the logic of creating vring Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 07/26] virtio_ring: packed: extract the logic of init vq and attach vring Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 08/26] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-03-09 7:51 ` Jason Wang
2022-03-09 9:22 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 09/26] virtio_ring: split: implement virtqueue_reset_vring_split() Xuan Zhuo
2022-03-09 7:55 ` Jason Wang
2022-03-09 9:24 ` Xuan Zhuo
2022-03-10 4:46 ` Xuan Zhuo
2022-03-11 5:01 ` Jason Wang
2022-03-10 7:00 ` Michael S. Tsirkin
2022-03-10 7:17 ` Xuan Zhuo
2022-03-10 8:07 ` Michael S. Tsirkin
2022-03-10 8:14 ` Xuan Zhuo
2022-03-10 12:17 ` Michael S. Tsirkin
2022-03-10 12:33 ` Xuan Zhuo
2022-03-10 13:04 ` Michael S. Tsirkin
2022-03-10 14:09 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 10/26] virtio_ring: packed: implement virtqueue_reset_vring_packed() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 11/26] virtio_ring: introduce virtqueue_reset_vring() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 12/26] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 13/26] virtio: queue_reset: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-03-09 8:47 ` Jason Wang
2022-03-09 9:25 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 14/26] virtio: add helper for queue reset Xuan Zhuo
2022-03-09 8:48 ` Jason Wang
2022-03-09 9:27 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 15/26] virtio_pci: queue_reset: update struct virtio_pci_common_cfg and option functions Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 16/26] virtio_pci: queue_reset: extract the logic of active vq for modern pci Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 17/26] virtio_pci: queue_reset: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-09 8:54 ` Jason Wang
2022-03-09 9:32 ` Xuan Zhuo
2022-03-11 5:05 ` Jason Wang
2022-03-10 8:20 ` Xuan Zhuo
2022-03-11 5:09 ` Jason Wang
2022-03-08 12:35 ` [PATCH v7 18/26] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-03-08 13:13 ` Hans de Goede
2022-03-09 8:59 ` Jason Wang
2022-03-09 9:34 ` Xuan Zhuo [this message]
2022-03-09 18:18 ` Mathieu Poirier
2022-03-08 12:35 ` [PATCH v7 19/26] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 20/26] virtio_mmio: " Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 21/26] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-03-09 9:04 ` Jason Wang
2022-03-09 9:58 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 22/26] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 23/26] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-03-09 9:06 ` Jason Wang
2022-03-08 12:35 ` [PATCH v7 24/26] virtio_net: support rx/tx queue reset Xuan Zhuo
2022-03-09 9:14 ` Jason Wang
2022-03-09 10:05 ` Xuan Zhuo
2022-03-09 10:16 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 25/26] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-03-09 9:28 ` Jason Wang
2022-03-09 9:35 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 26/26] virtio_net: support set_ringparam Xuan Zhuo
2022-03-09 9:29 ` Jason Wang
2022-03-09 9:48 ` Xuan Zhuo
2022-03-09 4:45 ` [PATCH v7 00/26] virtio pci support VIRTIO_F_RING_RESET Jason Wang
2022-03-09 9:02 ` Michael S. Tsirkin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1646818472.5069678-10-xuanzhuo@linux.alibaba.com \
--to=xuanzhuo@linux.alibaba.com \
--cc=agordeev@linux.ibm.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=ast@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=borntraeger@linux.ibm.com \
--cc=bpf@vger.kernel.org \
--cc=cohuck@redhat.com \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=gor@linux.ibm.com \
--cc=hawk@kernel.org \
--cc=hca@linux.ibm.com \
--cc=hdegoede@redhat.com \
--cc=jasowang@redhat.com \
--cc=jdike@addtoit.com \
--cc=johannes.berg@intel.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=markgross@kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=pasic@linux.ibm.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=richard@nod.at \
--cc=svens@linux.ibm.com \
--cc=vadimp@nvidia.com \
--cc=vincent.whitchurch@axis.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox