public inbox for linux-s390@vger.kernel.org
 help / color / mirror / Atom feed
From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux-foundation.org
Cc: Jeff Dike <jdike@addtoit.com>,
	Richard Weinberger <richard@nod.at>,
	Anton Ivanov <anton.ivanov@cambridgegreys.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowang@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>,
	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
Subject: [PATCH v9 18/32] virtio_ring: introduce virtqueue_resize()
Date: Wed,  6 Apr 2022 11:43:32 +0800	[thread overview]
Message-ID: <20220406034346.74409-19-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220406034346.74409-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 06f66b15c86c..6250e19fc5bf 100644
--- a/drivers/virtio/virtio_ring.c
+++ b/drivers/virtio/virtio_ring.c
@@ -2554,6 +2554,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.
+ */
+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;
+	bool packed;
+	void *buf;
+	int err;
+
+	if (!vq->we_own_ring)
+		return -EINVAL;
+
+	if (num > vq->vq.num_max)
+		return -E2BIG;
+
+	if (!num)
+		return -EINVAL;
+
+	packed = virtio_has_feature(vdev, VIRTIO_F_RING_PACKED) ? true : false;
+
+	if ((packed ? vq->packed.vring.num : vq->split.vring.num) == num)
+		return 0;
+
+	if (!vdev->config->reset_vq)
+		return -ENOENT;
+
+	if (!vdev->config->enable_reset_vq)
+		return -ENOENT;
+
+	err = vdev->config->reset_vq(_vq);
+	if (err)
+		return err;
+
+	while ((buf = virtqueue_detach_unused_buf(_vq)) != NULL)
+		recycle(_vq, buf);
+
+	if (packed) {
+		err = virtqueue_resize_packed(_vq, num);
+		if (err)
+			virtqueue_reinit_packed(vq);
+	} else {
+		err = virtqueue_resize_split(_vq, num);
+		if (err)
+			virtqueue_reinit_split(vq);
+	}
+
+	if (vdev->config->enable_reset_vq(_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 d59adc4be068..c86ff02e0ca0 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-04-06 16:10 UTC|newest]

Thread overview: 85+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-04-06  3:43 [PATCH v9 00/32] virtio pci support VIRTIO_F_RING_RESET (refactor vring) Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 01/32] virtio: add helper virtqueue_get_vring_max_size() Xuan Zhuo
2022-04-12  2:41   ` Jason Wang
2022-04-13  2:24     ` Xuan Zhuo
2022-04-14  9:16       ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 02/32] virtio: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-04-12  2:47   ` Jason Wang
2022-04-12  2:49     ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 03/32] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-04-12  2:49   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 04/32] virtio_ring: remove the arg vq of vring_alloc_desc_extra() Xuan Zhuo
2022-04-12  2:53   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 05/32] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-04-12  2:58   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 06/32] virtio_ring: split: extract the logic of alloc queue Xuan Zhuo
2022-04-12  3:22   ` Jason Wang
2022-04-13  6:52     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 07/32] virtio_ring: split: extract the logic of alloc state and extra Xuan Zhuo
2022-04-12  3:26   ` Jason Wang
2022-04-13  6:48     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 08/32] virtio_ring: split: extract the logic of attach vring Xuan Zhuo
2022-04-12  3:31   ` Jason Wang
2022-04-13  6:44     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 09/32] virtio_ring: split: extract the logic of vq init Xuan Zhuo
2022-04-12  3:42   ` Jason Wang
2022-04-13  7:04     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 10/32] virtio_ring: split: introduce virtqueue_reinit_split() Xuan Zhuo
2022-04-12  5:49   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 11/32] virtio_ring: split: introduce virtqueue_resize_split() Xuan Zhuo
2022-04-12  5:53   ` Jason Wang
2022-04-13  6:32     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 12/32] virtio_ring: packed: extract the logic of alloc queue Xuan Zhuo
2022-04-12  6:28   ` Jason Wang
2022-04-13  3:23     ` Xuan Zhuo
2022-04-14  9:18       ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 13/32] virtio_ring: packed: extract the logic of alloc state and extra Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 14/32] virtio_ring: packed: extract the logic of attach vring Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 15/32] virtio_ring: packed: extract the logic of vq init Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 16/32] virtio_ring: packed: introduce virtqueue_reinit_packed() Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 17/32] virtio_ring: packed: introduce virtqueue_resize_packed() Xuan Zhuo
2022-04-06  3:43 ` Xuan Zhuo [this message]
2022-04-12  6:41   ` [PATCH v9 18/32] virtio_ring: introduce virtqueue_resize() Jason Wang
2022-04-13 12:14     ` Xuan Zhuo
2022-04-13 12:21     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 19/32] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 20/32] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 21/32] virtio_pci: queue_reset: update struct virtio_pci_common_cfg and option functions Xuan Zhuo
2022-04-12  6:43   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 22/32] virtio_pci: queue_reset: extract the logic of active vq for modern pci Xuan Zhuo
2022-04-12  6:58   ` Jason Wang
2022-04-14  6:22     ` Xuan Zhuo
2022-04-14  9:37       ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 23/32] virtio_pci: queue_reset: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-04-12  7:07   ` Jason Wang
2022-04-13  3:21     ` Xuan Zhuo
2022-04-14  9:17       ` Jason Wang
2022-04-13  8:48     ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 24/32] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-04-12  7:10   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 25/32] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-04-12  7:12   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 26/32] virtio_mmio: " Xuan Zhuo
2022-04-12  7:13   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 27/32] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-04-12  7:15   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 28/32] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-04-12  7:18   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 29/32] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-04-12  7:19   ` Jason Wang
2022-04-06  3:43 ` [PATCH v9 30/32] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 31/32] virtio_net: support rx/tx queue resize Xuan Zhuo
2022-04-13  8:00   ` Jason Wang
2022-04-13  8:35     ` Xuan Zhuo
2022-04-14  9:30       ` Jason Wang
2022-04-15  2:18         ` Xuan Zhuo
2022-04-15  5:53           ` Jason Wang
2022-04-15  9:17             ` Xuan Zhuo
2022-04-18  7:57               ` Jason Wang
2022-04-18  3:21     ` Xuan Zhuo
2022-04-18  7:49       ` Jason Wang
2022-04-18  8:48         ` Xuan Zhuo
2022-04-06  3:43 ` [PATCH v9 32/32] virtio_net: support set_ringparam Xuan Zhuo
2022-04-13  8:06   ` Jason Wang
2022-04-26  9:55 ` [PATCH v9 00/32] virtio pci support VIRTIO_F_RING_RESET (refactor vring) Michael S. Tsirkin
2022-04-26  9:59   ` 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=20220406034346.74409-19-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