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 DBA98428F8 for ; Sun, 9 Apr 2023 17:29:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D36B642D0C; Sun, 9 Apr 2023 17:29:50 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2061.outbound.protection.outlook.com [40.107.100.61]) by mails.dpdk.org (Postfix) with ESMTP id 93847427F2 for ; Sun, 9 Apr 2023 17:29:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Acs5eNbau8T+eVpRm5hMgN2ZEeo/5gSmOurF2pmHqaive/ZZeAdfgZCpygIfAQPyXwhYuI9H297i6P+gMlphKkweuvez56TKm4Q0xS8RCquzN0XXDGmbxV79LtHqt23+cz5NHl4F1ZDKnioctSAGOwmFY+InR3DLbV3AX1LElknVcrUUgvmB8dNvQkf7y4FawT0W9FY6lSszP4GaOcFq3iDRY9pXnvHIrNH4Qeyhz15puio35MwsykcuoyI/HkNB19yDsMu8Oc+V+l+pVBamlOC1q9cWNllSG3C9s3jtz95fjcoL9q/lSqthV632X5437CgKH+q4suDefc+7A6IpAQ== 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=UxPIg6iJcnYIBDVzCY/xiC30mXMW09EmKFEHH+NU3Jw=; b=FN+/xJUAXtxC3Ad/mSnd7ExhO7/EXpJcOu1F9rHMrRGPPI9TCUHdrbmUdgFB4PnKrkE8dismtW4H2WR96kJpKyQlTjUMwznhu4tD5hdWPWwuryvSUoGJhlteYPek8BmPhTdkn5ZHM5C7Rv/+Q1g25BE0mUN8lLirxpnA3eoeqOl93uB7X77TPNbpp7bD4qMJ/2PmFR0IloKCj4Eo30MJH7I5eyE+Tre8HKV8KG9u2rcVo/6/iLWnTIsrLdYubJPQEvk2rle98FonHWqydn0U05yurHm+a6Pr/T+FAac11wyyl0CMLg8ys8RArMsEVxu85wa+QmH7NhC0/j0Ab4ZNTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com 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=UxPIg6iJcnYIBDVzCY/xiC30mXMW09EmKFEHH+NU3Jw=; b=Ee9hCbqrqid7A63NdBDi7rTx0G5Z8Kfo4VPiY1EnVNDMiMUU1/v9a5wIwyt4W+LviCQwm7ju/VG0+k7tKTmQpWm1gLsPxeY51dP6PZgd7oOPqfy4KUchaWwDa9QzDxijpVLyBW0qSbTpr0r9MsszX2C5dWo/1SsoQJjqNLVMt0yeQnbYSub0nkSKbzdLT8i4ck2PLOcEJSDfj1UnCqJYopXwiyokkVxRXhCQnS98tin4nOmDJ1V0eUYpDLUzQe1pLG21WBPLam0OmdEc/IjJn4B1x2fcZ2dg45P3HoY2lfhrhnIRrovHHFlQTf561/i4nmy/ddDBrblJ2xwQqSslLw== Received: from DM6PR02CA0154.namprd02.prod.outlook.com (2603:10b6:5:332::21) by DM6PR12MB4169.namprd12.prod.outlook.com (2603:10b6:5:215::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35; Sun, 9 Apr 2023 15:29:45 +0000 Received: from DM6NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:5:332:cafe::8e) by DM6PR02CA0154.outlook.office365.com (2603:10b6:5:332::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.39 via Frontend Transport; Sun, 9 Apr 2023 15:29:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT061.mail.protection.outlook.com (10.13.173.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.26 via Frontend Transport; Sun, 9 Apr 2023 15:29:44 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:29:42 -0700 Received: from nvidia.com (10.126.231.37) 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.37; Sun, 9 Apr 2023 08:29:40 -0700 From: Xueming Li To: Simei Su CC: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix maximum frame size configuration' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:57 +0800 Message-ID: <20230409152529.5308-50-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT061:EE_|DM6PR12MB4169:EE_ X-MS-Office365-Filtering-Correlation-Id: 9dc7f5d0-c0c0-4cb8-a399-08db390f3f31 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cLlbKNtjHQT9o3qJFqpzWTU4lMkXtqKu04jR3I3JmQz6P2FGAD/xvaayi5Q8wS/Lrh4NG1nLJ6fCzPAMUeFDE9Wrrh+WwlhTQ+jt+ZBCNAuToYi2YX8oNP/1gnTsedBUMFQjwo0W9FBMeyf2ho38M+RhLP8fsHs9SFOd4LAbBJiyiJ6GlGvFjC3lBcJGOygk/a+/0HCRVeghxZnv93wy8qVBaXruGAhP1dYEYEy4A/9BIKjEs1d/iMIha/wn1n3wW4uXGL1/xymGnfzAsjCcKH+5WwNQoh+1Q3ISqEMzsLLIDXfX3nX+hB3XAPQrzZHLrfWyo+JzQuYKLkBN5+3idwky6Uzmc8EavlJVLK2hw/6AvvImDWrBGN9HS/Z93dbeKWDGJJWcsuBBmFl2Zv6/jyG76yQl1DOijsehK4CUH/VBE+O7R7P/b+Ef5VQSviSDFQaXbHhhI0B0GahH/jk2l24p/r6N0Mt4FmTVo77p0fD07TzTeI0MEqoHD3FOr1BuHrY3a97LpGhppy+INvy4dFaaWQuhjUWnUzHOZfVZFY80fkt7n3sUyXEhDGFJTWBIRjJ2KaPwLrKBFBee9ADVRU8j8i1hlVzxzPph4x4Z7XNu/gRNBpDossnJCnya0nHcz8HM3OSEbWjzqr9iFPQlp23/Bwb0Ws8vYzgZjWp4stn+MU+dqcOa47xbv56QVzTRldGFgKRpwayAnWce/hOKo1r5qXp3xZfyYFTuXhCF9/RrhpRMfuyYxj28BOewiXZQj59YypKVpeUcrYY1hs4cEdAkpDMhT9SlEdR/pzpxxUr4MIeFPD3W9zcSiAPUs9CbjRzE0M5FfnqwlM9sDmf66w== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(376002)(39860400002)(396003)(451199021)(36840700001)(40470700004)(46966006)(86362001)(36756003)(316002)(41300700001)(70586007)(8676002)(6916009)(4326008)(966005)(7696005)(70206006)(54906003)(478600001)(55016003)(40480700001)(82310400005)(5660300002)(2906002)(8936002)(36860700001)(356005)(82740400003)(7636003)(186003)(16526019)(6286002)(6666004)(53546011)(1076003)(26005)(2616005)(426003)(336012)(83380400001)(47076005)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:29:44.9005 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9dc7f5d0-c0c0-4cb8-a399-08db390f3f31 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4169 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 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/8ec56c115aa1debcc3f672eb95ba646e9b2d6da5 Thanks. Xueming Li --- >From 8ec56c115aa1debcc3f672eb95ba646e9b2d6da5 Mon Sep 17 00:00:00 2001 From: Simei Su Date: Mon, 6 Mar 2023 20:18:53 +0800 Subject: [PATCH] net/i40e: fix maximum frame size configuration Cc: Xueming Li [ upstream commit 82fcf20d039c5990ea7829cea2996c530d260fab ] This patch sets max frame size at port level rather than queue level to avoid unexpected packets received by port. Fixes: a8ca8edf8c07 ("net/i40e: revert link status check on device start") Signed-off-by: Simei Su Acked-by: Qi Zhang --- drivers/net/i40e/i40e_ethdev.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index a982e42264..371f42233e 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -1710,11 +1710,6 @@ eth_i40e_dev_init(struct rte_eth_dev *dev, void *init_params __rte_unused) */ i40e_add_tx_flow_control_drop_filter(pf); - /* Set the max frame size to 0x2600 by default, - * in case other drivers changed the default value. - */ - i40e_aq_set_mac_config(hw, I40E_FRAME_SIZE_MAX, TRUE, false, 0, NULL); - /* initialize RSS rule list */ TAILQ_INIT(&pf->rss_config_list); @@ -2332,6 +2327,7 @@ i40e_dev_start(struct rte_eth_dev *dev) uint32_t intr_vector = 0; struct i40e_vsi *vsi; uint16_t nb_rxq, nb_txq; + uint16_t max_frame_size; hw->adapter_stopped = 0; @@ -2452,7 +2448,7 @@ i40e_dev_start(struct rte_eth_dev *dev) PMD_DRV_LOG(WARNING, "Fail to set phy mask"); /* Call get_link_info aq command to enable/disable LSE */ - i40e_dev_link_update(dev, 0); + i40e_dev_link_update(dev, 1); } if (dev->data->dev_conf.intr_conf.rxq == 0) { @@ -2470,6 +2466,13 @@ i40e_dev_start(struct rte_eth_dev *dev) "please call hierarchy_commit() " "before starting the port"); + max_frame_size = dev->data->mtu ? + dev->data->mtu + I40E_ETH_OVERHEAD : + I40E_FRAME_SIZE_MAX; + + /* Set the max frame size to HW*/ + i40e_aq_set_mac_config(hw, max_frame_size, TRUE, false, 0, NULL); + return I40E_SUCCESS; tx_err: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:40.039770000 +0800 +++ 0049-net-i40e-fix-maximum-frame-size-configuration.patch 2023-04-09 21:45:38.649042200 +0800 @@ -1 +1 @@ -From 82fcf20d039c5990ea7829cea2996c530d260fab Mon Sep 17 00:00:00 2001 +From 8ec56c115aa1debcc3f672eb95ba646e9b2d6da5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 82fcf20d039c5990ea7829cea2996c530d260fab ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org