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 8D1FFA0543 for ; Tue, 21 Jun 2022 10:12:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E28742BAF; Tue, 21 Jun 2022 10:11:44 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2080.outbound.protection.outlook.com [40.107.92.80]) by mails.dpdk.org (Postfix) with ESMTP id 1141042B92 for ; Tue, 21 Jun 2022 10:11:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NWP+TsPsRyFC968YfK9RjtCoubl9Z/RasWikIyf45P0/QC7YJA5VUBCO6RoPfWbRFm/fmxx3g9ZJxah7xgNnNf4W8KMyMw30X7EbVnQiQXXCz1VyOS9Dl4/LmAjF8BGohLpCNrkwR5Z/C7TMKl0qwk3EahE20LYPyHrf+e7/oE+Gq74+Bz/wxUZtMlZdOTKdbt8JTVNDFMyu+PaZXDCV5LX1ZP7XDmw8JQznGCacvJ9w5NJBAq9NzJ9AHlbnR7vGjnlYpK/43yku3pbTPxrGE24bpVVOUs01h4DzpGq5L5dVjPGlodA6hhZmMiGlcLWixe9XOaKlX4ilTj+GUcj+Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=NjrdRAN7QGrob6B51d02EA/aqArt2/clEeEi9kISBkE=; b=Kjn4sRG+NS58psta99Uh/wJQ68YsCaK/+77VD2B2tjQ1Yw2ATAYUK51U3vZgZWn8d7VHf7f+2MUWrKkxEypGo7PdbU/hxTIdI1B7Z+TshC6XprG/bbhZqRgRJNi2aOw7xeNmPvxoM4wcReZeem3T5GTUSXj+XTW/qh+3ukBSsTxHYBit3e6jL1BlCSm7bNyE3w5DgASE6GsbGU9pCT+JNlUwtPMN+wK5z29nJgsayh/bdhOQMEDtdq1kkSXZyrnvVM5PZJD7idNUBjBr0jff3szCBo9Y/Rt4KzPWYpoEEdYTaRFXLZBBAlMpbKan1q1JrsP0eUkLrG+mfusiQnFM6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.236) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NjrdRAN7QGrob6B51d02EA/aqArt2/clEeEi9kISBkE=; b=LCQPqIZiHJZccShaVd1LNHdiVo+D2QG8VI0rflkda6gsTjQcDfW2+CHVt53Yg9SeaxsxrH8jHBZc9h0vzdO1vTlnHqKHIc9P1ZKSpQc+7LCsBZsTRun158Zcffp901pqWRGd66BnMgfow6EfVY0yFbz2HIIAKvUwBvma99tILXu+d5wZD/3+KhfYgD9Eb486N6Nu0epvGMWFI/lQDMlhKkhhkcZdQOXxOxDI8rkaNE1gWfOTvcEuaCYIYKpsiAo0x0+2vWu0gSn/z3KgpOC6hJflgW+cOwtkowm4JRITS/s2/ZupI7T/VAEZmDDP7rZtH0COKtB9bSLo6Z+Af2hqiQ== Received: from BN0PR07CA0027.namprd07.prod.outlook.com (2603:10b6:408:141::29) by BN6PR12MB1364.namprd12.prod.outlook.com (2603:10b6:404:1e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:11:40 +0000 Received: from BN8NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::d1) by BN0PR07CA0027.outlook.office365.com (2603:10b6:408:141::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.236) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 12.22.5.236 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.236; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.236) by BN8NAM11FT023.mail.protection.outlook.com (10.13.177.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL109.nvidia.com (10.27.9.19) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:11:39 +0000 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.22; Tue, 21 Jun 2022 01:11:38 -0700 From: Xueming Li To: Wenxuan Wu CC: Yuying Zhang , dpdk stable Subject: patch 'net/i40e: fix max frame size config at port level' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:43 +0300 Message-ID: <20220621080301.2315720-98-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5fd0c54-85af-4b98-3d59-08da535dabd4 X-MS-TrafficTypeDiagnostic: BN6PR12MB1364:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ceI01p8cC3ngWWKwMNXttpyCzY7JdNsm86SA5NCajFveBia6bXZUq3Wy1OQKJApptEk7HpxiH4IfLLQr0EPKBiY8JPkA7manLfozTnC0z6YqFRHVLaLTwxHhQkSnadDFpqa6n0LwbXKztB+cy/kCxKqFxUZ0TqQ0kRfzQHPByVpd4vrjWRhkzExIJAdgWvWw3Rna3sB5XkuXyDHALPH8XrQQMpu1817CjNEQq7DehAUc4VrII6B855npQwBxOOUIszYTckoDMuDp6+RYDIER4WWMl0UPLxN1WKps2tb4Alhw8CG4OU3K6gEb0aAftSSqwrACa15llMc9NELh8FPlTtUDv8YDTHIiSUyV8mSz0BCILQfDJmX2BHO5MwHtBbDuNmhSX92APXEmE3ocMvgfE83GSCE1Ifq5sTuXzPD18SIvLrlfZmNDc0rpC/QjNbLTTvIqzWC8moSS57DG4WfY+xM0qWs4qgDhYqVAqTnUaAlQGeaU+RKXfAvJQpNt+U176edg4/E5b/YpEIC8IldBc3aMIHKskmyhXKK0DRdOjmVpVteegToqNcAx+UU9bzo22yUoLraG+dYXdHtbYeGnIKiAQt9ISTO/2YrmjRcAlddyPDg4buB1aHl+J8/73k+CLMt7XDaTKx87BD9JbUEion/K1JmXsSuEEv2tlP/HfGPZ/1zbzj3Oy+xDlMaltJlZsPM6hz8idGef/Gh7EXWfvh+6iCZMG/580UxEJ42r2NodWJH+NtB17gIy/RXL0Lt4cPyHDXrii7tzgTIoNxDXbhEWMRjD0iSFiZjvWRQexBQW6Ry1A4yDhcDHkMN8msNd/vh+x05ALyDa/uD09ydkoxOPGbcYFw63dUayaXMCCIWstjfk/fVssSY0VQ+F89IWOccWwQcI24BUQSZ/xiS8Pg== X-Forefront-Antispam-Report: CIP:12.22.5.236; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(376002)(346002)(39860400002)(396003)(136003)(36840700001)(46966006)(40470700004)(41300700001)(6916009)(70206006)(6666004)(54906003)(8936002)(478600001)(55016003)(966005)(336012)(1076003)(16526019)(82310400005)(316002)(40460700003)(86362001)(2616005)(8676002)(426003)(83380400001)(82740400003)(5660300002)(40480700001)(186003)(7696005)(26005)(81166007)(2906002)(36860700001)(6286002)(70586007)(356005)(36756003)(4326008)(53546011)(47076005)(36900700001)(309714004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:11:40.4505 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5fd0c54-85af-4b98-3d59-08da535dabd4 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.236]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1364 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/5b55b9b1ea723a2cebc8f51a44b3ae17055a0dd9 Thanks. Xueming Li --- >From 5b55b9b1ea723a2cebc8f51a44b3ae17055a0dd9 Mon Sep 17 00:00:00 2001 From: Wenxuan Wu Date: Wed, 18 May 2022 04:59:14 +0000 Subject: [PATCH] net/i40e: fix max frame size config at port level Cc: Xueming Li [ upstream commit 2184f7cdeeaa7eb814e102fd01773db204ccd3bf ] Previously, max frame size can only be set when link is up, and the wait time is 1 sec. Startup time of 10G_BASET longer than 1s would result in failure. Actually, max frame size of media type I40E_MEDIA_TYPE_BASET can be set regardless of link status. This patch omitted the link status check of 10G_MEDIA_TYPE_BASET. Fixes: a4ba77367923 ("net/i40e: enable maximum frame size at port level") Signed-off-by: Wenxuan Wu Acked-by: Yuying Zhang --- drivers/net/i40e/i40e_ethdev.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index e396e82f06..c2d52e4acc 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -13139,16 +13139,20 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) uint32_t rep_cnt = MAX_REPEAT_TIME; struct rte_eth_link link; enum i40e_status_code status; + bool can_be_set = true; - do { - update_link_reg(hw, &link); - if (link.link_status) - break; - - rte_delay_ms(CHECK_INTERVAL); - } while (--rep_cnt); + /* I40E_MEDIA_TYPE_BASET link up can be ignored */ + if (hw->phy.media_type != I40E_MEDIA_TYPE_BASET) { + do { + update_link_reg(hw, &link); + if (link.link_status) + break; + rte_delay_ms(CHECK_INTERVAL); + } while (--rep_cnt); + can_be_set = !!link.link_status; + } - if (link.link_status) { + if (can_be_set) { status = i40e_aq_set_mac_config(hw, size, TRUE, 0, false, NULL); if (status != I40E_SUCCESS) PMD_DRV_LOG(ERR, "Failed to set max frame size at port level"); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:53.573089897 +0800 +++ 0097-net-i40e-fix-max-frame-size-config-at-port-level.patch 2022-06-21 15:37:49.207785188 +0800 @@ -1 +1 @@ -From 2184f7cdeeaa7eb814e102fd01773db204ccd3bf Mon Sep 17 00:00:00 2001 +From 5b55b9b1ea723a2cebc8f51a44b3ae17055a0dd9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 2184f7cdeeaa7eb814e102fd01773db204ccd3bf ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 755786dc10..7ffd7e7384 100644 +index e396e82f06..c2d52e4acc 100644 @@ -28 +30 @@ -@@ -12103,16 +12103,20 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size) +@@ -13139,16 +13139,20 @@ i40e_set_mac_max_frame(struct rte_eth_dev *dev, uint16_t size)