platform-driver-x86.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v11 33/40] virtio_mmio: support the arg sizes of find_vqs()
Date: Wed, 29 Jun 2022 14:56:49 +0800	[thread overview]
Message-ID: <20220629065656.54420-34-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220629065656.54420-1-xuanzhuo@linux.alibaba.com>

Virtio MMIO support the new parameter sizes of find_vqs().

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Acked-by: Jason Wang <jasowang@redhat.com>
---
 drivers/virtio/virtio_mmio.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index 5e3ba3cc7fd0..c888fee18caf 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -360,7 +360,7 @@ static void vm_synchronize_cbs(struct virtio_device *vdev)
 
 static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int index,
 				  void (*callback)(struct virtqueue *vq),
-				  const char *name, bool ctx)
+				  const char *name, u32 size, bool ctx)
 {
 	struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev);
 	struct virtio_mmio_vq_info *info;
@@ -395,8 +395,11 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned int in
 		goto error_new_virtqueue;
 	}
 
+	if (!size || size > num)
+		size = num;
+
 	/* Create the vring */
-	vq = vring_create_virtqueue(index, num, VIRTIO_MMIO_VRING_ALIGN, vdev,
+	vq = vring_create_virtqueue(index, size, VIRTIO_MMIO_VRING_ALIGN, vdev,
 				 true, true, ctx, vm_notify, callback, name);
 	if (!vq) {
 		err = -ENOMEM;
@@ -497,6 +500,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned int nvqs,
 		}
 
 		vqs[i] = vm_setup_vq(vdev, queue_idx++, callbacks[i], names[i],
+				     sizes ? sizes[i] : 0,
 				     ctx ? ctx[i] : false);
 		if (IS_ERR(vqs[i])) {
 			vm_del_vqs(vdev);
-- 
2.31.0


  parent reply	other threads:[~2022-06-29  7:00 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-29  6:56 [PATCH v11 00/40] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 01/40] virtio: add helper virtqueue_get_vring_max_size() Xuan Zhuo
2022-06-30  6:35   ` Jason Wang
2022-07-01  6:43     ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 02/40] virtio: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-06-30  6:39   ` Jason Wang
2022-07-01  6:28   ` Michael S. Tsirkin
2022-07-01  6:42     ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 03/40] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 04/40] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 05/40] virtio_ring: split vring_virtqueue Xuan Zhuo
2022-06-30  6:40   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 06/40] virtio_ring: introduce virtqueue_init() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 07/40] virtio_ring: split: introduce vring_free_split() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 08/40] virtio_ring: split: extract the logic of alloc queue Xuan Zhuo
2022-07-01  8:26   ` Jason Wang
2022-07-01  8:45     ` Xuan Zhuo
2022-07-04  3:59       ` Jason Wang
2022-07-05  2:12         ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 09/40] virtio_ring: split: extract the logic of alloc state and extra Xuan Zhuo
2022-07-01  8:55   ` Jason Wang
2022-07-04  2:04     ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 10/40] virtio_ring: split: extract the logic of attach vring Xuan Zhuo
2022-07-01  9:00   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 11/40] virtio_ring: split: extract the logic of vring init Xuan Zhuo
2022-07-01  9:00   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 12/40] virtio_ring: split: introduce virtqueue_reinit_split() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 13/40] virtio_ring: split: reserve vring_align, may_reduce_num Xuan Zhuo
2022-07-01  9:03   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 14/40] virtio_ring: split: introduce virtqueue_resize_split() Xuan Zhuo
2022-07-01  9:09   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 15/40] virtio_ring: packed: introduce vring_free_packed Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 16/40] virtio_ring: packed: extract the logic of alloc queue Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 17/40] virtio_ring: packed: extract the logic of alloc state and extra Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 18/40] virtio_ring: packed: extract the logic of attach vring Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 19/40] virtio_ring: packed: extract the logic of vring init Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 20/40] virtio_ring: packed: introduce virtqueue_reinit_packed() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 21/40] virtio_ring: packed: introduce virtqueue_resize_packed() Xuan Zhuo
2022-07-01  9:27   ` Jason Wang
2022-07-04  2:13     ` Xuan Zhuo
2022-07-04  4:02       ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 22/40] virtio_ring: introduce virtqueue_resize() Xuan Zhuo
2022-07-01  9:31   ` Jason Wang
2022-07-04  2:20     ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 23/40] virtio_pci: move struct virtio_pci_common_cfg to virtio_pci_modern.h Xuan Zhuo
2022-07-01  9:33   ` Jason Wang
2022-07-04  2:23     ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 24/40] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-07-01  9:34   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 25/40] virtio: allow to unbreak/break virtqueue individually Xuan Zhuo
2022-07-01  6:31   ` Michael S. Tsirkin
2022-07-01  9:36     ` Jason Wang
2022-07-04  3:47       ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 26/40] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 27/40] virtio_pci: struct virtio_pci_common_cfg add queue_reset Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 28/40] virtio_pci: introduce helper to get/set queue reset Xuan Zhuo
2022-07-01  9:39   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 29/40] virtio_pci: extract the logic of active vq for modern pci Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 30/40] virtio_pci: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-07-04  3:27   ` Jason Wang
2022-06-29  6:56 ` [PATCH v11 31/40] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 32/40] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-06-29  6:56 ` Xuan Zhuo [this message]
2022-06-29  6:56 ` [PATCH v11 34/40] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 35/40] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 36/40] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 37/40] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 38/40] virtio_net: support rx queue resize Xuan Zhuo
2022-07-04  3:44   ` Jason Wang
2022-07-05  1:59     ` Xuan Zhuo
2022-07-08  6:20       ` Jason Wang
2022-07-15  8:36         ` Xuan Zhuo
2022-07-18  8:56           ` Jason Wang
2022-07-18  8:58             ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 39/40] virtio_net: support tx " Xuan Zhuo
2022-07-04  3:45   ` Jason Wang
2022-07-05  2:00     ` Xuan Zhuo
2022-07-08  6:23       ` Jason Wang
2022-07-15  8:28         ` Xuan Zhuo
2022-07-18  8:57           ` Jason Wang
2022-07-18  9:11             ` Xuan Zhuo
2022-06-29  6:56 ` [PATCH v11 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=20220629065656.54420-34-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).