From: Jason Wang <jasowang@redhat.com>
To: Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
virtualization@lists.linux-foundation.org
Cc: Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Johannes Berg <johannes@sipsolutions.net>,
"Michael S. Tsirkin" <mst@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
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>,
Eric Farman <farman@linux.ibm.com>,
Heiko Carstens <hca@linux.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Alexander Gordeev <agordeev@linux.ibm.com>,
Christian Borntraeger <borntraeger@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>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
linux-um@lists.infradead.org, netdev@vger.kernel.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,
kangjie.xu@linux.alibaba.com
Subject: Re: [PATCH v12 01/40] virtio: record the maximum queue num supported by the device.
Date: Thu, 21 Jul 2022 11:36:19 +0800 [thread overview]
Message-ID: <ba2ae3e4-a950-6b7f-8748-c45a685bb6b0@redhat.com> (raw)
In-Reply-To: <20220720030436.79520-2-xuanzhuo@linux.alibaba.com>
在 2022/7/20 11:03, Xuan Zhuo 写道:
> virtio-net can display the maximum (supported by hardware) ring size in
> ethtool -g eth0.
>
> When the subsequent patch implements vring reset, it can judge whether
> the ring size passed by the driver is legal based on this.
>
> Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
> ---
> arch/um/drivers/virtio_uml.c | 1 +
> drivers/platform/mellanox/mlxbf-tmfifo.c | 2 ++
> drivers/remoteproc/remoteproc_virtio.c | 2 ++
> drivers/s390/virtio/virtio_ccw.c | 3 +++
> drivers/virtio/virtio_mmio.c | 2 ++
> drivers/virtio/virtio_pci_legacy.c | 2 ++
> drivers/virtio/virtio_pci_modern.c | 2 ++
> drivers/virtio/virtio_vdpa.c | 2 ++
> include/linux/virtio.h | 2 ++
> 9 files changed, 18 insertions(+)
>
> diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
> index 82ff3785bf69..e719af8bdf56 100644
> --- a/arch/um/drivers/virtio_uml.c
> +++ b/arch/um/drivers/virtio_uml.c
> @@ -958,6 +958,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev,
> goto error_create;
> }
> vq->priv = info;
> + vq->num_max = num;
> num = virtqueue_get_vring_size(vq);
>
> if (vu_dev->protocol_features &
> diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
> index 38800e86ed8a..1ae3c56b66b0 100644
> --- a/drivers/platform/mellanox/mlxbf-tmfifo.c
> +++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
> @@ -959,6 +959,8 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
> goto error;
> }
>
> + vq->num_max = vring->num;
> +
> vqs[i] = vq;
> vring->vq = vq;
> vq->priv = vring;
> diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
> index d43d74733f0a..0f7706e23eb9 100644
> --- a/drivers/remoteproc/remoteproc_virtio.c
> +++ b/drivers/remoteproc/remoteproc_virtio.c
> @@ -125,6 +125,8 @@ static struct virtqueue *rp_find_vq(struct virtio_device *vdev,
> return ERR_PTR(-ENOMEM);
> }
>
> + vq->num_max = num;
> +
> rvring->vq = vq;
> vq->priv = rvring;
>
> diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
> index 161d3b141f0d..6b86d0280d6b 100644
> --- a/drivers/s390/virtio/virtio_ccw.c
> +++ b/drivers/s390/virtio/virtio_ccw.c
> @@ -530,6 +530,9 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev,
> err = -ENOMEM;
> goto out_err;
> }
> +
> + vq->num_max = info->num;
> +
> /* it may have been reduced */
> info->num = virtqueue_get_vring_size(vq);
>
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index 083ff1eb743d..a20d5a6b5819 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -403,6 +403,8 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in
> goto error_new_virtqueue;
> }
>
> + vq->num_max = num;
> +
> /* Activate the queue */
> writel(virtqueue_get_vring_size(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_NUM);
> if (vm_dev->version == 1) {
> diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c
> index a5e5721145c7..2257f1b3d8ae 100644
> --- a/drivers/virtio/virtio_pci_legacy.c
> +++ b/drivers/virtio/virtio_pci_legacy.c
> @@ -135,6 +135,8 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
> if (!vq)
> return ERR_PTR(-ENOMEM);
>
> + vq->num_max = num;
> +
> q_pfn = virtqueue_get_desc_addr(vq) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT;
> if (q_pfn >> 32) {
> dev_err(&vp_dev->pci_dev->dev,
> diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
> index 623906b4996c..e7e0b8c850f6 100644
> --- a/drivers/virtio/virtio_pci_modern.c
> +++ b/drivers/virtio/virtio_pci_modern.c
> @@ -218,6 +218,8 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
> if (!vq)
> return ERR_PTR(-ENOMEM);
>
> + vq->num_max = num;
> +
> /* activate the queue */
> vp_modern_set_queue_size(mdev, index, virtqueue_get_vring_size(vq));
> vp_modern_queue_address(mdev, index, virtqueue_get_desc_addr(vq),
> diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
> index c40f7deb6b5a..9670cc79371d 100644
> --- a/drivers/virtio/virtio_vdpa.c
> +++ b/drivers/virtio/virtio_vdpa.c
> @@ -183,6 +183,8 @@ virtio_vdpa_setup_vq(struct virtio_device *vdev, unsigned int index,
> goto error_new_virtqueue;
> }
>
> + vq->num_max = max_num;
> +
> /* Setup virtqueue callback */
> cb.callback = callback ? virtio_vdpa_virtqueue_cb : NULL;
> cb.private = info;
> diff --git a/include/linux/virtio.h b/include/linux/virtio.h
> index d8fdf170637c..129bde7521e3 100644
> --- a/include/linux/virtio.h
> +++ b/include/linux/virtio.h
> @@ -19,6 +19,7 @@
> * @priv: a pointer for the virtqueue implementation to use.
> * @index: the zero-based ordinal number for this queue.
> * @num_free: number of elements we expect to be able to fit.
> + * @num_max: the maximum number of elements supported by the device.
> *
> * A note on @num_free: with indirect buffers, each buffer needs one
> * element in the queue, otherwise a buffer will need one element per
> @@ -31,6 +32,7 @@ struct virtqueue {
> struct virtio_device *vdev;
> unsigned int index;
> unsigned int num_free;
> + unsigned int num_max;
> void *priv;
> };
>
next prev parent reply other threads:[~2022-07-21 3:36 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-20 3:03 [PATCH v12 00/40] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-07-20 3:03 ` [PATCH v12 01/40] virtio: record the maximum queue num supported by the device Xuan Zhuo
2022-07-21 3:36 ` Jason Wang [this message]
2022-07-20 3:03 ` [PATCH v12 02/40] virtio: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-07-21 3:39 ` Jason Wang
2022-07-20 3:03 ` [PATCH v12 03/40] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 04/40] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 05/40] virtio_ring: split vring_virtqueue Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 06/40] virtio_ring: introduce virtqueue_init() Xuan Zhuo
2022-07-21 7:07 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 07/40] virtio_ring: split: introduce vring_free_split() Xuan Zhuo
2022-07-21 7:08 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 08/40] virtio_ring: split: extract the logic of alloc queue Xuan Zhuo
2022-07-21 9:13 ` Jason Wang
2022-07-22 3:47 ` Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 09/40] virtio_ring: split: extract the logic of alloc state and extra Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 10/40] virtio_ring: split: extract the logic of attach vring Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 11/40] virtio_ring: split: extract the logic of vring init Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 12/40] virtio_ring: split: introduce virtqueue_reinit_split() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 13/40] virtio_ring: split: reserve vring_align, may_reduce_num Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 14/40] virtio_ring: split: introduce virtqueue_resize_split() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 15/40] virtio_ring: packed: introduce vring_free_packed Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 16/40] virtio_ring: packed: extract the logic of alloc queue Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 17/40] virtio_ring: packed: extract the logic of alloc state and extra Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 18/40] virtio_ring: packed: extract the logic of attach vring Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 19/40] virtio_ring: packed: extract the logic of vring init Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 20/40] virtio_ring: packed: introduce virtqueue_reinit_packed() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 21/40] virtio_ring: packed: introduce virtqueue_resize_packed() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 22/40] virtio_ring: introduce virtqueue_resize() Xuan Zhuo
2022-07-21 9:15 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 23/40] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 24/40] virtio: allow to unbreak/break virtqueue individually Xuan Zhuo
2022-07-21 9:14 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 25/40] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 26/40] virtio_ring: struct virtqueue introduce reset Xuan Zhuo
2022-07-21 9:14 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 27/40] virtio_pci: struct virtio_pci_common_cfg add queue_reset Xuan Zhuo
2022-07-21 9:14 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 28/40] virtio_pci: introduce helper to get/set queue reset Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 29/40] virtio_pci: extract the logic of active vq for modern pci Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 30/40] virtio_pci: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-07-21 9:15 ` Jason Wang
2022-07-22 3:05 ` Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 31/40] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-07-21 9:17 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 32/40] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 33/40] virtio_mmio: " Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 34/40] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 35/40] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 36/40] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 37/40] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-07-20 3:04 ` [PATCH v12 38/40] virtio_net: support rx queue resize Xuan Zhuo
2022-07-21 9:25 ` Jason Wang
2022-07-25 6:38 ` Xuan Zhuo
2022-07-25 6:57 ` Jason Wang
2022-07-25 7:21 ` Xuan Zhuo
2022-07-25 7:28 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 39/40] virtio_net: support tx " Xuan Zhuo
2022-07-21 9:30 ` Jason Wang
2022-07-20 3:04 ` [PATCH v12 40/40] virtio_net: support set_ringparam Xuan Zhuo
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=ba2ae3e4-a950-6b7f-8748-c45a685bb6b0@redhat.com \
--to=jasowang@redhat.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=edumazet@google.com \
--cc=farman@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=hawk@kernel.org \
--cc=hca@linux.ibm.com \
--cc=hdegoede@redhat.com \
--cc=johannes@sipsolutions.net \
--cc=john.fastabend@gmail.com \
--cc=kangjie.xu@linux.alibaba.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=pabeni@redhat.com \
--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 \
--cc=xuanzhuo@linux.alibaba.com \
/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;
as well as URLs for NNTP newsgroup(s).