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 34E84C433FE for ; Wed, 9 Mar 2022 06:17:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229960AbiCIGRq (ORCPT ); Wed, 9 Mar 2022 01:17:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229944AbiCIGRp (ORCPT ); Wed, 9 Mar 2022 01:17:45 -0500 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 9D98D1617D9 for ; Tue, 8 Mar 2022 22:16:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646806606; 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=cCQcksPUdMm6JmcA9ctdwilmGIj2X4aiFpqmKR/hAfU=; b=ETln0zVBXIjxYvehxEE9IV9JAqYyfWRHla2t8lDIwBSGY/ZRU+3vhka2/1lVVMV0oOV/U4 +3uaZV8FFXR9ZOxnYm/y16D5sT2eJu8zx6C3oW5iSR9QQ70E6hhAEFREN01fhRwTiSuL60 Zylpe3hBGt342H1WN/szDXCLd9JPoG4= 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-21-OJCdZulpMWarGfO4qGnDrg-1; Wed, 09 Mar 2022 01:16:45 -0500 X-MC-Unique: OJCdZulpMWarGfO4qGnDrg-1 Received: by mail-pj1-f71.google.com with SMTP id g19-20020a17090a579300b001b9d80f3714so978227pji.7 for ; Tue, 08 Mar 2022 22:16:45 -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=cCQcksPUdMm6JmcA9ctdwilmGIj2X4aiFpqmKR/hAfU=; b=NmAvKSLpuSuK6TQa3jJjRLZ0uZUVSsfNtEIAenhq/XeUzOkHjXF/n82ZxPqx1KnPaD eIP6h+eyvh4v6NXC1OLZdjgqK1HvocgNwMi0X7SHLIlYIjVkQBHel8Z88nwR6I5plqPk u6mq84sqJWiXivN81Vb2OigjnApBwCW7dj+h9w9u4fJ6Ycqmwvs1y8iaJLyKK5vEe7gY yJdEhEVq2GO9yjioTTASJrKnH+9UrpICZdWztalioGPSPb4EPiHvxIuYf+1tCsJ9kzSG Aojb0TrHL9yVioaNhf3Wnzc1tjB/hhYoX1CPy4dCQrBcteQFMFbg5eJw4A69CctCjVDP DeHQ== X-Gm-Message-State: AOAM533ezq7+Sjf9W/BQ24vsKHgzFZsR6GV8/xT9bbv4qJmRTcc+bTU8 b/ngWPOZnsbH+oodRnfkDe8WOUUHijN+y9X/3WeX+yWOK6HlvvwiiqFidZZ7ej1a8pOPum+ecG1 U8qTWE0Z3gpJU5yAquXOGwg== X-Received: by 2002:a17:902:e886:b0:151:ed65:fd87 with SMTP id w6-20020a170902e88600b00151ed65fd87mr13425788plg.161.1646806604225; Tue, 08 Mar 2022 22:16:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJxc7JR6EeBP4D90Qf0GHA8SP34qXakttaCcRONqPxoLgaicEsxymwyeChsATy9iRlCgcuMRYA== X-Received: by 2002:a17:902:e886:b0:151:ed65:fd87 with SMTP id w6-20020a170902e88600b00151ed65fd87mr13425762plg.161.1646806603957; Tue, 08 Mar 2022 22:16:43 -0800 (PST) Received: from [10.72.12.183] ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id z2-20020aa79902000000b004f75842c97csm994252pff.209.2022.03.08.22.16.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Mar 2022 22:16:43 -0800 (PST) Message-ID: <10c67feb-fe4a-9370-23a6-efc90532700d@redhat.com> Date: Wed, 9 Mar 2022 14:16: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.6.1 Subject: Re: [PATCH v7 03/26] virtio: add helper virtqueue_get_vring_max_size() 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-4-xuanzhuo@linux.alibaba.com> From: Jason Wang In-Reply-To: <20220308123518.33800-4-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/3/8 下午8:34, Xuan Zhuo 写道: > Record the maximum queue num supported by the device. > > virtio-net can display the maximum (supported by hardware) ring size in > ethtool -g eth0. > > When the subsequent patch implements vring reset, it can judge whether > the ring size passed by the driver is legal based on this. > > Signed-off-by: Xuan Zhuo Acked-by: Jason Wang > --- > drivers/virtio/virtio_mmio.c | 2 ++ > drivers/virtio/virtio_pci_legacy.c | 2 ++ > drivers/virtio/virtio_pci_modern.c | 2 ++ > drivers/virtio/virtio_ring.c | 14 ++++++++++++++ > include/linux/virtio.h | 2 ++ > 5 files changed, 22 insertions(+) > > diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c > index 56128b9c46eb..a41abc8051b9 100644 > --- a/drivers/virtio/virtio_mmio.c > +++ b/drivers/virtio/virtio_mmio.c > @@ -390,6 +390,8 @@ static struct virtqueue *vm_setup_vq(struct virtio_device *vdev, unsigned index, > goto error_new_virtqueue; > } > > + vq->num_max = num; > + > /* Activate the queue */ > writel(virtqueue_get_vring_size(vq), vm_dev->base + VIRTIO_MMIO_QUEUE_NUM); > if (vm_dev->version == 1) { > diff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c > index 34141b9abe27..b68934fe6b5d 100644 > --- a/drivers/virtio/virtio_pci_legacy.c > +++ b/drivers/virtio/virtio_pci_legacy.c > @@ -135,6 +135,8 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, > if (!vq) > return ERR_PTR(-ENOMEM); > > + vq->num_max = num; > + > q_pfn = virtqueue_get_desc_addr(vq) >> VIRTIO_PCI_QUEUE_ADDR_SHIFT; > if (q_pfn >> 32) { > dev_err(&vp_dev->pci_dev->dev, > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 5455bc041fb6..86d301f272b8 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -218,6 +218,8 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev, > if (!vq) > return ERR_PTR(-ENOMEM); > > + vq->num_max = num; > + > /* activate the queue */ > vp_modern_set_queue_size(mdev, index, virtqueue_get_vring_size(vq)); > vp_modern_queue_address(mdev, index, virtqueue_get_desc_addr(vq), > diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c > index 962f1477b1fa..b87130c8f312 100644 > --- a/drivers/virtio/virtio_ring.c > +++ b/drivers/virtio/virtio_ring.c > @@ -2371,6 +2371,20 @@ void vring_transport_features(struct virtio_device *vdev) > } > EXPORT_SYMBOL_GPL(vring_transport_features); > > +/** > + * virtqueue_get_vring_max_size - return the max size of the virtqueue's vring > + * @_vq: the struct virtqueue containing the vring of interest. > + * > + * Returns the max size of the vring. > + * > + * Unlike other operations, this need not be serialized. > + */ > +unsigned int virtqueue_get_vring_max_size(struct virtqueue *_vq) > +{ > + return _vq->num_max; > +} > +EXPORT_SYMBOL_GPL(virtqueue_get_vring_max_size); > + > /** > * virtqueue_get_vring_size - return the size of the virtqueue's vring > * @_vq: the struct virtqueue containing the vring of interest. > diff --git a/include/linux/virtio.h b/include/linux/virtio.h > index 72292a62cd90..d59adc4be068 100644 > --- a/include/linux/virtio.h > +++ b/include/linux/virtio.h > @@ -31,6 +31,7 @@ struct virtqueue { > struct virtio_device *vdev; > unsigned int index; > unsigned int num_free; > + unsigned int num_max; > void *priv; > }; > > @@ -80,6 +81,7 @@ bool virtqueue_enable_cb_delayed(struct virtqueue *vq); > > void *virtqueue_detach_unused_buf(struct virtqueue *vq); > > +unsigned int virtqueue_get_vring_max_size(struct virtqueue *vq); > unsigned int virtqueue_get_vring_size(struct virtqueue *vq); > > bool virtqueue_is_broken(struct virtqueue *vq);