{"id":1658296,"url":"http://patchwork.ozlabs.org/api/patches/1658296/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-18-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-18-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:13","name":"[v12,17/40] virtio_ring: packed: extract the logic of alloc state and extra","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"1cc1903fb1c899772e2dad04406ec9d44aab1754","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-18-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/1658296/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658296/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=L3JT+OQ4;\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 4LngYm4jJ5z9s2R\n\tfor ; Wed, 20 Jul 2022 13:05:32 +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 1oE01e-00HEjT-BX; Wed, 20 Jul 2022 03:05:26 +0000","from out30-132.freemail.mail.aliyun.com ([115.124.30.132])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE01b-00HEcP-93\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:05:24 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJuw0T4_1658286317)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:05:18 +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=5ce4UIxmZ74uQb+hwNpAmHPjjS0lSBayIWBIzcwgKUU=; b=L3JT+OQ4XmxgTs\n\tX5Dz3gOxjCSwRnBkpYzQOwyX7aTUeMLF106i2VDqo/U7bprQk82jDaccE5oyy6roBjaheT2PBEGGs\n\t6CrTnuEC5wydtiX0l62vIh/nnJYQR04BHo/BWxx/96b90MHvmPgsbv441Tbs9T9XDYn5aqlQDLfUL\n\twQ+Cu/Hz3XZpZjMKTDGx7qysSx115FqdzOf0iCQIY4yjGKVUja31UM5N3pQFlocDiHB2mUM3bzOQA\n\twDSknY0aX2EVvUwG8uxkHIyOlBlHgJ8rgXHBDWPtEfhOhKhsqd3FRO/NjzAexAkwW1xRwbY/gd74K\n\tFosue8K3b7gi6X0bvRgA==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R251e4;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_---0VJuw0T4_1658286317;","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 17/40] virtio_ring: packed: extract the logic of alloc\n state and extra","Date":"Wed, 20 Jul 2022 11:04:13 +0800","Message-Id":"<20220720030436.79520-18-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_200523_510641_75521601 ","X-CRM114-Status":"GOOD ( 10.82 )","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 for alloc desc_state and desc_extra,\n which\n will be called separately by subsequent patches. Use struct vring_packed\n to pass desc_state,\n desc_extra. Signed-off-by: Xuan Zhuo \n --- drivers/virtio/virtio_ring.c | 48 +++++++++++++++++++++++++ 1 file\n changed,\n 34 insertions(+), 14 deletions(-)\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.132 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 for alloc desc_state and desc_extra, which will\nbe called separately by subsequent patches.\n\nUse struct vring_packed to pass desc_state, desc_extra.\n\nSigned-off-by: Xuan Zhuo \n---\n drivers/virtio/virtio_ring.c | 48 +++++++++++++++++++++++++-----------\n 1 file changed, 34 insertions(+), 14 deletions(-)","diff":"diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c\nindex a495f1cb7fe4..1f8d6417b46a 100644\n--- a/drivers/virtio/virtio_ring.c\n+++ b/drivers/virtio/virtio_ring.c\n@@ -1905,6 +1905,33 @@ static int vring_alloc_queue_packed(struct vring_virtqueue_packed *vring_packed,\n \treturn -ENOMEM;\n }\n \n+static int vring_alloc_state_extra_packed(struct vring_virtqueue_packed *vring_packed)\n+{\n+\tstruct vring_desc_state_packed *state;\n+\tstruct vring_desc_extra *extra;\n+\tu32 num = vring_packed->vring.num;\n+\n+\tstate = kmalloc_array(num, sizeof(struct vring_desc_state_packed), GFP_KERNEL);\n+\tif (!state)\n+\t\tgoto err_desc_state;\n+\n+\tmemset(state, 0, num * sizeof(struct vring_desc_state_packed));\n+\n+\textra = vring_alloc_desc_extra(num);\n+\tif (!extra)\n+\t\tgoto err_desc_extra;\n+\n+\tvring_packed->desc_state = state;\n+\tvring_packed->desc_extra = extra;\n+\n+\treturn 0;\n+\n+err_desc_extra:\n+\tkfree(state);\n+err_desc_state:\n+\treturn -ENOMEM;\n+}\n+\n static struct virtqueue *vring_create_virtqueue_packed(\n \tunsigned int index,\n \tunsigned int num,\n@@ -1919,6 +1946,7 @@ static struct virtqueue *vring_create_virtqueue_packed(\n {\n \tstruct vring_virtqueue_packed vring_packed = {};\n \tstruct vring_virtqueue *vq;\n+\tint err;\n \n \tif (vring_alloc_queue_packed(&vring_packed, vdev, num))\n \t\tgoto err_ring;\n@@ -1958,21 +1986,15 @@ static struct virtqueue *vring_create_virtqueue_packed(\n \tvq->packed.event_flags_shadow = 0;\n \tvq->packed.avail_used_flags = 1 << VRING_PACKED_DESC_F_AVAIL;\n \n-\tvq->packed.desc_state = kmalloc_array(num,\n-\t\t\tsizeof(struct vring_desc_state_packed),\n-\t\t\tGFP_KERNEL);\n-\tif (!vq->packed.desc_state)\n-\t\tgoto err_desc_state;\n+\terr = vring_alloc_state_extra_packed(&vring_packed);\n+\tif (err)\n+\t\tgoto err_state_extra;\n \n-\tmemset(vq->packed.desc_state, 0,\n-\t\tnum * sizeof(struct vring_desc_state_packed));\n+\tvq->packed.desc_state = vring.desc_state;\n+\tvq->packed.desc_extra = vring.desc_extra;\n \n \tvirtqueue_init(vq, num);\n \n-\tvq->packed.desc_extra = vring_alloc_desc_extra(num);\n-\tif (!vq->packed.desc_extra)\n-\t\tgoto err_desc_extra;\n-\n \t/* No callback? Tell other side not to bother us. */\n \tif (!callback) {\n \t\tvq->packed.event_flags_shadow = VRING_PACKED_EVENT_FLAG_DISABLE;\n@@ -1985,9 +2007,7 @@ static struct virtqueue *vring_create_virtqueue_packed(\n \tspin_unlock(&vdev->vqs_list_lock);\n \treturn &vq->vq;\n \n-err_desc_extra:\n-\tkfree(vq->packed.desc_state);\n-err_desc_state:\n+err_state_extra:\n \tkfree(vq);\n err_vq:\n \tvring_free_packed(&vring_packed, vdev);\n","prefixes":["v12","17/40"]}