{"id":1658315,"url":"http://patchwork.ozlabs.org/api/patches/1658315/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-38-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-38-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:33","name":"[v12,37/40] virtio_net: split free_unused_bufs()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"37adf7a374e14f1d4e8e519eee138c97e89ffd3a","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-38-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/1658315/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658315/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=gS/ZfVXF;\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 4LngZg39tqz9s2R\n\tfor ; Wed, 20 Jul 2022 13:06:19 +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 1oE02P-00HFgc-Go; Wed, 20 Jul 2022 03:06:13 +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 1oE02M-00HFZm-Qe\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:06:12 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJuw0j3_1658286364)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:06:06 +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=kJF64XR8YlmAHKQrCFLPjxelPXECF6wB6WjRfQg92/s=; b=gS/ZfVXF8EVFkJ\n\tGxXt2O5XEvKVnWHvc9V7VMcIpv2k4fYQlpSnIbhbNel501n39FGxsFDFJZoBbW5m64iIJBRUTdZq6\n\tPC4ntonl4iXehSvlfpKB5g1QDmQtqUHBUEHiKzkYaUxznxtODdDrgrjUstvmYOXVimEwxEt31zFiX\n\tdu1ZP9iPxsHm3rieztJSysZi5wRDzhpCqMR6D+OdBAVDfvHuMd5m+OT/UP2PgPlphuCks9w2HoOEY\n\tVI+kK56WA7t3bkAqIFmDNiYUcm7y7kC7GrN5IzSdHd2+Fk0ROSffOFCOjmgF1QHy8hy3q01TQipad\n\tmQP0Tv7/Vn9irwVUFXjQ==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R841e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018045170;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=37;SR=0;TI=SMTPD_---0VJuw0j3_1658286364;","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 37/40] virtio_net: split free_unused_bufs()","Date":"Wed, 20 Jul 2022 11:04:33 +0800","Message-Id":"<20220720030436.79520-38-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_200611_050777_7C380C12 ","X-CRM114-Status":"GOOD ( 10.44 )","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: This patch separates two functions for freeing sq buf and\n rq buf from free_unused_bufs(). When supporting the enable/disable tx/rq\n queue\n in the future, it is necessary to support separate recovery of a sq buf or\n a rq buf.\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":"This patch separates two functions for freeing sq buf and rq buf from\nfree_unused_bufs().\n\nWhen supporting the enable/disable tx/rq queue in the future, it is\nnecessary to support separate recovery of a sq buf or a rq buf.\n\nSigned-off-by: Xuan Zhuo \nAcked-by: Jason Wang \n---\n drivers/net/virtio_net.c | 41 ++++++++++++++++++++++++----------------\n 1 file changed, 25 insertions(+), 16 deletions(-)","diff":"diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c\nindex 981ef8ea4d58..fe4dc43c05a1 100644\n--- a/drivers/net/virtio_net.c\n+++ b/drivers/net/virtio_net.c\n@@ -3151,6 +3151,27 @@ static void free_receive_page_frags(struct virtnet_info *vi)\n \t\t\tput_page(vi->rq[i].alloc_frag.page);\n }\n \n+static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf)\n+{\n+\tif (!is_xdp_frame(buf))\n+\t\tdev_kfree_skb(buf);\n+\telse\n+\t\txdp_return_frame(ptr_to_xdp(buf));\n+}\n+\n+static void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf)\n+{\n+\tstruct virtnet_info *vi = vq->vdev->priv;\n+\tint i = vq2rxq(vq);\n+\n+\tif (vi->mergeable_rx_bufs)\n+\t\tput_page(virt_to_head_page(buf));\n+\telse if (vi->big_packets)\n+\t\tgive_pages(&vi->rq[i], buf);\n+\telse\n+\t\tput_page(virt_to_head_page(buf));\n+}\n+\n static void free_unused_bufs(struct virtnet_info *vi)\n {\n \tvoid *buf;\n@@ -3158,26 +3179,14 @@ static void free_unused_bufs(struct virtnet_info *vi)\n \n \tfor (i = 0; i < vi->max_queue_pairs; i++) {\n \t\tstruct virtqueue *vq = vi->sq[i].vq;\n-\t\twhile ((buf = virtqueue_detach_unused_buf(vq)) != NULL) {\n-\t\t\tif (!is_xdp_frame(buf))\n-\t\t\t\tdev_kfree_skb(buf);\n-\t\t\telse\n-\t\t\t\txdp_return_frame(ptr_to_xdp(buf));\n-\t\t}\n+\t\twhile ((buf = virtqueue_detach_unused_buf(vq)) != NULL)\n+\t\t\tvirtnet_sq_free_unused_buf(vq, buf);\n \t}\n \n \tfor (i = 0; i < vi->max_queue_pairs; i++) {\n \t\tstruct virtqueue *vq = vi->rq[i].vq;\n-\n-\t\twhile ((buf = virtqueue_detach_unused_buf(vq)) != NULL) {\n-\t\t\tif (vi->mergeable_rx_bufs) {\n-\t\t\t\tput_page(virt_to_head_page(buf));\n-\t\t\t} else if (vi->big_packets) {\n-\t\t\t\tgive_pages(&vi->rq[i], buf);\n-\t\t\t} else {\n-\t\t\t\tput_page(virt_to_head_page(buf));\n-\t\t\t}\n-\t\t}\n+\t\twhile ((buf = virtqueue_detach_unused_buf(vq)) != NULL)\n+\t\t\tvirtnet_rq_free_unused_buf(vq, buf);\n \t}\n }\n \n","prefixes":["v12","37/40"]}