From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: 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>,
Jason Wang <jasowang@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>,
Xuan Zhuo <xuanzhuo@linux.alibaba.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: [PATCH v12 31/40] virtio: find_vqs() add arg sizes
Date: Wed, 20 Jul 2022 11:04:27 +0800 [thread overview]
Message-ID: <20220720030436.79520-32-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220720030436.79520-1-xuanzhuo@linux.alibaba.com>
find_vqs() adds a new parameter sizes to specify the size of each vq
vring.
NULL as sizes means that all queues in find_vqs() use the maximum size.
A value in the array is 0, which means that the corresponding queue uses
the maximum size.
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>
Acked-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
arch/um/drivers/virtio_uml.c | 2 +-
drivers/platform/mellanox/mlxbf-tmfifo.c | 1 +
drivers/remoteproc/remoteproc_virtio.c | 1 +
drivers/s390/virtio/virtio_ccw.c | 1 +
drivers/virtio/virtio_mmio.c | 1 +
drivers/virtio/virtio_pci_common.c | 2 +-
drivers/virtio/virtio_pci_common.h | 2 +-
drivers/virtio/virtio_pci_modern.c | 7 +++++--
drivers/virtio/virtio_vdpa.c | 1 +
include/linux/virtio_config.h | 14 +++++++++-----
10 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c
index e719af8bdf56..79e38afd4b91 100644
--- a/arch/um/drivers/virtio_uml.c
+++ b/arch/um/drivers/virtio_uml.c
@@ -1011,7 +1011,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,
+ const char * const names[], u32 sizes[], const bool *ctx,
struct irq_affinity *desc)
{
struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev);
diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c
index 1ae3c56b66b0..8be13d416f48 100644
--- a/drivers/platform/mellanox/mlxbf-tmfifo.c
+++ b/drivers/platform/mellanox/mlxbf-tmfifo.c
@@ -928,6 +928,7 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char * const names[],
+ u32 sizes[],
const bool *ctx,
struct irq_affinity *desc)
{
diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c
index 0f7706e23eb9..81c4f5776109 100644
--- a/drivers/remoteproc/remoteproc_virtio.c
+++ b/drivers/remoteproc/remoteproc_virtio.c
@@ -158,6 +158,7 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char * const names[],
+ u32 sizes[],
const bool * ctx,
struct irq_affinity *desc)
{
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 6b86d0280d6b..72500cd2dbf5 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -635,6 +635,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char * const names[],
+ u32 sizes[],
const bool *ctx,
struct irq_affinity *desc)
{
diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index a20d5a6b5819..5e3ba3cc7fd0 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -474,6 +474,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char * const names[],
+ u32 sizes[],
const bool *ctx,
struct irq_affinity *desc)
{
diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c
index ad258a9d3b9f..7ad734584823 100644
--- a/drivers/virtio/virtio_pci_common.c
+++ b/drivers/virtio/virtio_pci_common.c
@@ -396,7 +396,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,
/* the config->find_vqs() implementation */
int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[], vq_callback_t *callbacks[],
- const char * const names[], const bool *ctx,
+ const char * const names[], u32 sizes[], const bool *ctx,
struct irq_affinity *desc)
{
int err;
diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index 23112d84218f..a5ff838b85a5 100644
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -110,7 +110,7 @@ void vp_del_vqs(struct virtio_device *vdev);
/* the config->find_vqs() implementation */
int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[], vq_callback_t *callbacks[],
- const char * const names[], const bool *ctx,
+ const char * const names[], u32 sizes[], const bool *ctx,
struct irq_affinity *desc);
const char *vp_bus_name(struct virtio_device *vdev);
diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 4d28b6918c80..19ec491d515a 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -355,12 +355,15 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,
static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
- const char * const names[], const bool *ctx,
+ const char * const names[],
+ u32 sizes[],
+ const bool *ctx,
struct irq_affinity *desc)
{
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, sizes, ctx,
+ desc);
if (rc)
return rc;
diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c
index 9670cc79371d..832d2c5b1b19 100644
--- a/drivers/virtio/virtio_vdpa.c
+++ b/drivers/virtio/virtio_vdpa.c
@@ -269,6 +269,7 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
struct virtqueue *vqs[],
vq_callback_t *callbacks[],
const char * const names[],
+ u32 sizes[],
const bool *ctx,
struct irq_affinity *desc)
{
diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h
index 36ec7be1f480..888f7e96f0c7 100644
--- a/include/linux/virtio_config.h
+++ b/include/linux/virtio_config.h
@@ -55,6 +55,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().
* @synchronize_cbs: synchronize with the virtqueue callbacks (optional)
@@ -103,7 +104,9 @@ struct virtio_config_ops {
void (*reset)(struct virtio_device *vdev);
int (*find_vqs)(struct virtio_device *, unsigned nvqs,
struct virtqueue *vqs[], vq_callback_t *callbacks[],
- const char * const names[], const bool *ctx,
+ const char * const names[],
+ u32 sizes[],
+ const bool *ctx,
struct irq_affinity *desc);
void (*del_vqs)(struct virtio_device *);
void (*synchronize_cbs)(struct virtio_device *);
@@ -212,7 +215,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;
@@ -224,7 +227,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,
+ NULL, desc);
}
static inline
@@ -233,8 +237,8 @@ int virtio_find_vqs_ctx(struct virtio_device *vdev, unsigned nvqs,
const char * const names[], const bool *ctx,
struct irq_affinity *desc)
{
- return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, ctx,
- desc);
+ return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL,
+ ctx, desc);
}
/**
--
2.31.0
next prev parent reply other threads:[~2022-07-20 3:09 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
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 ` Xuan Zhuo [this message]
2022-07-21 9:17 ` [PATCH v12 31/40] virtio: find_vqs() add arg sizes 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=20220720030436.79520-32-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=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=jasowang@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 \
/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).