{"id":1658294,"url":"http://patchwork.ozlabs.org/api/patches/1658294/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-17-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-17-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:12","name":"[v12,16/40] virtio_ring: packed: extract the logic of alloc queue","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"5707ecc771b6509225a5d558cbce0562dda61ed5","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-17-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/1658294/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658294/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=xisVrWRL;\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 4LngYk1JHsz9s2R\n\tfor ; Wed, 20 Jul 2022 13:05:30 +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 1oE01c-00HEgK-5M; Wed, 20 Jul 2022 03:05:24 +0000","from out30-54.freemail.mail.aliyun.com ([115.124.30.54])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE01Y-00HEYc-S7\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:05:22 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJux93S_1658286314)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:05:16 +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=BGn2ifCDtqhpaH9C1777PHqQL+2ZfBihncI/1DzgcIc=; b=xisVrWRL4DIbkV\n\tPkbKWxkmiwjNjQCEQ70OHX2z+gRQ+P6BfUX7YKkO85MqLfBVB+f5vvaLEQySZeliFhgVwZoQ42ICq\n\tvhmkDPhRlQOajieUWOjGgW/eyXdxWLZdy4xjhufr1pM3dzNvE52oICtrUtfcrARyZj09m+SnN3O9y\n\tXERpImz2LSHa87ZPfvX/cFXj19ulz6atVHFh6r+/wDQmXMJIcU0CImyWrqYroir1c6Jnwqplis+XW\n\t07ijeLsDSdvucRgmxqJceaYNlq3qIG7H4ueyo+BItCtsp0YuSpf2vxZ6AiqVwpITh5jC4tbzwTWeZ\n\tkCczkwY/SsX2CUV9hN7g==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R201e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=37;SR=0;TI=SMTPD_---0VJux93S_1658286314;","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 16/40] virtio_ring: packed: extract the logic of alloc\n queue","Date":"Wed, 20 Jul 2022 11:04:12 +0800","Message-Id":"<20220720030436.79520-17-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_200521_104013_7BC07205 ","X-CRM114-Status":"GOOD ( 10.40 )","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: Separate the logic of packed to create vring queue. For the\n convenience of passing parameters,\n add a structure vring_packed. This feature\n is required for subsequent virtuqueue reset vring.\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.54 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":"Separate the logic of packed to create vring queue.\n\nFor the convenience of passing parameters, add a structure\nvring_packed.\n\nThis feature is required for subsequent virtuqueue reset vring.\n\nSigned-off-by: Xuan Zhuo \n---\n drivers/virtio/virtio_ring.c | 80 +++++++++++++++++++++++-------------\n 1 file changed, 51 insertions(+), 29 deletions(-)","diff":"diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c\nindex 207a2b57270c..a495f1cb7fe4 100644\n--- a/drivers/virtio/virtio_ring.c\n+++ b/drivers/virtio/virtio_ring.c\n@@ -1854,19 +1854,10 @@ static void vring_free_packed(struct vring_virtqueue_packed *vring_packed,\n \tkfree(vring_packed->desc_extra);\n }\n \n-static struct virtqueue *vring_create_virtqueue_packed(\n-\tunsigned int index,\n-\tunsigned int num,\n-\tunsigned int vring_align,\n-\tstruct virtio_device *vdev,\n-\tbool weak_barriers,\n-\tbool may_reduce_num,\n-\tbool context,\n-\tbool (*notify)(struct virtqueue *),\n-\tvoid (*callback)(struct virtqueue *),\n-\tconst char *name)\n+static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,\n+\t\t\t\t struct virtio_device *vdev,\n+\t\t\t\t u32 num)\n {\n-\tstruct vring_virtqueue *vq;\n \tstruct vring_packed_desc *ring;\n \tstruct vring_packed_desc_event *driver, *device;\n \tdma_addr_t ring_dma_addr, driver_event_dma_addr, device_event_dma_addr;\n@@ -1878,7 +1869,11 @@ static struct virtqueue *vring_create_virtqueue_packed(\n \t\t\t\t &ring_dma_addr,\n \t\t\t\t GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);\n \tif (!ring)\n-\t\tgoto err_ring;\n+\t\tgoto err;\n+\n+\tvring_packed->vring.desc = ring;\n+\tvring_packed->ring_dma_addr = ring_dma_addr;\n+\tvring_packed->ring_size_in_bytes = ring_size_in_bytes;\n \n \tevent_size_in_bytes = sizeof(struct vring_packed_desc_event);\n \n@@ -1886,13 +1881,47 @@ static struct virtqueue *vring_create_virtqueue_packed(\n \t\t\t\t &driver_event_dma_addr,\n \t\t\t\t GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);\n \tif (!driver)\n-\t\tgoto err_driver;\n+\t\tgoto err;\n+\n+\tvring_packed->vring.driver = driver;\n+\tvring_packed->event_size_in_bytes = event_size_in_bytes;\n+\tvring_packed->driver_event_dma_addr = driver_event_dma_addr;\n \n \tdevice = vring_alloc_queue(vdev, event_size_in_bytes,\n \t\t\t\t &device_event_dma_addr,\n \t\t\t\t GFP_KERNEL|__GFP_NOWARN|__GFP_ZERO);\n \tif (!device)\n-\t\tgoto err_device;\n+\t\tgoto err;\n+\n+\tvring_packed->vring.device = device;\n+\tvring_packed->device_event_dma_addr = device_event_dma_addr;\n+\n+\tvring_packed->vring.num = num;\n+\n+\treturn 0;\n+\n+err:\n+\tvring_free_packed(vring_packed, vdev);\n+\treturn -ENOMEM;\n+}\n+\n+static struct virtqueue *vring_create_virtqueue_packed(\n+\tunsigned int index,\n+\tunsigned int num,\n+\tunsigned int vring_align,\n+\tstruct virtio_device *vdev,\n+\tbool weak_barriers,\n+\tbool may_reduce_num,\n+\tbool context,\n+\tbool (*notify)(struct virtqueue *),\n+\tvoid (*callback)(struct virtqueue *),\n+\tconst char *name)\n+{\n+\tstruct vring_virtqueue_packed vring_packed = {};\n+\tstruct vring_virtqueue *vq;\n+\n+\tif (vring_alloc_queue_packed(&vring_packed, vdev, num))\n+\t\tgoto err_ring;\n \n \tvq = kmalloc(sizeof(*vq), GFP_KERNEL);\n \tif (!vq)\n@@ -1915,17 +1944,14 @@ static struct virtqueue *vring_create_virtqueue_packed(\n \tvq->indirect = virtio_has_feature(vdev, VIRTIO_RING_F_INDIRECT_DESC) &&\n \t\t!context;\n \n-\tvq->packed.ring_dma_addr = ring_dma_addr;\n-\tvq->packed.driver_event_dma_addr = driver_event_dma_addr;\n-\tvq->packed.device_event_dma_addr = device_event_dma_addr;\n+\tvq->packed.ring_dma_addr = vring_packed.ring_dma_addr;\n+\tvq->packed.driver_event_dma_addr = vring_packed.driver_event_dma_addr;\n+\tvq->packed.device_event_dma_addr = vring_packed.device_event_dma_addr;\n \n-\tvq->packed.ring_size_in_bytes = ring_size_in_bytes;\n-\tvq->packed.event_size_in_bytes = event_size_in_bytes;\n+\tvq->packed.ring_size_in_bytes = vring_packed.ring_size_in_bytes;\n+\tvq->packed.event_size_in_bytes = vring_packed.event_size_in_bytes;\n \n-\tvq->packed.vring.num = num;\n-\tvq->packed.vring.desc = ring;\n-\tvq->packed.vring.driver = driver;\n-\tvq->packed.vring.device = device;\n+\tvq->packed.vring = vring_packed.vring;\n \n \tvq->packed.next_avail_idx = 0;\n \tvq->packed.avail_wrap_counter = 1;\n@@ -1964,11 +1990,7 @@ static struct virtqueue *vring_create_virtqueue_packed(\n err_desc_state:\n \tkfree(vq);\n err_vq:\n-\tvring_free_queue(vdev, event_size_in_bytes, device, device_event_dma_addr);\n-err_device:\n-\tvring_free_queue(vdev, event_size_in_bytes, driver, driver_event_dma_addr);\n-err_driver:\n-\tvring_free_queue(vdev, ring_size_in_bytes, ring, ring_dma_addr);\n+\tvring_free_packed(&vring_packed, vdev);\n err_ring:\n \treturn NULL;\n }\n","prefixes":["v12","16/40"]}