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 D1BE3C4332F for ; Tue, 8 Mar 2022 13:13:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241975AbiCHNO0 (ORCPT ); Tue, 8 Mar 2022 08:14:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239630AbiCHNOZ (ORCPT ); Tue, 8 Mar 2022 08:14:25 -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 C93A031511 for ; Tue, 8 Mar 2022 05:13:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646745206; 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=TFIIsV6xf+S0UEWrtwaMoEgM3YQfdJSczMHcKL/I9IM=; b=Rs0qd956hsvjYA6qc11ZMAfvLqmPhkIgBY8d1WtDuMaGYxQ47EFqO0IANznl82dReKmIFN a5CV/LcaKBJkcNo2SlyQOwFl4eRYszsXaBNHNFY6w4LDqCwF3x5fmEbUoSunknh61aU6I5 07+sXLdNllvBgHFXAZoG+k/xGxQiyhg= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-454-AkQKPxc1NOulipfcEl2dGA-1; Tue, 08 Mar 2022 08:13:25 -0500 X-MC-Unique: AkQKPxc1NOulipfcEl2dGA-1 Received: by mail-ed1-f70.google.com with SMTP id cm27-20020a0564020c9b00b004137effc24bso10595554edb.10 for ; Tue, 08 Mar 2022 05:13:25 -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=TFIIsV6xf+S0UEWrtwaMoEgM3YQfdJSczMHcKL/I9IM=; b=7xI47i3GvVoQanOokWMuLoHoMLEtG6/Di0oF13HvzmUUI0Z+UriuGiYs63v+yFz65E yq/7aNjLT2AANTbNHDBkfoaxXHbVOaMAl+ptrvjFJHeOYJTgtCYHM7XdxFmunfWC0Lvt 3B+OEDoRgHXmj5YVpHW5NBbVQ7ypFg1OJ59cK3h1F3h8YAih73usl3iUgt+857ZH8sln BrHEwIJxvsMku5k1m5srlL5ixR9NhSOzOSbV3OnhZHxCLeUPFrzMF7Zji/fxnHZ5eXj7 97AQY283T7aw59mrl0CEvbWtpB6XIrqui08GETgc7321yV4qj5b3kZxEk0zkDkIet2Lo bpKw== X-Gm-Message-State: AOAM5302c3DicPyhuC1fmfE7oq2J11lWeM3qew0Ynym7QD+q+l4xhbVj tDnujWi2GWNWil77jwzr0N3XuijV4sK6hIx1WdW1aHH4DUrnnm1BwIBvse0lOOxGyb2GwupadN4 xVQaLI5YUSfobG1EF2upSrA== X-Received: by 2002:a50:fd8e:0:b0:415:fe34:f03 with SMTP id o14-20020a50fd8e000000b00415fe340f03mr16011181edt.310.1646745204336; Tue, 08 Mar 2022 05:13:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJzSKnu6K/NfFAzTqzK33mk/s1Pj3nnEXeXgvcjdorQuXqCcPMBlODVSeHgfeXrL76lGr2ehtQ== X-Received: by 2002:a50:fd8e:0:b0:415:fe34:f03 with SMTP id o14-20020a50fd8e000000b00415fe340f03mr16011160edt.310.1646745204085; Tue, 08 Mar 2022 05:13:24 -0800 (PST) Received: from ?IPV6:2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1? (2001-1c00-0c1e-bf00-1db8-22d3-1bc9-8ca1.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:1db8:22d3:1bc9:8ca1]) by smtp.gmail.com with ESMTPSA id z23-20020a170906435700b006b0e62bee84sm5807047ejm.115.2022.03.08.05.13.22 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 08 Mar 2022 05:13:23 -0800 (PST) Message-ID: Date: Tue, 8 Mar 2022 14:13:22 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.4.0 Subject: Re: [PATCH v7 18/26] virtio: find_vqs() add arg sizes 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" , Jason Wang , "David S. Miller" , Jakub Kicinski , 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-19-xuanzhuo@linux.alibaba.com> From: Hans de Goede In-Reply-To: <20220308123518.33800-19-xuanzhuo@linux.alibaba.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-s390@vger.kernel.org Hi, On 3/8/22 13:35, Xuan Zhuo wrote: > find_vqs() adds a new parameter sizes to specify the size of each vq > vring. > > 0 means use the maximum size supported by the backend. > > In the split scenario, the meaning of size is the largest size, because > it may be limited by memory, the virtio core will try a smaller size. > And the size is power of 2. > > Signed-off-by: Xuan Zhuo > --- > arch/um/drivers/virtio_uml.c | 2 +- > drivers/platform/mellanox/mlxbf-tmfifo.c | 3 ++- > drivers/remoteproc/remoteproc_virtio.c | 2 +- > drivers/s390/virtio/virtio_ccw.c | 2 +- > drivers/virtio/virtio_mmio.c | 2 +- > drivers/virtio/virtio_pci_common.c | 2 +- > drivers/virtio/virtio_pci_common.h | 2 +- > drivers/virtio/virtio_pci_modern.c | 5 +++-- > drivers/virtio/virtio_vdpa.c | 2 +- > include/linux/virtio_config.h | 11 +++++++---- > 10 files changed, 19 insertions(+), 14 deletions(-) I assume this will be merged through the virtio tree, here is my ack for merging the drivers/platform/mellanox/ part through the virtio tree: Acked-by: Hans de Goede Regards, Hans > > diff --git a/arch/um/drivers/virtio_uml.c b/arch/um/drivers/virtio_uml.c > index ba562d68dc04..055b91ccbe8a 100644 > --- a/arch/um/drivers/virtio_uml.c > +++ b/arch/um/drivers/virtio_uml.c > @@ -998,7 +998,7 @@ static struct virtqueue *vu_setup_vq(struct virtio_device *vdev, > static int vu_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_uml_device *vu_dev = to_virtio_uml_device(vdev); > int i, queue_idx = 0, rc; > diff --git a/drivers/platform/mellanox/mlxbf-tmfifo.c b/drivers/platform/mellanox/mlxbf-tmfifo.c > index 38800e86ed8a..aea7aa218b22 100644 > --- a/drivers/platform/mellanox/mlxbf-tmfifo.c > +++ b/drivers/platform/mellanox/mlxbf-tmfifo.c > @@ -929,7 +929,8 @@ static int mlxbf_tmfifo_virtio_find_vqs(struct virtio_device *vdev, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, > + u32 sizes[]) > { > struct mlxbf_tmfifo_vdev *tm_vdev = mlxbf_vdev_to_tmfifo(vdev); > struct mlxbf_tmfifo_vring *vring; > diff --git a/drivers/remoteproc/remoteproc_virtio.c b/drivers/remoteproc/remoteproc_virtio.c > index 70ab496d0431..3a167bec5b09 100644 > --- a/drivers/remoteproc/remoteproc_virtio.c > +++ b/drivers/remoteproc/remoteproc_virtio.c > @@ -157,7 +157,7 @@ static int rproc_virtio_find_vqs(struct virtio_device *vdev, unsigned int nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool * ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > int i, ret, queue_idx = 0; > > diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c > index d35e7a3f7067..b74e08c71534 100644 > --- a/drivers/s390/virtio/virtio_ccw.c > +++ b/drivers/s390/virtio/virtio_ccw.c > @@ -632,7 +632,7 @@ static int virtio_ccw_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_ccw_device *vcdev = to_vc_device(vdev); > unsigned long *indicatorp = NULL; > diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c > index a41abc8051b9..55d575f6ef2d 100644 > --- a/drivers/virtio/virtio_mmio.c > +++ b/drivers/virtio/virtio_mmio.c > @@ -462,7 +462,7 @@ static int vm_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_mmio_device *vm_dev = to_virtio_mmio_device(vdev); > int irq = platform_get_irq(vm_dev->pdev, 0); > diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c > index 863d3a8a0956..8e8fa7e5ad80 100644 > --- a/drivers/virtio/virtio_pci_common.c > +++ b/drivers/virtio/virtio_pci_common.c > @@ -428,7 +428,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned nvqs, > int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > int err; > > diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h > index 23f6c5c678d5..9dbf1d555dff 100644 > --- a/drivers/virtio/virtio_pci_common.h > +++ b/drivers/virtio/virtio_pci_common.h > @@ -114,7 +114,7 @@ void vp_del_vqs(struct virtio_device *vdev); > int vp_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc); > + struct irq_affinity *desc, u32 sizes[]); > const char *vp_bus_name(struct virtio_device *vdev); > > /* Setup the affinity for a virtqueue: > diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c > index 3c67d3607802..342795175c29 100644 > --- a/drivers/virtio/virtio_pci_modern.c > +++ b/drivers/virtio/virtio_pci_modern.c > @@ -343,11 +343,12 @@ static int vp_modern_find_vqs(struct virtio_device *vdev, unsigned nvqs, > struct virtqueue *vqs[], > vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_pci_device *vp_dev = to_vp_device(vdev); > struct virtqueue *vq; > - int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, desc); > + int rc = vp_find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, desc, > + sizes); > > if (rc) > return rc; > diff --git a/drivers/virtio/virtio_vdpa.c b/drivers/virtio/virtio_vdpa.c > index 7767a7f0119b..ee08d01ee8b1 100644 > --- a/drivers/virtio/virtio_vdpa.c > +++ b/drivers/virtio/virtio_vdpa.c > @@ -268,7 +268,7 @@ static int virtio_vdpa_find_vqs(struct virtio_device *vdev, unsigned nvqs, > vq_callback_t *callbacks[], > const char * const names[], > const bool *ctx, > - struct irq_affinity *desc) > + struct irq_affinity *desc, u32 sizes[]) > { > struct virtio_vdpa_device *vd_dev = to_virtio_vdpa_device(vdev); > struct vdpa_device *vdpa = vd_get_vdpa(vdev); > diff --git a/include/linux/virtio_config.h b/include/linux/virtio_config.h > index 0b81fbe17c85..5157524d8036 100644 > --- a/include/linux/virtio_config.h > +++ b/include/linux/virtio_config.h > @@ -57,6 +57,7 @@ struct virtio_shm_region { > * include a NULL entry for vqs that do not need a callback > * names: array of virtqueue names (mainly for debugging) > * include a NULL entry for vqs unused by driver > + * sizes: array of virtqueue sizes > * Returns 0 on success or error status > * @del_vqs: free virtqueues found by find_vqs(). > * @get_features: get the array of feature bits for this device. > @@ -98,7 +99,8 @@ struct virtio_config_ops { > int (*find_vqs)(struct virtio_device *, unsigned nvqs, > struct virtqueue *vqs[], vq_callback_t *callbacks[], > const char * const names[], const bool *ctx, > - struct irq_affinity *desc); > + struct irq_affinity *desc, > + u32 sizes[]); > void (*del_vqs)(struct virtio_device *); > u64 (*get_features)(struct virtio_device *vdev); > int (*finalize_features)(struct virtio_device *vdev); > @@ -205,7 +207,7 @@ struct virtqueue *virtio_find_single_vq(struct virtio_device *vdev, > const char *names[] = { n }; > struct virtqueue *vq; > int err = vdev->config->find_vqs(vdev, 1, &vq, callbacks, names, NULL, > - NULL); > + NULL, NULL); > if (err < 0) > return ERR_PTR(err); > return vq; > @@ -217,7 +219,8 @@ int virtio_find_vqs(struct virtio_device *vdev, unsigned nvqs, > const char * const names[], > struct irq_affinity *desc) > { > - return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, desc); > + return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, NULL, > + desc, NULL); > } > > static inline > @@ -227,7 +230,7 @@ int virtio_find_vqs_ctx(struct virtio_device *vdev, unsigned nvqs, > struct irq_affinity *desc) > { > return vdev->config->find_vqs(vdev, nvqs, vqs, callbacks, names, ctx, > - desc); > + desc, NULL); > } > > /**