{"id":1658308,"url":"http://patchwork.ozlabs.org/api/patches/1658308/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-30-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-30-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:25","name":"[v12,29/40] virtio_pci: extract the logic of active vq for modern pci","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"dda9f6f23ebda9104a87fceb15c7956ffe04ae5e","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-30-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/1658308/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658308/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=PQLrYFKu;\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 4LngZM5cj6z9s2R\n\tfor ; Wed, 20 Jul 2022 13:06:03 +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 1oE029-00HFHn-C6; Wed, 20 Jul 2022 03:05:57 +0000","from out30-56.freemail.mail.aliyun.com ([115.124.30.56])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE024-00HFAH-Rp\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:05:54 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJuslMh_1658286345)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:05:46 +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=7k/ewNl9L/TAwcD7Yb0xm+EzQ0APa74MdBXwuKpMVbo=; b=PQLrYFKusyVqIe\n\ty58J3j5Fj23Dg0Huky1conEWO+bF9/5VFyCLejSZz26HPOXfueeUjxW2fGh7bsT8WyyHTvluthMIj\n\to0GWHvhSETiamdmJ3zhcT6XJ7oz6MfhCD3nN0l91VukkZeAXg3eQSjZ4s5A+oDG1mNsvzO6JEgtrS\n\tCcbrsg2rCH+ja1TTYWPT08bFQmdinLiTNumT5hbAsLKQFvIMfrDHMo0FgDXVUC8cZhomUQDw3G8d2\n\tC5vDHBu3s4h9UPGWzydzriW7EfSCmi6u9KULFa4Mm0Urs4W2gC8o9DnoaBsRM9A5mHEbS9f7phYm0\n\tQXIZXYexTZlH0mtYWo1w==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045168;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=37;SR=0;TI=SMTPD_---0VJuslMh_1658286345;","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 29/40] virtio_pci: extract the logic of active vq for\n modern pci","Date":"Wed, 20 Jul 2022 11:04:25 +0800","Message-Id":"<20220720030436.79520-30-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_200553_089890_9C12DC2D ","X-CRM114-Status":"GOOD ( 11.28 )","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: Introduce vp_active_vq() to configure vring to backend\n after\n vq attach vring. And configure vq vector if necessary. Signed-off-by: Xuan\n Zhuo Acked-by: Jason Wang\n \n --- drivers/virtio/virtio_pci_modern.c | 46 ++++++++++++++++++ 1 file\n changed,\n 28 insertion [...]\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.56 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.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2)\n [115.124.30.56 listed in wl.mailspike.net]\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":"Introduce vp_active_vq() to configure vring to backend after vq attach\nvring. And configure vq vector if necessary.\n\nSigned-off-by: Xuan Zhuo \nAcked-by: Jason Wang \n---\n drivers/virtio/virtio_pci_modern.c | 46 ++++++++++++++++++------------\n 1 file changed, 28 insertions(+), 18 deletions(-)","diff":"diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c\nindex e7e0b8c850f6..9041d9a41b7d 100644\n--- a/drivers/virtio/virtio_pci_modern.c\n+++ b/drivers/virtio/virtio_pci_modern.c\n@@ -176,6 +176,29 @@ static void vp_reset(struct virtio_device *vdev)\n \tvp_synchronize_vectors(vdev);\n }\n \n+static int vp_active_vq(struct virtqueue *vq, u16 msix_vec)\n+{\n+\tstruct virtio_pci_device *vp_dev = to_vp_device(vq->vdev);\n+\tstruct virtio_pci_modern_device *mdev = &vp_dev->mdev;\n+\tunsigned long index;\n+\n+\tindex = vq->index;\n+\n+\t/* activate the queue */\n+\tvp_modern_set_queue_size(mdev, index, virtqueue_get_vring_size(vq));\n+\tvp_modern_queue_address(mdev, index, virtqueue_get_desc_addr(vq),\n+\t\t\t\tvirtqueue_get_avail_addr(vq),\n+\t\t\t\tvirtqueue_get_used_addr(vq));\n+\n+\tif (msix_vec != VIRTIO_MSI_NO_VECTOR) {\n+\t\tmsix_vec = vp_modern_queue_vector(mdev, index, msix_vec);\n+\t\tif (msix_vec == VIRTIO_MSI_NO_VECTOR)\n+\t\t\treturn -EBUSY;\n+\t}\n+\n+\treturn 0;\n+}\n+\n static u16 vp_config_vector(struct virtio_pci_device *vp_dev, u16 vector)\n {\n \treturn vp_modern_config_vector(&vp_dev->mdev, vector);\n@@ -220,32 +243,19 @@ static struct virtqueue *setup_vq(struct virtio_pci_device *vp_dev,\n \n \tvq->num_max = num;\n \n-\t/* activate the queue */\n-\tvp_modern_set_queue_size(mdev, index, virtqueue_get_vring_size(vq));\n-\tvp_modern_queue_address(mdev, index, virtqueue_get_desc_addr(vq),\n-\t\t\t\tvirtqueue_get_avail_addr(vq),\n-\t\t\t\tvirtqueue_get_used_addr(vq));\n+\terr = vp_active_vq(vq, msix_vec);\n+\tif (err)\n+\t\tgoto err;\n \n \tvq->priv = (void __force *)vp_modern_map_vq_notify(mdev, index, NULL);\n \tif (!vq->priv) {\n \t\terr = -ENOMEM;\n-\t\tgoto err_map_notify;\n-\t}\n-\n-\tif (msix_vec != VIRTIO_MSI_NO_VECTOR) {\n-\t\tmsix_vec = vp_modern_queue_vector(mdev, index, msix_vec);\n-\t\tif (msix_vec == VIRTIO_MSI_NO_VECTOR) {\n-\t\t\terr = -EBUSY;\n-\t\t\tgoto err_assign_vector;\n-\t\t}\n+\t\tgoto err;\n \t}\n \n \treturn vq;\n \n-err_assign_vector:\n-\tif (!mdev->notify_base)\n-\t\tpci_iounmap(mdev->pci_dev, (void __iomem __force *)vq->priv);\n-err_map_notify:\n+err:\n \tvring_del_virtqueue(vq);\n \treturn ERR_PTR(err);\n }\n","prefixes":["v12","29/40"]}