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 306B7C433EF for ; Wed, 13 Apr 2022 08:07:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233364AbiDMIJT (ORCPT ); Wed, 13 Apr 2022 04:09:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232900AbiDMIJS (ORCPT ); Wed, 13 Apr 2022 04:09:18 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AA35F22B30 for ; Wed, 13 Apr 2022 01:06:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649837216; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3oVDDbPJyK3HgpM5oKcpbE9J9tBIr9ChlAXnnhFjPGo=; b=gJC5s0JqK4lyM37n36IrLWfBtiOXEI6nKZ18sEA2mnPWomobBk9zy0jUZZy6OpObY1kjXW cQj8ROv8QwWHt3gT6mXKfA4lPyF7js+UNoyehPBa7iA5HnClb6wvKBwddH+oQgvuWH1zRJ b87rdP8b7fek7UbiMV5Qyz/varvOyIc= Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-647-s1HBGSIWNkGFo7-aKTKeSA-1; Wed, 13 Apr 2022 04:06:50 -0400 X-MC-Unique: s1HBGSIWNkGFo7-aKTKeSA-1 Received: by mail-pg1-f197.google.com with SMTP id b18-20020a63d812000000b0037e1aa59c0bso719796pgh.12 for ; Wed, 13 Apr 2022 01:06:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=3oVDDbPJyK3HgpM5oKcpbE9J9tBIr9ChlAXnnhFjPGo=; b=U0c6xmdgH+LrXPxU6MZ5PIH2MNdDsczBqsPtWch6OZ9SUUIqCf5VEoDRyVuBDCuI2e y9daAoK1o+NJz0TJ4paz4+GeQHjyKBQf9oUA/0LeVa4w1WukckSomNLJby+a/AkJZMsb vFNbTw/5AzUN6GbQ4WgdwTncZCqkVewIMtwACejCrnlXUuROHZTWXJUrprmNAGnXNjvD akds/xru/IEb7N1RWXNBc1jaHujo6AIJhYeiakM5pN4DbW8tetfw0wcUDa3C823/dx8A SSAKUsCDEXhfL98KVESX2i8BcvihVGlRiIsaTyvtnr5dyRp1p6wzsiJ6sPIgBZQJU9ys r7cw== X-Gm-Message-State: AOAM531R4x1WGgS+ntN9vk3OzczxlwiaGp690GslKpoQntbABTWRIprB UR8Z8/UfKx1M+V9glhSWEtNFfEshoqiNQPjvEKpGJnEqByPwJeFoFNRFfsJF1L29u8b8ObA9YbE Gr+yY00NaK3sXlnah4GndIw== X-Received: by 2002:a17:90b:1e06:b0:1cb:b742:ba0d with SMTP id pg6-20020a17090b1e0600b001cbb742ba0dmr9526927pjb.24.1649837209902; Wed, 13 Apr 2022 01:06:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxA8440BQVqz6KdwXBOHrMtT4WnGyMxsQffyGtbEDMm0ObQF/C2qu9IScvqE/FloA/61fylAQ== X-Received: by 2002:a17:90b:1e06:b0:1cb:b742:ba0d with SMTP id pg6-20020a17090b1e0600b001cbb742ba0dmr9526892pjb.24.1649837209610; Wed, 13 Apr 2022 01:06:49 -0700 (PDT) Received: from [10.72.13.223] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id p10-20020a17090a680a00b001c7bf7d32f9sm1982517pjj.55.2022.04.13.01.06.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Apr 2022 01:06:49 -0700 (PDT) Message-ID: <96d1fe97-2e8a-ae8a-a35f-bba2ce0f44b4@redhat.com> Date: Wed, 13 Apr 2022 16:06:33 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.7.0 Subject: Re: [PATCH v9 32/32] virtio_net: support set_ringparam Content-Language: en-US To: Xuan Zhuo , virtualization@lists.linux-foundation.org Cc: Jeff Dike , Richard Weinberger , Anton Ivanov , "Michael S. Tsirkin" , "David S. Miller" , Jakub Kicinski , Hans de Goede , Mark Gross , Vadim Pasternak , Bjorn Andersson , Mathieu Poirier , Cornelia Huck , Halil Pasic , Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Alexander Gordeev , Sven Schnelle , Alexei Starovoitov , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Johannes Berg , Vincent Whitchurch , 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 References: <20220406034346.74409-1-xuanzhuo@linux.alibaba.com> <20220406034346.74409-33-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220406034346.74409-33-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org 在 2022/4/6 上午11:43, Xuan Zhuo 写道: > Support set_ringparam based on virtio queue reset. > > Users can use ethtool -G eth0 to modify the ring size of > virtio-net. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang (One thing that I see is that, when resize fails, the param reported via get_ringparam might be wrong, this is a corner case but might worth to fix in the future). > --- > 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,