From: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
To: virtualization@lists.linux-foundation.org, netdev@vger.kernel.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>,
Vincent Whitchurch <vincent.whitchurch@axis.com>,
Xuan Zhuo <xuanzhuo@linux.alibaba.com>,
linux-um@lists.infradead.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 v7 26/26] virtio_net: support set_ringparam
Date: Tue, 8 Mar 2022 20:35:18 +0800 [thread overview]
Message-ID: <20220308123518.33800-27-xuanzhuo@linux.alibaba.com> (raw)
In-Reply-To: <20220308123518.33800-1-xuanzhuo@linux.alibaba.com>
Support set_ringparam based on virtio queue reset.
The rx,tx_pending required to be passed must be power of 2.
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 f1bdc6ce21c3..1fa2d632a994 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -2290,6 +2290,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_vq_reset(vi, sq, ring->tx_pending);
+ if (err)
+ return err;
+ }
+
+ if (ring->rx_pending != rx_pending) {
+ err = virtnet_rx_vq_reset(vi, rq, ring->rx_pending);
+ if (err)
+ return err;
+ }
+ }
+
+ return 0;
+}
static void virtnet_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info)
@@ -2523,6 +2569,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
_______________________________________________
linux-um mailing list
linux-um@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-um
next prev parent reply other threads:[~2022-03-08 12:36 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-08 12:34 [PATCH v7 00/26] virtio pci support VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 01/26] virtio_pci: struct virtio_pci_common_cfg add queue_notify_data Xuan Zhuo
2022-03-09 4:48 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 02/26] virtio: queue_reset: add VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-09 6:14 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 03/26] virtio: add helper virtqueue_get_vring_max_size() Xuan Zhuo
2022-03-09 6:16 ` Jason Wang
2022-03-08 12:34 ` [PATCH v7 04/26] virtio_ring: split: extract the logic of creating vring Xuan Zhuo
2022-03-09 6:46 ` Jason Wang
2022-03-09 9:20 ` Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 05/26] virtio_ring: split: extract the logic of init vq and attach vring Xuan Zhuo
2022-03-09 7:36 ` Jason Wang
2022-03-09 9:21 ` Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 06/26] virtio_ring: packed: extract the logic of creating vring Xuan Zhuo
2022-03-08 12:34 ` [PATCH v7 07/26] virtio_ring: packed: extract the logic of init vq and attach vring Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 08/26] virtio_ring: extract the logic of freeing vring Xuan Zhuo
2022-03-09 7:51 ` Jason Wang
2022-03-09 9:22 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 09/26] virtio_ring: split: implement virtqueue_reset_vring_split() Xuan Zhuo
2022-03-09 7:55 ` Jason Wang
2022-03-09 9:24 ` Xuan Zhuo
2022-03-10 4:46 ` Xuan Zhuo
2022-03-11 5:01 ` Jason Wang
2022-03-10 7:00 ` Michael S. Tsirkin
2022-03-10 7:17 ` Xuan Zhuo
2022-03-10 8:07 ` Michael S. Tsirkin
2022-03-10 8:14 ` Xuan Zhuo
2022-03-10 12:17 ` Michael S. Tsirkin
2022-03-10 12:33 ` Xuan Zhuo
2022-03-10 13:04 ` Michael S. Tsirkin
2022-03-10 14:09 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 10/26] virtio_ring: packed: implement virtqueue_reset_vring_packed() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 11/26] virtio_ring: introduce virtqueue_reset_vring() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 12/26] virtio_ring: update the document of the virtqueue_detach_unused_buf for queue reset Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 13/26] virtio: queue_reset: struct virtio_config_ops add callbacks for queue_reset Xuan Zhuo
2022-03-09 8:47 ` Jason Wang
2022-03-09 9:25 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 14/26] virtio: add helper for queue reset Xuan Zhuo
2022-03-09 8:48 ` Jason Wang
2022-03-09 9:27 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 15/26] virtio_pci: queue_reset: update struct virtio_pci_common_cfg and option functions Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 16/26] virtio_pci: queue_reset: extract the logic of active vq for modern pci Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 17/26] virtio_pci: queue_reset: support VIRTIO_F_RING_RESET Xuan Zhuo
2022-03-09 8:54 ` Jason Wang
2022-03-09 9:32 ` Xuan Zhuo
2022-03-11 5:05 ` Jason Wang
2022-03-10 8:20 ` Xuan Zhuo
2022-03-11 5:09 ` Jason Wang
2022-03-08 12:35 ` [PATCH v7 18/26] virtio: find_vqs() add arg sizes Xuan Zhuo
2022-03-08 13:13 ` Hans de Goede
2022-03-09 8:59 ` Jason Wang
2022-03-09 9:34 ` Xuan Zhuo
2022-03-09 18:18 ` Mathieu Poirier
2022-03-08 12:35 ` [PATCH v7 19/26] virtio_pci: support the arg sizes of find_vqs() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 20/26] virtio_mmio: " Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 21/26] virtio: add helper virtio_find_vqs_ctx_size() Xuan Zhuo
2022-03-09 9:04 ` Jason Wang
2022-03-09 9:58 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 22/26] virtio_net: get ringparam by virtqueue_get_vring_max_size() Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 23/26] virtio_net: split free_unused_bufs() Xuan Zhuo
2022-03-09 9:06 ` Jason Wang
2022-03-08 12:35 ` [PATCH v7 24/26] virtio_net: support rx/tx queue reset Xuan Zhuo
2022-03-09 9:14 ` Jason Wang
2022-03-09 10:05 ` Xuan Zhuo
2022-03-09 10:16 ` Xuan Zhuo
2022-03-08 12:35 ` [PATCH v7 25/26] virtio_net: set the default max ring size by find_vqs() Xuan Zhuo
2022-03-09 9:28 ` Jason Wang
2022-03-09 9:35 ` Xuan Zhuo
2022-03-08 12:35 ` Xuan Zhuo [this message]
2022-03-09 9:29 ` [PATCH v7 26/26] virtio_net: support set_ringparam Jason Wang
2022-03-09 9:48 ` Xuan Zhuo
2022-03-09 4:45 ` [PATCH v7 00/26] virtio pci support VIRTIO_F_RING_RESET Jason Wang
2022-03-09 9:02 ` Michael S. Tsirkin
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=20220308123518.33800-27-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