{"id":1658312,"url":"http://patchwork.ozlabs.org/api/patches/1658312/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-33-xuanzhuo@linux.alibaba.com/","project":{"id":60,"url":"http://patchwork.ozlabs.org/api/projects/60/?format=json","name":"User-mode Linux Development","link_name":"linux-um","list_id":"linux-um.lists.infradead.org","list_email":"linux-um@lists.infradead.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20220720030436.79520-33-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:28","name":"[v12,32/40] virtio_pci: support the arg sizes of find_vqs()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"11866b4f5324299840393cbe40e2ee2bf06726c5","submitter":{"id":80519,"url":"http://patchwork.ozlabs.org/api/people/80519/?format=json","name":"Xuan Zhuo","email":"xuanzhuo@linux.alibaba.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-33-xuanzhuo@linux.alibaba.com/mbox/","series":[{"id":310331,"url":"http://patchwork.ozlabs.org/api/series/310331/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/list/?series=310331","date":"2022-07-20T03:03:59","name":"virtio pci support VIRTIO_F_RING_RESET","version":12,"mbox":"http://patchwork.ozlabs.org/series/310331/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1658312/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658312/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["bilbo.ozlabs.org;\n\tdkim=pass (2048-bit key;\n secure) header.d=lists.infradead.org header.i=@lists.infradead.org\n header.a=rsa-sha256 header.s=bombadil.20210309 header.b=TMufKfrF;\n\tdkim-atps=neutral","ozlabs.org;\n spf=none (no SPF record) smtp.mailfrom=lists.infradead.org\n (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org;\n envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org;\n receiver=)"],"Received":["from bombadil.infradead.org (bombadil.infradead.org\n [IPv6:2607:7c80:54:3::133])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest\n SHA256)\n\t(No client certificate requested)\n\tby bilbo.ozlabs.org (Postfix) with ESMTPS id 4LngZb50NMz9s2R\n\tfor ; Wed, 20 Jul 2022 13:06:15 +1000 (AEST)","from localhost ([::1] helo=bombadil.infradead.org)\n\tby bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE02F-00HFQi-HS; Wed, 20 Jul 2022 03:06:03 +0000","from out30-44.freemail.mail.aliyun.com ([115.124.30.44])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE02C-00HFM8-OO\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:06:02 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJux9Fo_1658286352)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:05:54 +0800"],"DKIM-Signature":"v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:\n\tContent-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post:\n\tList-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:\n\tMessage-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=vHSOfK/Zg6j7bSG8xM6NXG1sl4l/aqnBrt2iHzbHjtQ=; b=TMufKfrFiIDjN+\n\tZ+BRrwagVeWtJMSmbEA1XLhXmrwCymTYuQ1Rn8eF+5QD861at9BtXYrWwL2MlCGqo7Hgmw6fb6MCH\n\t8SG39OZA/vTRMBJjwSO9Ddc1eWt0lAzbKW6DLu5ER54I0ZJ+RRd8skTBMNs4xO1GSaRo1KgMee/77\n\t5SrjJcXE+n/aj573BVp3pzS1I8zb4TBMNoe5uCYtvkmMUbAQldi+G0okFxb7q1t2UY5JDF0XIP/7S\n\tQIaxFRtBxG2c2Pbx9ZmIOdj5UCG+9mq1jtXEyeSckK3aQg/9ndGqJkv9yk01/wzzaYKHv0yWli3/k\n\thC0FHtkqi/NSEe3thsJg==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R851e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046060;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=37;SR=0;TI=SMTPD_---0VJux9Fo_1658286352;","From":"Xuan Zhuo ","To":"virtualization@lists.linux-foundation.org","Cc":"Richard Weinberger ,\n\tAnton Ivanov ,\n\tJohannes Berg ,\n\t\"Michael S. Tsirkin\" ,\n\tJason Wang ,\n\t\"David S. Miller\" ,\n\tEric Dumazet ,\n\tJakub Kicinski ,\n\tPaolo Abeni ,\n\tHans de Goede ,\n\tMark Gross ,\n\tVadim Pasternak ,\n\tBjorn Andersson ,\n\tMathieu Poirier ,\n\tCornelia Huck ,\n\tHalil Pasic ,\n\tEric Farman ,\n\tHeiko Carstens ,\n\tVasily Gorbik ,\n\tAlexander Gordeev ,\n\tChristian Borntraeger ,\n\tSven Schnelle ,\n\tAlexei Starovoitov ,\n\tDaniel Borkmann ,\n\tJesper Dangaard Brouer ,\n\tJohn Fastabend ,\n\tXuan Zhuo ,\n\tVincent Whitchurch ,\n\tlinux-um@lists.infradead.org,\n\tnetdev@vger.kernel.org,\n\tplatform-driver-x86@vger.kernel.org,\n\tlinux-remoteproc@vger.kernel.org,\n\tlinux-s390@vger.kernel.org,\n\tkvm@vger.kernel.org,\n\tbpf@vger.kernel.org,\n\tkangjie.xu@linux.alibaba.com","Subject":"[PATCH v12 32/40] virtio_pci: support the arg sizes of find_vqs()","Date":"Wed, 20 Jul 2022 11:04:28 +0800","Message-Id":"<20220720030436.79520-33-xuanzhuo@linux.alibaba.com>","X-Mailer":"git-send-email 2.31.0","In-Reply-To":"<20220720030436.79520-1-xuanzhuo@linux.alibaba.com>","References":"<20220720030436.79520-1-xuanzhuo@linux.alibaba.com>","MIME-Version":"1.0","X-Git-Hash":"366032b2ffac","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20220719_200600_988299_60E18DFE ","X-CRM114-Status":"GOOD ( 12.25 )","X-Spam-Score":"-8.0 (--------)","X-Spam-Report":"Spam detection software,\n running on the system \"bombadil.infradead.org\",\n has NOT identified this incoming email as spam. The original\n message has been attached to this so you can view it or label\n similar future email. If you have any questions, see\n the administrator of that system for details.\n Content preview: Virtio PCI supports new parameter sizes of find_vqs().\n Signed-off-by:\n Xuan Zhuo Acked-by: Jason Wang\n \n --- drivers/virtio/virtio_pci_common.c | 18 ++++++++++--------\n drivers/virtio/virtio_pci_common.h\n | 1 + [...]\n Content analysis details: (-8.0 points, 5.0 required)\n pts rule name description\n ---- ----------------------\n --------------------------------------------------\n -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,\n no trust\n [115.124.30.44 listed in list.dnswl.org]\n -0.0 SPF_PASS SPF: sender matches SPF record\n 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record\n -7.5 USER_IN_DEF_SPF_WL From: address is in the default SPF\n white-list\n -0.5 ENV_AND_HDR_SPF_MATCH Env and Hdr From used in default SPF WL\n Match\n 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay\n lines","X-BeenThere":"linux-um@lists.infradead.org","X-Mailman-Version":"2.1.34","Precedence":"list","List-Id":"","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"\"linux-um\" ","Errors-To":"linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"},"content":"Virtio PCI supports new parameter sizes of find_vqs().\n\nSigned-off-by: Xuan Zhuo \nAcked-by: Jason Wang \n---\n drivers/virtio/virtio_pci_common.c | 18 ++++++++++--------\n drivers/virtio/virtio_pci_common.h | 1 +\n drivers/virtio/virtio_pci_legacy.c | 6 +++++-\n drivers/virtio/virtio_pci_modern.c | 10 +++++++---\n 4 files changed, 23 insertions(+), 12 deletions(-)","diff":"diff --git a/drivers/virtio/virtio_pci_common.c b/drivers/virtio/virtio_pci_common.c\nindex 7ad734584823..00ad476a815d 100644\n--- a/drivers/virtio/virtio_pci_common.c\n+++ b/drivers/virtio/virtio_pci_common.c\n@@ -174,6 +174,7 @@ static int vp_request_msix_vectors(struct virtio_device *vdev, int nvectors,\n static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int index,\n \t\t\t\t void (*callback)(struct virtqueue *vq),\n \t\t\t\t const char *name,\n+\t\t\t\t u32 size,\n \t\t\t\t bool ctx,\n \t\t\t\t u16 msix_vec)\n {\n@@ -186,7 +187,7 @@ static struct virtqueue *vp_setup_vq(struct virtio_device *vdev, unsigned int in\n \tif (!info)\n \t\treturn ERR_PTR(-ENOMEM);\n \n-\tvq = vp_dev->setup_vq(vp_dev, info, index, callback, name, ctx,\n+\tvq = vp_dev->setup_vq(vp_dev, info, index, callback, name, size, ctx,\n \t\t\t msix_vec);\n \tif (IS_ERR(vq))\n \t\tgoto out_info;\n@@ -283,7 +284,7 @@ void vp_del_vqs(struct virtio_device *vdev)\n \n static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,\n \t\tstruct virtqueue *vqs[], vq_callback_t *callbacks[],\n-\t\tconst char * const names[], bool per_vq_vectors,\n+\t\tconst char * const names[], u32 sizes[], bool per_vq_vectors,\n \t\tconst bool *ctx,\n \t\tstruct irq_affinity *desc)\n {\n@@ -326,8 +327,8 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,\n \t\telse\n \t\t\tmsix_vec = VP_MSIX_VQ_VECTOR;\n \t\tvqs[i] = vp_setup_vq(vdev, queue_idx++, callbacks[i], names[i],\n-\t\t\t\t ctx ? ctx[i] : false,\n-\t\t\t\t msix_vec);\n+\t\t\t\t sizes ? sizes[i] : 0,\n+\t\t\t\t ctx ? ctx[i] : false, msix_vec);\n \t\tif (IS_ERR(vqs[i])) {\n \t\t\terr = PTR_ERR(vqs[i]);\n \t\t\tgoto error_find;\n@@ -357,7 +358,7 @@ static int vp_find_vqs_msix(struct virtio_device *vdev, unsigned int nvqs,\n \n static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,\n \t\tstruct virtqueue *vqs[], vq_callback_t *callbacks[],\n-\t\tconst char * const names[], const bool *ctx)\n+\t\tconst char * const names[], u32 sizes[], const bool *ctx)\n {\n \tstruct virtio_pci_device *vp_dev = to_vp_device(vdev);\n \tint i, err, queue_idx = 0;\n@@ -379,6 +380,7 @@ static int vp_find_vqs_intx(struct virtio_device *vdev, unsigned int nvqs,\n \t\t\tcontinue;\n \t\t}\n \t\tvqs[i] = vp_setup_vq(vdev, queue_idx++, callbacks[i], names[i],\n+\t\t\t\t sizes ? sizes[i] : 0,\n \t\t\t\t ctx ? ctx[i] : false,\n \t\t\t\t VIRTIO_MSI_NO_VECTOR);\n \t\tif (IS_ERR(vqs[i])) {\n@@ -402,15 +404,15 @@ int vp_find_vqs(struct virtio_device *vdev, unsigned int nvqs,\n \tint err;\n \n \t/* Try MSI-X with one vector per queue. */\n-\terr = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, true, ctx, desc);\n+\terr = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, sizes, true, ctx, desc);\n \tif (!err)\n \t\treturn 0;\n \t/* Fallback: MSI-X with one vector for config, one shared for queues. */\n-\terr = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, false, ctx, desc);\n+\terr = vp_find_vqs_msix(vdev, nvqs, vqs, callbacks, names, sizes, false, ctx, desc);\n \tif (!err)\n \t\treturn 0;\n \t/* Finally fall back to regular interrupts. */\n-\treturn vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, ctx);\n+\treturn vp_find_vqs_intx(vdev, nvqs, vqs, callbacks, names, sizes, ctx);\n }\n \n const char *vp_bus_name(struct virtio_device *vdev)\ndiff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h\nindex a5ff838b85a5..c0448378b698 100644\n--- a/drivers/virtio/virtio_pci_common.h\n+++ b/drivers/virtio/virtio_pci_common.h\n@@ -80,6 +80,7 @@ struct virtio_pci_device {\n \t\t\t\t unsigned int idx,\n \t\t\t\t void (*callback)(struct virtqueue *vq),\n \t\t\t\t const char *name,\n+\t\t\t\t u32 size,\n \t\t\t\t bool ctx,\n \t\t\t\t u16 msix_vec);\n \tvoid (*del_vq)(struct virtio_pci_vq_info *info);\ndiff --git a/drivers/virtio/virtio_pci_legacy.c b/drivers/virtio/virtio_pci_legacy.c\nindex 2257f1b3d8ae..d75e5c4e637f 100644\n--- a/drivers/virtio/virtio_pci_legacy.c\n+++ b/drivers/virtio/virtio_pci_legacy.c\n@@ -112,6 +112,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,\n \t\t\t\t unsigned int index,\n \t\t\t\t void (*callback)(struct virtqueue *vq),\n \t\t\t\t const char *name,\n+\t\t\t\t u32 size,\n \t\t\t\t bool ctx,\n \t\t\t\t u16 msix_vec)\n {\n@@ -125,10 +126,13 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,\n \tif (!num || vp_legacy_get_queue_enable(&vp_dev->ldev, index))\n \t\treturn ERR_PTR(-ENOENT);\n \n+\tif (!size || size > num)\n+\t\tsize = num;\n+\n \tinfo->msix_vector = msix_vec;\n \n \t/* create the vring */\n-\tvq = vring_create_virtqueue(index, num,\n+\tvq = vring_create_virtqueue(index, size,\n \t\t\t\t VIRTIO_PCI_VRING_ALIGN, &vp_dev->vdev,\n \t\t\t\t true, false, ctx,\n \t\t\t\t vp_notify, callback, name);\ndiff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c\nindex 19ec491d515a..11607bf71b40 100644\n--- a/drivers/virtio/virtio_pci_modern.c\n+++ b/drivers/virtio/virtio_pci_modern.c\n@@ -301,6 +301,7 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,\n \t\t\t\t unsigned int index,\n \t\t\t\t void (*callback)(struct virtqueue *vq),\n \t\t\t\t const char *name,\n+\t\t\t\t u32 size,\n \t\t\t\t bool ctx,\n \t\t\t\t u16 msix_vec)\n {\n@@ -318,15 +319,18 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,\n \tif (!num || vp_modern_get_queue_enable(mdev, index))\n \t\treturn ERR_PTR(-ENOENT);\n \n-\tif (num & (num - 1)) {\n-\t\tdev_warn(&vp_dev->pci_dev->dev, \"bad queue size %u\", num);\n+\tif (!size || size > num)\n+\t\tsize = num;\n+\n+\tif (size & (size - 1)) {\n+\t\tdev_warn(&vp_dev->pci_dev->dev, \"bad queue size %u\", size);\n \t\treturn ERR_PTR(-EINVAL);\n \t}\n \n \tinfo->msix_vector = msix_vec;\n \n \t/* create the vring */\n-\tvq = vring_create_virtqueue(index, num,\n+\tvq = vring_create_virtqueue(index, size,\n \t\t\t\t SMP_CACHE_BYTES, &vp_dev->vdev,\n \t\t\t\t true, true, ctx,\n \t\t\t\t vp_notify, callback, name);\n","prefixes":["v12","32/40"]}