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 C4FBCC43219 for ; Wed, 9 Mar 2022 09:29:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232094AbiCIJaq (ORCPT ); Wed, 9 Mar 2022 04:30:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232109AbiCIJao (ORCPT ); Wed, 9 Mar 2022 04:30:44 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 9338016EAA9 for ; Wed, 9 Mar 2022 01:29:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646818183; 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=W9ocX7htY9ba2tFChckZrvAN3geRIS+/uGpDxNIPVbs=; b=MAYPw0XvKL7AcAfGQrh/nhIW75HkkfIT7kdm+DIcF356b79YxVUfHhd7v2/g1olSFsIKZf DgaKum0ptoxJoMDq0IBTDUfbOtNL0WocXQ9bB7CqkS7rFTgL+JDGVRpU7o/b/jN2VVFGd9 qaLIeLKpiDU1GARkbXlXJIyx2qEur84= Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460-jXG_BECkMTqLkWmy0T0xeA-1; Wed, 09 Mar 2022 04:29:40 -0500 X-MC-Unique: jXG_BECkMTqLkWmy0T0xeA-1 Received: by mail-pj1-f71.google.com with SMTP id s12-20020a17090a13cc00b001bee1e1677fso1262786pjf.0 for ; Wed, 09 Mar 2022 01:29:40 -0800 (PST) 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=W9ocX7htY9ba2tFChckZrvAN3geRIS+/uGpDxNIPVbs=; b=nEjctVt6rticyVH3+E4zv5QkRKyYZFslNy6BdtRfOh7oQ3iZsBxkBUGycZW/8zOHch 6Q2Ms1xfn7AYl7SGDFje2mDgQVJx/+3HnWdWT5kNks9UQ0ls7HCwWjwDDPfdebKDs6MF 2ymNZWlW4YSKLnsE4NnvT3IOEO4w4a5Vjf5booYKV0Us+kQtvBeZty1juh1TNJOd7BEh K2sw3kwONWwqWFylAXIxPZf2YoMqZ/kJDKKXJ3WnS1/pJw2rQF4nowbAST18hDp7B7rx zWqCuG/CZ92K27t8fWW1TJ3ouP3+xgLKgos6qhtuKp+hFotaS65Pm+wvM8/nHKJHIlAR S89w== X-Gm-Message-State: AOAM533dUyGu5UGkA/F4170C+wq7cddFQ28TNVeePF6sySy7Z4vxaOUX 998r+sCxLHWsEEV2/2HgBFHNfS4wr05uzw7rZ4sgWAXtsQTsZK5lCyb3U6gFjsRsqHbGuoTr6mO A+N/quU+2j4mVju64 X-Received: by 2002:a05:6a00:3011:b0:4f6:dca6:ece1 with SMTP id ay17-20020a056a00301100b004f6dca6ece1mr20189429pfb.75.1646818179710; Wed, 09 Mar 2022 01:29:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxL+3sp7OJuCEahtHTbhOxVlCpFQIqW2Pb0J6gPCFuY6dSoVpGjvXAebQz9lHsTjjuvBf4aOg== X-Received: by 2002:a05:6a00:3011:b0:4f6:dca6:ece1 with SMTP id ay17-20020a056a00301100b004f6dca6ece1mr20189408pfb.75.1646818179436; Wed, 09 Mar 2022 01:29:39 -0800 (PST) Received: from [10.72.12.183] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id j13-20020a056a00130d00b004f1025a4361sm2297184pfu.202.2022.03.09.01.29.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 09 Mar 2022 01:29:38 -0800 (PST) Message-ID: Date: Wed, 9 Mar 2022 17:29:28 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Subject: Re: [PATCH v7 26/26] virtio_net: support set_ringparam Content-Language: en-US To: Xuan Zhuo , virtualization@lists.linux-foundation.org, netdev@vger.kernel.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, 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: <20220308123518.33800-1-xuanzhuo@linux.alibaba.com> <20220308123518.33800-27-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220308123518.33800-27-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 在 2022/3/8 下午8:35, Xuan Zhuo 写道: > 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 | 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; Any chance that we may hit this EINVAL? Thanks > + > + 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,