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 32/32] virtio_net: support set_ringparam
Date: Wed, 6 Apr 2022 11:43:46 +0800 [thread overview]
Message-ID: <20220406034346.74409-33-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220406034346.74409-1-xuanzhuo@linux.alibaba.com>
Support set_ringparam based on virtio queue reset.
Users can use ethtool -G eth0 <ring_num> to modify the ring size of
virtio-net.
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
---
drivers/net/virtio_net.c | 47 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index ba6859f305f7..37e4e27f1e4e 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2264,6 +2264,52 @@ static void virtnet_get_ringparam(struct net_device *dev,
ring->tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
}
+static int virtnet_set_ringparam(struct net_device *dev,
+ struct ethtool_ringparam *ring,
+ struct kernel_ethtool_ringparam *kernel_ring,
+ struct netlink_ext_ack *extack)
+{
+ struct virtnet_info *vi = netdev_priv(dev);
+ u32 rx_pending, tx_pending;
+ struct receive_queue *rq;
+ struct send_queue *sq;
+ int i, err;
+
+ if (ring->rx_mini_pending || ring->rx_jumbo_pending)
+ return -EINVAL;
+
+ rx_pending = virtqueue_get_vring_size(vi->rq[0].vq);
+ tx_pending = virtqueue_get_vring_size(vi->sq[0].vq);
+
+ if (ring->rx_pending == rx_pending &&
+ ring->tx_pending == tx_pending)
+ return 0;
+
+ if (ring->rx_pending > virtqueue_get_vring_max_size(vi->rq[0].vq))
+ return -EINVAL;
+
+ if (ring->tx_pending > virtqueue_get_vring_max_size(vi->sq[0].vq))
+ return -EINVAL;
+
+ for (i = 0; i < vi->max_queue_pairs; i++) {
+ rq = vi->rq + i;
+ sq = vi->sq + i;
+
+ if (ring->tx_pending != tx_pending) {
+ err = virtnet_tx_resize(vi, sq, ring->tx_pending);
+ if (err)
+ return err;
+ }
+
+ if (ring->rx_pending != rx_pending) {
+ err = virtnet_rx_resize(vi, rq, ring->rx_pending);
+ if (err)
+ return err;
+ }
+ }
+
+ return 0;
+}
static void virtnet_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
@@ -2497,6 +2543,7 @@ static const struct ethtool_ops virtnet_ethtool_ops = {
.get_drvinfo = virtnet_get_drvinfo,
.get_link = ethtool_op_get_link,
.get_ringparam = virtnet_get_ringparam,
+ .set_ringparam = virtnet_set_ringparam,
.get_strings = virtnet_get_strings,
.get_sset_count = virtnet_get_sset_count,
.get_ethtool_stats = virtnet_get_ethtool_stats,
--
2.31.0
next prev parent reply other threads:[~2022-04-06 13:12 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 ` [PATCH v9 18/32] virtio_ring: introduce virtqueue_resize() Xuan Zhuo
2022-04-12 6:41 ` 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 ` Xuan Zhuo [this message]
2022-04-13 8:06 ` [PATCH v9 32/32] virtio_net: support set_ringparam 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-33-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