From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id EB0EDA0350 for ; Mon, 21 Feb 2022 16:41:00 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E493B4013F; Mon, 21 Feb 2022 16:41:00 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B711D410F6 for ; Mon, 21 Feb 2022 16:40:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458058; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l7NmiXSTPf3Mdwp9w9JLaKAVmciBgDPUwgRhP5Oetho=; b=WO4WRhAKFeQWI1qDNK5HQ3W+RP64U+EdpwdoWrtYmddmZm957huCH6PJSKSobDh+kaaZSb uJO2dbKvZ+bJXX8NOAwdd4sndFJNyF8ns2cU0xcP3sVJBGwu9hhWrpiKAHZZacGewx4N0Q PSCYkhQrQ0aZhWk/5q2NwbNLKlmWKsw= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-607-Opoelo_6ORiIT3bvlTfSbQ-1; Mon, 21 Feb 2022 10:40:55 -0500 X-MC-Unique: Opoelo_6ORiIT3bvlTfSbQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id EF4A98144E3; Mon, 21 Feb 2022 15:40:53 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id E40EA7E131; Mon, 21 Feb 2022 15:40:52 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix max packet size rollback in PF' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:18 +0000 Message-Id: <20220221153625.152324-129-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/26/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d7033074e07b4bdf22ecf82a42ccde6a13f93f49 Thanks. Kevin --- >From d7033074e07b4bdf22ecf82a42ccde6a13f93f49 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 28 Jan 2022 10:07:03 +0800 Subject: [PATCH] net/hns3: fix max packet size rollback in PF [ upstream commit e8f1f783d1cd61faf12658df64726bca88b7ff63 ] HNS3 PF driver use the hns->pf.mps to restore the MTU when a reset occurs. If user fails to configure the MTU, the MPS of PF may not be restored to the original value. Fixes: 25fb790f7868 ("net/hns3: fix HW buffer size on MTU update") Fixes: 1f5ca0b460cd ("net/hns3: support some device operations") Fixes: d51867db65c1 ("net/hns3: add initialization") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index ef13d31d19..ac0c1fb5ec 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -2088,5 +2088,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) { struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); - uint16_t original_mps = hns->pf.mps; int err; int ret; @@ -2098,5 +2097,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) } - hns->pf.mps = mps; ret = hns3_buffer_alloc(hw); if (ret) { @@ -2105,13 +2103,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) } + hns->pf.mps = mps; + return 0; rollback: - err = hns3_set_mac_mtu(hw, original_mps); - if (err) { + err = hns3_set_mac_mtu(hw, hns->pf.mps); + if (err) hns3_err(hw, "fail to rollback MTU, err = %d", err); - return ret; - } - hns->pf.mps = original_mps; return ret; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.389918256 +0000 +++ 0129-net-hns3-fix-max-packet-size-rollback-in-PF.patch 2022-02-21 15:22:44.259704504 +0000 @@ -1 +1 @@ -From e8f1f783d1cd61faf12658df64726bca88b7ff63 Mon Sep 17 00:00:00 2001 +From d7033074e07b4bdf22ecf82a42ccde6a13f93f49 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e8f1f783d1cd61faf12658df64726bca88b7ff63 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index a5114662d2..73bf209717 100644 +index ef13d31d19..ac0c1fb5ec 100644 @@ -26 +27 @@ -@@ -2076,5 +2076,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) +@@ -2088,5 +2088,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) @@ -32 +33 @@ -@@ -2086,5 +2085,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) +@@ -2098,5 +2097,4 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) @@ -38 +39 @@ -@@ -2093,13 +2091,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps) +@@ -2105,13 +2103,12 @@ hns3_config_mtu(struct hns3_hw *hw, uint16_t mps)