From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE010C433FE for ; Wed, 16 Feb 2022 07:21:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230053AbiBPHWE (ORCPT ); Wed, 16 Feb 2022 02:22:04 -0500 Received: from gmail-smtp-in.l.google.com ([23.128.96.19]:33444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230057AbiBPHWD (ORCPT ); Wed, 16 Feb 2022 02:22:03 -0500 Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3278E13D57; Tue, 15 Feb 2022 23:21:47 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R741e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=e01e04423;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=11;SR=0;TI=SMTPD_---0V4cGXqR_1644996102; Received: from localhost(mailfrom:xuanzhuo@linux.alibaba.com fp:SMTPD_---0V4cGXqR_1644996102) by smtp.aliyun-inc.com(127.0.0.1); Wed, 16 Feb 2022 15:21:43 +0800 Message-ID: <1644996081.960291-2-xuanzhuo@linux.alibaba.com> Subject: Re: [PATCH v5 22/22] virtio_net: support set_ringparam Date: Wed, 16 Feb 2022 15:21:21 +0800 From: Xuan Zhuo To: Jason Wang Cc: virtualization , netdev , "Michael S. Tsirkin" , "David S. Miller" , Jakub Kicinski , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , bpf@vger.kernel.org References: <20220214081416.117695-1-xuanzhuo@linux.alibaba.com> <20220214081416.117695-23-xuanzhuo@linux.alibaba.com> In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org On Wed, 16 Feb 2022 12:14:39 +0800, Jason Wang wrote: > On Mon, Feb 14, 2022 at 4:15 PM Xuan Zhuo wrote: > > > > 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 > > --- > > drivers/net/virtio_net.c | 50 ++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 50 insertions(+) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index f9bb760c6dbd..bf460ea87354 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -2308,6 +2308,55 @@ 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; > > + 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; > > + > > + if (!is_power_of_2(ring->rx_pending)) > > + return -EINVAL; > > + > > + if (!is_power_of_2(ring->tx_pending)) > > + return -EINVAL; > > We'd better leave those checks to the virtio core where it knows > packed virtqueue doesn't have this limitation. OK. > > > + > > + for (i = 0; i < vi->max_queue_pairs; i++) { > > + if (ring->tx_pending != tx_pending) { > > + virtio_set_max_ring_num(vi->vdev, ring->tx_pending); > > The name is kind of confusing, I guess it should not be the maximum > ring. And this needs to be done after the reset, and it would be even > better to disallow such change when virtqueue is not resetted. OK. Thanks. > > > + err = virtnet_tx_vq_reset(vi, i); > > + if (err) > > + return err; > > + } > > + > > + if (ring->rx_pending != rx_pending) { > > + virtio_set_max_ring_num(vi->vdev, ring->rx_pending); > > + err = virtnet_rx_vq_reset(vi, i); > > + if (err) > > + return err; > > + } > > + } > > + > > + return 0; > > +} > > > > static void virtnet_get_drvinfo(struct net_device *dev, > > struct ethtool_drvinfo *info) > > @@ -2541,6 +2590,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 > > >