{"id":1658317,"url":"http://patchwork.ozlabs.org/api/patches/1658317/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-40-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-40-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:35","name":"[v12,39/40] virtio_net: support tx queue resize","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"c9bfc2a3759450693704fe54af27400c932c00f1","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-40-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/1658317/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658317/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=Dxbc75jL;\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 4LngZm2qL4z9s2R\n\tfor ; Wed, 20 Jul 2022 13:06:24 +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 1oE02U-00HFqC-4r; Wed, 20 Jul 2022 03:06:18 +0000","from out30-42.freemail.mail.aliyun.com ([115.124.30.42])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE02R-00HFkV-RK\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:06:17 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJuw0kQ_1658286369)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:06:10 +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=2YXPykF9dpuJ6TZ91U+HiK1sZPRpfAE1yjKXJu5SENg=; b=Dxbc75jLcKLiMh\n\tjQadMysRzhyQRnwxA2QoBPu3yc1ziRUwYgIg9bmTopXDbgNTPfkYjytitknaYrTWP9ydzQYC+GQZw\n\ttIhdwJxXKhR2W/9WGYketwZ2bWeiZjIfjAoDFFSd0SmCuY1Mpm6RFWaTNr5ZIU79Hth/llDYseRF0\n\t15fHQCjc608aTJXN2csfcmGCLsDWoioMtibAD9vZ0MwTEY+OtSLODm4z4ieIn2h761y5ceIgy10ek\n\tLfBMJUpNLzCZXhaMhz2UsXmzeVFMa/JQ5FhPfDAA3jIg8oLVvt3shaLw9vI2x0UReLT/a0Eu/BraV\n\tSIph0TFRDvD6oawcXPFg==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046049;MF=xuanzhuo@linux.alibaba.com;NM=1;PH=DS;RN=37;SR=0;TI=SMTPD_---0VJuw0kQ_1658286369;","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 39/40] virtio_net: support tx queue resize","Date":"Wed, 20 Jul 2022 11:04:35 +0800","Message-Id":"<20220720030436.79520-40-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_200616_078979_8DDCE5A7 ","X-CRM114-Status":"GOOD ( 12.70 )","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 implements the resize function of the tx queues.\n Based on this function,\n it is possible to modify the ring num of the queue.\n Signed-off-by: Xuan Zhuo ---\n drivers/net/virtio_net.c\n | 47 ++++++++++++++++++++++++++++++++++++++++ 1 file changed,\n 47 insertions(+) \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.42 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 implements the resize function of the tx queues.\nBased on this function, it is possible to modify the ring num of the\nqueue.\n\nSigned-off-by: Xuan Zhuo \n---\n drivers/net/virtio_net.c | 47 ++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 47 insertions(+)","diff":"diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c\nindex 1115a8b59a08..d1e6940b46d8 100644\n--- a/drivers/net/virtio_net.c\n+++ b/drivers/net/virtio_net.c\n@@ -135,6 +135,9 @@ struct send_queue {\n \tstruct virtnet_sq_stats stats;\n \n \tstruct napi_struct napi;\n+\n+\t/* Record whether sq is in reset state. */\n+\tbool reset;\n };\n \n /* Internal representation of a receive virtqueue */\n@@ -279,6 +282,7 @@ struct padded_vnet_hdr {\n };\n \n static void virtnet_rq_free_unused_buf(struct virtqueue *vq, void *buf);\n+static void virtnet_sq_free_unused_buf(struct virtqueue *vq, void *buf);\n \n static bool is_xdp_frame(void *ptr)\n {\n@@ -1603,6 +1607,11 @@ static void virtnet_poll_cleantx(struct receive_queue *rq)\n \t\treturn;\n \n \tif (__netif_tx_trylock(txq)) {\n+\t\tif (sq->reset) {\n+\t\t\t__netif_tx_unlock(txq);\n+\t\t\treturn;\n+\t\t}\n+\n \t\tdo {\n \t\t\tvirtqueue_disable_cb(sq->vq);\n \t\t\tfree_old_xmit_skbs(sq, true);\n@@ -1868,6 +1877,44 @@ static int virtnet_rx_resize(struct virtnet_info *vi,\n \treturn err;\n }\n \n+static int virtnet_tx_resize(struct virtnet_info *vi,\n+\t\t\t struct send_queue *sq, u32 ring_num)\n+{\n+\tstruct netdev_queue *txq;\n+\tint err, qindex;\n+\n+\tqindex = sq - vi->sq;\n+\n+\tvirtnet_napi_tx_disable(&sq->napi);\n+\n+\ttxq = netdev_get_tx_queue(vi->dev, qindex);\n+\n+\t/* 1. wait all ximt complete\n+\t * 2. fix the race of netif_stop_subqueue() vs netif_start_subqueue()\n+\t */\n+\t__netif_tx_lock_bh(txq);\n+\n+\t/* Prevent rx poll from accessing sq. */\n+\tsq->reset = true;\n+\n+\t/* Prevent the upper layer from trying to send packets. */\n+\tnetif_stop_subqueue(vi->dev, qindex);\n+\n+\t__netif_tx_unlock_bh(txq);\n+\n+\terr = virtqueue_resize(sq->vq, ring_num, virtnet_sq_free_unused_buf);\n+\tif (err)\n+\t\tnetdev_err(vi->dev, \"resize tx fail: tx queue index: %d err: %d\\n\", qindex, err);\n+\n+\t__netif_tx_lock_bh(txq);\n+\tsq->reset = false;\n+\tnetif_tx_wake_queue(txq);\n+\t__netif_tx_unlock_bh(txq);\n+\n+\tvirtnet_napi_tx_enable(vi, sq->vq, &sq->napi);\n+\treturn err;\n+}\n+\n /*\n * Send command via the control virtqueue and check status. Commands\n * supported by the hypervisor, as indicated by feature bits, should\n","prefixes":["v12","39/40"]}