[{"id":2936549,"web_url":"http://patchwork.ozlabs.org/comment/2936549/","msgid":"","list_archive_url":null,"date":"2022-07-21T09:30:18","subject":"Re: [PATCH v12 39/40] virtio_net: support tx queue resize","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/people/5225/","name":"Jason Wang","email":"jasowang@redhat.com"},"content":"在 2022/7/20 11:04, Xuan Zhuo 写道:\n> This patch implements the resize function of the tx queues.\n> Based on this function, it is possible to modify the ring num of the\n> queue.\n>\n> Signed-off-by: Xuan Zhuo \n\n\nAcked-by: Jason Wang \n\n\n> ---\n> drivers/net/virtio_net.c | 47 ++++++++++++++++++++++++++++++++++++++++\n> 1 file changed, 47 insertions(+)\n>\n> diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c\n> index 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","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=y5+zjxt7;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=Zw0BD8PQ;\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=)","relay.mimecast.com;\n\tauth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jasowang@redhat.com"],"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 4LpS3x5Ydjz9s09\n\tfor ; Thu, 21 Jul 2022 19:30:53 +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 1oESW3-003Kya-4m; Thu, 21 Jul 2022 09:30:43 +0000","from us-smtp-delivery-124.mimecast.com ([170.10.133.124])\n\tby bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux))\n\tid 1oESVz-003Ku6-65\n\tfor linux-um@lists.infradead.org; Thu, 21 Jul 2022 09:30:41 +0000","from mail-pf1-f198.google.com (mail-pf1-f198.google.com\n [209.85.210.198]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-484-X-WLPJ6mNZ6I4uDhKksSGg-1; Thu, 21 Jul 2022 05:30:31 -0400","by mail-pf1-f198.google.com with SMTP id\n s22-20020a056a001c5600b0052ad646de49so623773pfw.7\n for ;\n Thu, 21 Jul 2022 02:30:31 -0700 (PDT)","from [10.72.12.47] ([209.132.188.80])\n by smtp.gmail.com with ESMTPSA id\n b14-20020a17090a6ace00b001f061359023sm988456pjm.21.2022.07.21.02.30.19\n (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);\n Thu, 21 Jul 2022 02:30:29 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;\n\td=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type:\n\tContent-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive:\n\tList-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject:\n\tMIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description:\n\tResent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:\n\tList-Owner; bh=2odYvnezALrYBBOQ9Ib/g86viNoalf7WsiWYWu49DZE=; b=y5+zjxt7724YpO\n\tnR4IYHhmTyaoqLQUpXlOSkB6MrxQc2T6rffzV9YTz5YQmEm4PLP3jxh/sHmew0FMhUt7zxbfr8Lr2\n\tnBlcYCcjAQqtm4gQv85oAdPU6aeCO/At19YSNBo1qTOGNZ9G9/eeD05tor3ScVPjsy9MRI/FxCwOc\n\tV7DnEYPQhZiRqEeDjgHVHCkhjg1So0VFTAYoHLypcy9zJoZfQD85jsEJGNddP4TnbjGOt+7UpDMb1\n\tDkxAAdZhWIBs9MVBeTn3bo1xrVMs/46QWjmTYqP0LQnrrEz43igDtdmPQny2a5ww1Si0EbNjdUUy8\n\tmKdHKzjjZAWFOZFj0zBA==;","v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1658395837;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\t to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\t content-transfer-encoding:content-transfer-encoding:\n\t in-reply-to:in-reply-to:references:references;\n\tbh=cE2msxk6QPw86zAV3haYmpL0Ot9f5ZCy5ykRLxOKnec=;\n\tb=Zw0BD8PQzt8eDR7Z4yYzkv4nA/cdODimNqZo+i6Y18D1Ln025B5XuXcGpAS4ZiEACgkyi6\n\t/rQyIt3la/EWaSMLzSWCm++wwhkVc6tsDfYG33p0CYWTGkH5doB6YerLQ+Ju8Eh8sEePvR\n\tX33pXOlqPzg98knCrUtRn/lHpJZLyj4="],"X-MC-Unique":"X-WLPJ6mNZ6I4uDhKksSGg-1","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:message-id:date:mime-version:user-agent:subject\n :content-language:to:cc:references:from:in-reply-to\n :content-transfer-encoding;\n bh=cE2msxk6QPw86zAV3haYmpL0Ot9f5ZCy5ykRLxOKnec=;\n b=3aT8h2GJ+k+DNeCk3E5ZVneAyRTUd7H8zxsb0ga4RG04sDApI/YRME/CQuZSwwLQcL\n 1ckHtcPVhdnMkEfbIHy6O0yA0iYkmnwSZfIEFPQcwnywuliH7o3ofxEmauU2s4/IRLOm\n TMD2hvwBM0nAoo1zUd34fiqSThy6OvjLUuxi7xtypGmsSeC763yS/zRD/62OUvWWy7sH\n fU1c1PKaLIC+Pzi1dFU6ibZJHsgooq3Y+kxJF/VXPKM2WYQfhph4fDICd+3qzXNYYwRb\n a9XRJ4EZHPmG8I8Nn165TdqjpaOg9sDdBsq72CLI+RXz7ECmhFKCvIpW/aPlwZKXW/rw\n s+AQ==","X-Gm-Message-State":"AJIora/7cmBehhQOOA5+mHI3rmHgxaKlbK8rzIdtaUcylC7f9YXyiDbe\n\tMVoq70rEY6QaaVRE3/Y199MPVZrYrfolJiwsaMgqk0V07Dj/yGTO/ulFlz6ZXrEqWbyoCTE55fN\n\telQEDyItg1JCzPJje+3iN9jjs","X-Received":["by 2002:a05:6a00:1308:b0:528:2ed8:7e3d with SMTP id\n j8-20020a056a00130800b005282ed87e3dmr44101323pfu.82.1658395830217;\n Thu, 21 Jul 2022 02:30:30 -0700 (PDT)","by 2002:a05:6a00:1308:b0:528:2ed8:7e3d with SMTP id\n j8-20020a056a00130800b005282ed87e3dmr44101301pfu.82.1658395829765;\n Thu, 21 Jul 2022 02:30:29 -0700 (PDT)"],"X-Google-Smtp-Source":"\n AGRyM1sZJ2tQPOK504th0WDmmE1eCdXGAgBe+DPqkW4Ch1xqd/jvYFMXQX10YnFglctjFz+BMq1srg==","Message-ID":"","Date":"Thu, 21 Jul 2022 17:30:18 +0800","MIME-Version":"1.0","User-Agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0)\n Gecko/20100101 Thunderbird/91.11.0","Subject":"Re: [PATCH v12 39/40] virtio_net: support tx queue resize","To":"Xuan Zhuo ,\n virtualization@lists.linux-foundation.org","Cc":"Richard Weinberger ,\n Anton Ivanov ,\n Johannes Berg ,\n \"Michael S. Tsirkin\" , \"David S. Miller\"\n , Eric Dumazet ,\n Jakub Kicinski , Paolo Abeni ,\n Hans de Goede , Mark Gross ,\n Vadim Pasternak ,\n Bjorn Andersson ,\n Mathieu Poirier ,\n Cornelia Huck , Halil Pasic ,\n Eric Farman , Heiko Carstens ,\n Vasily Gorbik , Alexander Gordeev\n , Christian Borntraeger ,\n Sven Schnelle , Alexei Starovoitov ,\n Daniel Borkmann ,\n Jesper Dangaard Brouer ,\n John Fastabend ,\n Vincent Whitchurch ,\n linux-um@lists.infradead.org, netdev@vger.kernel.org,\n platform-driver-x86@vger.kernel.org, linux-remoteproc@vger.kernel.org,\n linux-s390@vger.kernel.org, kvm@vger.kernel.org, bpf@vger.kernel.org,\n kangjie.xu@linux.alibaba.com","References":"<20220720030436.79520-1-xuanzhuo@linux.alibaba.com>\n <20220720030436.79520-40-xuanzhuo@linux.alibaba.com>","From":"Jason Wang ","In-Reply-To":"<20220720030436.79520-40-xuanzhuo@linux.alibaba.com>","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"redhat.com","Content-Language":"en-US","X-CRM114-Version":"20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 ","X-CRM114-CacheID":"sfid-20220721_023039_327198_7965A787 ","X-CRM114-Status":"GOOD ( 21.88 )","X-Spam-Score":"-0.9 (/)","X-Spam-Report":"=?unknown-8bit?q?Spam_detection_software=2C_running_on_the_sy?=\n\t=?unknown-8bit?q?stem_=22bombadil=2Einfradead=2Eorg=22=2C?=\n\t=?unknown-8bit?q?_has_NOT_identified_this_incoming_email_as_spam=2E__The_ori?=\n\t=?unknown-8bit?q?ginal?=\n\t=?unknown-8bit?q?_message_has_been_attached_to_this_so_you_can_view_it_or_la?=\n\t=?unknown-8bit?q?bel?=\n\t=?unknown-8bit?q?_similar_future_email=2E__If_you_have_any_questions=2C_see?=\n\t=?unknown-8bit?q?_the_administrator_of_that_system_for_details=2E?=\n\t=?unknown-8bit?q?_?=\n\t=?unknown-8bit?b?IENvbnRlbnQgcHJldmlldzogIOWcqCAyMDIyLzcvMjAgMTE6MDQsIFh1?=\n\t=?unknown-8bit?b?YW4gWmh1byDlhpnpgZM6ID4gVGhpcyBwYXRjaCBpbXBsZW1lbnRz?=\n\t=?unknown-8bit?q?_the_resize_function_of_the_tx_queues=2E_=3E_Based_on_this_?=\n\t=?unknown-8bit?q?function=2C_it_is_possible?=\n\t=?unknown-8bit?q?_to_modify_the_ring_num_of_the_=3E_queue=2E_=3E_=3E_Signed-?=\n\t=?unknown-8bit?q?off-by=3A_=5B=2E=2E=2E=5D_?=\n\t=?unknown-8bit?q?_?=\n\t=?unknown-8bit?q?_Content_analysis_details=3A___=28-0=2E9_points=2C_5=2E0_re?=\n\t=?unknown-8bit?q?quired=29?=\n\t=?unknown-8bit?q?_?=\n\t=?unknown-8bit?q?_pts_rule_name______________description?=\n\t=?unknown-8bit?q?_----_----------------------_------------------------------?=\n\t=?unknown-8bit?q?--------------------?=\n\t=?unknown-8bit?q?_-0=2E0_RCVD=5FIN=5FDNSWL=5FNONE_____RBL=3A_Sender_listed_a?=\n\t=?unknown-8bit?q?t_https=3A//www=2Ednswl=2Eorg/=2C?=\n\t=?unknown-8bit?q?_no_trust?=\n\t=?unknown-8bit?q?_=5B170=2E10=2E133=2E124_listed_in_list=2Ednswl=2Eorg=5D?=\n\t=?unknown-8bit?q?_0=2E0_SPF=5FHELO=5FNONE__________SPF=3A_HELO_does_not_publ?=\n\t=?unknown-8bit?q?ish_an_SPF_Record?=\n\t=?unknown-8bit?q?_0=2E0_SPF=5FNONE_______________SPF=3A_sender_does_not_publ?=\n\t=?unknown-8bit?q?ish_an_SPF_Record?=\n\t=?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FAU__________Message_has_a_valid_DKIM?=\n\t=?unknown-8bit?q?_or_DK_signature_from?=\n\t=?unknown-8bit?q?_author=27s_domain?=\n\t=?unknown-8bit?q?_-0=2E1_DKIM=5FVALID_____________Message_has_at_least_one_v?=\n\t=?unknown-8bit?q?alid_DKIM_or_DK_signature?=\n\t=?unknown-8bit?q?_0=2E1_DKIM=5FSIGNED____________Message_has_a_DKIM_or_DK_si?=\n\t=?unknown-8bit?q?gnature=2C_not_necessarily?=\n\t=?unknown-8bit?q?_valid?=\n\t=?unknown-8bit?q?_-0=2E1_DKIM=5FVALID=5FEF__________Message_has_a_valid_DKIM?=\n\t=?unknown-8bit?q?_or_DK_signature_from?=\n\t=?unknown-8bit?q?_envelope-from_domain?=\n\t=?unknown-8bit?q?_-0=2E5_NICE=5FREPLY=5FA___________Looks_like_a_legit_reply?=\n\t=?unknown-8bit?q?_=28A=29?=\n\t=?unknown-8bit?q?_-0=2E2_DKIMWL=5FWL=5FHIGH_________DKIMwl=2Eorg_-_High_trus?=\n\t=?unknown-8bit?q?t_sender?=","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-Transfer-Encoding":"base64","Content-Type":"text/plain; charset=\"utf-8\"; Format=\"flowed\"","Sender":"\"linux-um\" ","Errors-To":"linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org"}}]