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 v12 22/40] virtio_ring: introduce virtqueue_resize()
Date: Wed, 20 Jul 2022 11:04:18 +0800	[thread overview]
Message-ID: <20220720030436.79520-23-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220720030436.79520-1-xuanzhuo@linux.alibaba.com>

Introduce virtqueue_resize() to implement the resize of vring.
Based on these, the driver can dynamically adjust the size of the vring.
For example: ethtool -G.

virtqueue_resize() implements resize based on the vq reset function. In
case of failure to allocate a new vring, it will give up resize and use
the original vring.

During this process, if the re-enable reset vq fails, the vq can no
longer be used. Although the probability of this situation is not high.

The parameter recycle is used to recycle the buffer that is no longer
used.

Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
 drivers/virtio/virtio_ring.c | 69 ++++++++++++++++++++++++++++++++++++
 include/linux/virtio.h       |  3 ++
 2 files changed, 72 insertions(+)

diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c
index b092914e9dcd..cf4379175163 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2545,6 +2545,75 @@ struct virtqueue *vring_create_virtqueue(
 }
 EXPORT_SYMBOL_GPL(vring_create_virtqueue);
 
+/**
+ * virtqueue_resize - resize the vring of vq
+ * @_vq: the struct virtqueue we're talking about.
+ * @num: new ring num
+ * @recycle: callback for recycle the useless buffer
+ *
+ * When it is really necessary to create a new vring, it will set the current vq
+ * into the reset state. Then call the passed callback to recycle the buffer
+ * that is no longer used. Only after the new vring is successfully created, the
+ * old vring will be released.
+ *
+ * Caller must ensure we don't call this with other virtqueue operations
+ * at the same time (except where noted).
+ *
+ * Returns zero or a negative error.
+ * 0: success.
+ * -ENOMEM: Failed to allocate a new ring, fall back to the original ring size.
+ *  vq can still work normally
+ * -EBUSY: Failed to sync with device, vq may not work properly
+ * -ENOENT: Transport or device not supported
+ * -E2BIG/-EINVAL: num error
+ * -EPERM: Operation not permitted
+ *
+ */
+int virtqueue_resize(struct virtqueue *_vq, u32 num,
+		     void (*recycle)(struct virtqueue *vq, void *buf))
+{
+	struct vring_virtqueue *vq = to_vvq(_vq);
+	struct virtio_device *vdev = vq->vq.vdev;
+	void *buf;
+	int err;
+
+	if (!vq->we_own_ring)
+		return -EPERM;
+
+	if (num > vq->vq.num_max)
+		return -E2BIG;
+
+	if (!num)
+		return -EINVAL;
+
+	if ((vq->packed_ring ? vq->packed.vring.num : vq->split.vring.num) == num)
+		return 0;
+
+	if (!vdev->config->disable_vq_and_reset)
+		return -ENOENT;
+
+	if (!vdev->config->enable_vq_after_reset)
+		return -ENOENT;
+
+	err = vdev->config->disable_vq_and_reset(_vq);
+	if (err)
+		return err;
+
+	while ((buf = virtqueue_detach_unused_buf(_vq)) != NULL)
+		recycle(_vq, buf);
+
+	if (vq->packed_ring)
+		err = virtqueue_resize_packed(_vq, num);
+	else
+		err = virtqueue_resize_split(_vq, num);
+
+	if (vdev->config->enable_vq_after_reset(_vq))
+		return -EBUSY;
+
+	return err;
+}
+EXPORT_SYMBOL_GPL(virtqueue_resize);
+
 /* Only available for split ring */
 struct virtqueue *vring_new_virtqueue(unsigned int index,
 				      unsigned int num,
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 129bde7521e3..62e31bca5602 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -91,6 +91,9 @@ dma_addr_t virtqueue_get_desc_addr(struct virtqueue *vq);
 dma_addr_t virtqueue_get_avail_addr(struct virtqueue *vq);
 dma_addr_t virtqueue_get_used_addr(struct virtqueue *vq);
 
+int virtqueue_resize(struct virtqueue *vq, u32 num,
+		     void (*recycle)(struct virtqueue *vq, void *buf));
+
 /**
  * virtio_device - representation of a device using virtio
  * @index: unique position on the virtio bus
-- 
2.31.0


  parent reply	other threads:[~2022-07-20  3:08 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 ` Xuan Zhuo [this message]
2022-07-21  9:15   ` [PATCH v12 22/40] virtio_ring: introduce virtqueue_resize() 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=20220720030436.79520-23-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).