{"id":1658316,"url":"http://patchwork.ozlabs.org/api/patches/1658316/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-um/patch/20220720030436.79520-36-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-36-xuanzhuo@linux.alibaba.com>","list_archive_url":null,"date":"2022-07-20T03:04:31","name":"[v12,35/40] virtio_net: set the default max ring size by find_vqs()","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"ae6680e45b654b9f574a89a160dc1d866a3d8c67","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-36-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/1658316/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1658316/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=mR7idShJ;\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 4LngZj2J7Gz9s2R\n\tfor ; Wed, 20 Jul 2022 13:06:21 +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 1oE02K-00HFXf-TO; Wed, 20 Jul 2022 03:06:08 +0000","from out30-131.freemail.mail.aliyun.com ([115.124.30.131])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oE02H-00HFT0-PQ\n\tfor linux-um@lists.infradead.org; Wed, 20 Jul 2022 03:06:07 +0000","from localhost(mailfrom:xuanzhuo@linux.alibaba.com\n fp:SMTPD_---0VJuw0hf_1658286360)\n by smtp.aliyun-inc.com;\n Wed, 20 Jul 2022 11:06:01 +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=TuNexpQ2t4dilLxqZQ3QqKcB7SfOd5AAPG6+isUTF2M=; b=mR7idShJsfAKPP\n\thNYmqwASMhApvzjcTeN7e4juhX+p5B125M/nliLxTq5p0K6S/Kfn2+oV/5MARKUFOl7U7TGfaKQNu\n\tvnuwZRY6GK772hCtjv/BwJiVJjoilA8W3lSKkOGlSo57hIUtU7Eps1YacONyarRzcIISdZ63cEs8i\n\tjz/7LOVZEuU2Cn7wIq2Dtky6i05InwfbPL5l+otf24ArUQQ+WHrfoe2IL6Tvyn1LnIONxqvXHLamx\n\t8v5tEEGk1cWiIcsqdGOsD8ksGLMsIrbhJlOXcBxZUSjyBszKRC5m97jqBeCZwJaiQgW669F8ln6W5\n\tfjJalJCKMbex5zBpAMMw==;","X-Alimail-AntiSpam":"\n AC=PASS;BC=-1|-1;BR=01201311R751e4;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_---0VJuw0hf_1658286360;","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 35/40] virtio_net: set the default max ring size by\n find_vqs()","Date":"Wed, 20 Jul 2022 11:04:31 +0800","Message-Id":"<20220720030436.79520-36-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_200606_021249_A67CB786 ","X-CRM114-Status":"GOOD ( 13.04 )","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: Use virtio_find_vqs_ctx_size() to specify the maximum ring\n size of tx, rx at the same time. | rx/tx ring size speed == UNKNOWN or <\n 10G| 1024 speed < 40G | 4096 speed >= 40G | 8192\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.131 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":"Use virtio_find_vqs_ctx_size() to specify the maximum ring size of tx,\nrx at the same time.\n\n | rx/tx ring size\n-------------------------------------------\nspeed == UNKNOWN or < 10G| 1024\nspeed < 40G | 4096\nspeed >= 40G | 8192\n\nCall virtnet_update_settings() once before calling init_vqs() to update\nspeed.\n\nSigned-off-by: Xuan Zhuo \nAcked-by: Jason Wang \n---\n drivers/net/virtio_net.c | 42 ++++++++++++++++++++++++++++++++++++----\n 1 file changed, 38 insertions(+), 4 deletions(-)","diff":"diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c\nindex 8a5810bcb839..40532ecbe7fc 100644\n--- a/drivers/net/virtio_net.c\n+++ b/drivers/net/virtio_net.c\n@@ -3208,6 +3208,29 @@ static unsigned int mergeable_min_buf_len(struct virtnet_info *vi, struct virtqu\n \t\t (unsigned int)GOOD_PACKET_LEN);\n }\n \n+static void virtnet_config_sizes(struct virtnet_info *vi, u32 *sizes)\n+{\n+\tu32 i, rx_size, tx_size;\n+\n+\tif (vi->speed == SPEED_UNKNOWN || vi->speed < SPEED_10000) {\n+\t\trx_size = 1024;\n+\t\ttx_size = 1024;\n+\n+\t} else if (vi->speed < SPEED_40000) {\n+\t\trx_size = 1024 * 4;\n+\t\ttx_size = 1024 * 4;\n+\n+\t} else {\n+\t\trx_size = 1024 * 8;\n+\t\ttx_size = 1024 * 8;\n+\t}\n+\n+\tfor (i = 0; i < vi->max_queue_pairs; i++) {\n+\t\tsizes[rxq2vq(i)] = rx_size;\n+\t\tsizes[txq2vq(i)] = tx_size;\n+\t}\n+}\n+\n static int virtnet_find_vqs(struct virtnet_info *vi)\n {\n \tvq_callback_t **callbacks;\n@@ -3215,6 +3238,7 @@ static int virtnet_find_vqs(struct virtnet_info *vi)\n \tint ret = -ENOMEM;\n \tint i, total_vqs;\n \tconst char **names;\n+\tu32 *sizes;\n \tbool *ctx;\n \n \t/* We expect 1 RX virtqueue followed by 1 TX virtqueue, followed by\n@@ -3242,10 +3266,15 @@ static int virtnet_find_vqs(struct virtnet_info *vi)\n \t\tctx = NULL;\n \t}\n \n+\tsizes = kmalloc_array(total_vqs, sizeof(*sizes), GFP_KERNEL);\n+\tif (!sizes)\n+\t\tgoto err_sizes;\n+\n \t/* Parameters for control virtqueue, if any */\n \tif (vi->has_cvq) {\n \t\tcallbacks[total_vqs - 1] = NULL;\n \t\tnames[total_vqs - 1] = \"control\";\n+\t\tsizes[total_vqs - 1] = 64;\n \t}\n \n \t/* Allocate/initialize parameters for send/receive virtqueues */\n@@ -3260,8 +3289,10 @@ static int virtnet_find_vqs(struct virtnet_info *vi)\n \t\t\tctx[rxq2vq(i)] = true;\n \t}\n \n-\tret = virtio_find_vqs_ctx(vi->vdev, total_vqs, vqs, callbacks,\n-\t\t\t\t names, ctx, NULL);\n+\tvirtnet_config_sizes(vi, sizes);\n+\n+\tret = virtio_find_vqs_ctx_size(vi->vdev, total_vqs, vqs, callbacks,\n+\t\t\t\t names, sizes, ctx, NULL);\n \tif (ret)\n \t\tgoto err_find;\n \n@@ -3281,6 +3312,8 @@ static int virtnet_find_vqs(struct virtnet_info *vi)\n \n \n err_find:\n+\tkfree(sizes);\n+err_sizes:\n \tkfree(ctx);\n err_ctx:\n \tkfree(names);\n@@ -3630,6 +3663,9 @@ static int virtnet_probe(struct virtio_device *vdev)\n \t\tvi->curr_queue_pairs = num_online_cpus();\n \tvi->max_queue_pairs = max_queue_pairs;\n \n+\tvirtnet_init_settings(dev);\n+\tvirtnet_update_settings(vi);\n+\n \t/* Allocate/initialize the rx/tx queues, and invoke find_vqs */\n \terr = init_vqs(vi);\n \tif (err)\n@@ -3642,8 +3678,6 @@ static int virtnet_probe(struct virtio_device *vdev)\n \tnetif_set_real_num_tx_queues(dev, vi->curr_queue_pairs);\n \tnetif_set_real_num_rx_queues(dev, vi->curr_queue_pairs);\n \n-\tvirtnet_init_settings(dev);\n-\n \tif (virtio_has_feature(vdev, VIRTIO_NET_F_STANDBY)) {\n \t\tvi->failover = net_failover_create(vi->dev);\n \t\tif (IS_ERR(vi->failover)) {\n","prefixes":["v12","35/40"]}