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 CB84BA0A0E for ; Mon, 10 May 2021 18:21:39 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD7174003E; Mon, 10 May 2021 18:21:39 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2050.outbound.protection.outlook.com [40.107.243.50]) by mails.dpdk.org (Postfix) with ESMTP id 2366A410E3 for ; Mon, 10 May 2021 18:21:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZWYeam0ZotylPMsqU2CY6r0Uac/Pr/RKlF+cHcAryke9sm2RuHozVgoTg7LYJ+hjWzqxeetri3VBRl5WUIUWvUMPNDXb2tW0PFdc2CSDFfHw/KXHzNejWtY+QFfqUYoDi0AKNYtLXE5lNVmZ0uj4sISow8i8oSLx0c6Pu+d5OKiGOm1Bf20WVNQZhx48VBdmrLr4qQg+b3VZ/6BUVvSGXn4xbba3l0VjqmuL5haqO+M6TGl3ZLMh37t4TPSU9TIs4YIEBqVSj6iWGxnOF9Ud5CAmiY2B6xEUR6nYbEHph5CVyCX5jQKO8X7XkbU1Y+S3gK4+dzeuG9P0k5Polquc3Q== 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-SenderADCheck; bh=qBug7QFdgAu95eM/FXMSXgo5h4Yr3Ninoi3zRan9bng=; b=UUvHGzQnt16YB+bkaWWoyQ6l1UfhhJShD6CB2MOoonR6a9GHN5ahYaREToX61H3TUFpH2wA93FsU8vH+caXYfnIzT+43Zbom9Yq3qFxfw9jeiiEyEoIx71jIs+TI2nM6FIRKHvkKYxdW6ZUVAF595cVPnm6L/bSSdwhcwctVCJ5zyCU7ejBGp+uNOkzAhNj1V/6SVHQxAX6nYMYwSRfPrtQQmvnU4COytWYihyoQkkoFFBlM6MsbIdw/RRhtY5SN13Q6D6nuKGUE7ayIJNBrCNgJOsWzCPgsH2yEVAohLHXlZH7Sp9aAuth3g1vXjZY9rW6P2mWEF6Lw6FNOYzfCRw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=qBug7QFdgAu95eM/FXMSXgo5h4Yr3Ninoi3zRan9bng=; b=WEsgyJQ9PHf7p14qCZXXhNxvG53z1cLi932kZU2932EKj/lKSGWGkSg6DFCEiYMRdZVcwNjF2mJAPudq5pmaj0d6orNLnfFqb5MXCqlbmrc5xR0Qt4u42dn2cyoy0DHHyKihgGWNp7X4B6/ZwzxmxaNgz43Ck9RiiNkGh1/+kuZzOwz/1ST0sAMNpp99a0PtJo+oWx5ZJwcfI67BOxEQXWP6fd7KZOLfZVKeTiUPPE9EkxuIY7LKD1Y0djy1/ttrzvkrF+KP0GkD/5DZMjusQxN3T6LMlikniJZyEaCHTP6xCd0+FOrKtBGAXYaeT2KWTm/FECjZhFZr/HIYyT2VGQ== Received: from BN6PR16CA0019.namprd16.prod.outlook.com (2603:10b6:404:f5::29) by BYAPR12MB3637.namprd12.prod.outlook.com (2603:10b6:a03:da::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:21:36 +0000 Received: from BN8NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:404:f5:cafe::6c) by BN6PR16CA0019.outlook.office365.com (2603:10b6:404:f5::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24 via Frontend Transport; Mon, 10 May 2021 16:21:36 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT043.mail.protection.outlook.com (10.13.177.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:36 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:21:22 +0000 From: Xueming Li To: Alvin Zhang CC: Luca Boccassi , Lingli Chen , Haiyue Wang , dpdk stable Date: Tue, 11 May 2021 00:02:12 +0800 Message-ID: <20210510160258.30982-183-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08b1f5c5-824b-4daf-2210-08d913cfaf0d X-MS-TrafficTypeDiagnostic: BYAPR12MB3637: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: YLFwpIwgXUY5nKgeK7L2sz+wn5oExOIeO6bpMmdQE9G3XS4YXUAamKimEqVey+6IsT8wstlB3y/NeNgYZBa8A/PZEs6u3VoEOzj82JzBBc32i7nHPn9/mJ+hGcmPVgktB0LQEvmchZNAVIzCKNTiKCuv97REHut3m06EHJrJCyzO1+qnL5vm3hHDHiiAMVt+Cw/d5Ipx7+PMsPyzzcxsuGYEgBzPk0RIeMRkxWt4f+89J57R//z8NDI11p8EXxrzp/UiZ0+5eJvp7Xhfynn9vJD3aivxHq85DJjc79LN439Tvg73WXe48AcOHw0vUpSpJA+ziSCh5F9wvmGODNwQeaV/3VMNUhiXYDejeXXsi4DeMEVz07oFVPoxNUKkpTR5vaCBWKaz40jqArf21KLytKk01lMaw+JUw5VXmtAQ104F6pFxmt3CgSgLPQcKLJRHSpHT+feXQeV+oCunZ26tuOEWSJhA0UhrimsARSAbjqZfmspUlDynpJzJuz5CtUcKTRWCvb033ZSrwtyABKbLGpxQQ7J3xyyn2NqNTwAl8QDLceK4Q+dsKBNjIdaMCFrZm+isPMEWxp8Q560xXQ0nXveZ8oUZtWppd7eHSfj17qaTAJ3N6tggpjnp9H9iN3AqQRgsjaSjzKc+lwMiW86JcMEpm0Av2yA194+qN65KGVESrPb9VFs6Au8flFw8nxro9uVwZ83yPTGfaqlXNGjZW8+9QLzVp5yfG+ev5bguuh1KsPBZoADEssVFFVtViefMYLrWgHiPfGCHefZD/Gof/g== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(396003)(39860400002)(136003)(346002)(376002)(36840700001)(46966006)(86362001)(53546011)(7696005)(5660300002)(6666004)(966005)(8676002)(36756003)(82310400003)(478600001)(8936002)(82740400003)(2906002)(26005)(55016002)(6916009)(4326008)(356005)(2616005)(426003)(70206006)(54906003)(70586007)(1076003)(6286002)(47076005)(36906005)(36860700001)(186003)(16526019)(83380400001)(316002)(7636003)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:36.3018 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 08b1f5c5-824b-4daf-2210-08d913cfaf0d X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3637 Subject: [dpdk-stable] patch 'net/e1000: fix max Rx packet size' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 05/12/21. 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/ac002ace6e93353bc70ee7ee4dcb01a84d8c99e8 Thanks. Xueming Li --- >From ac002ace6e93353bc70ee7ee4dcb01a84d8c99e8 Mon Sep 17 00:00:00 2001 From: Alvin Zhang Date: Thu, 8 Apr 2021 15:41:02 +0800 Subject: [PATCH] net/e1000: fix max Rx packet size Cc: Luca Boccassi [ upstream commit ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 ] According to E1000_ETH_OVERHEAD definition, max_rx_pkt_len contains one VLAN tag size. Therefore when config RLPML register, if dual VLAN not enabled there is no need to add VLAN tag size to max_rx_pkt_len, otherwise only one another VLAN tag size should be added to. Fixes: e51abef39382 ("igb: fix max RX packet size and support dual VLAN") Signed-off-by: Alvin Zhang Tested-by: Lingli Chen Acked-by: Haiyue Wang --- drivers/net/e1000/igb_ethdev.c | 5 ++--- drivers/net/e1000/igb_rxtx.c | 9 ++++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index f3c76bac9b..31927c5464 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -2688,8 +2688,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev) /* Update maximum packet length */ if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) E1000_WRITE_REG(hw, E1000_RLPML, - dev->data->dev_conf.rxmode.max_rx_pkt_len + - VLAN_TAG_SIZE); + dev->data->dev_conf.rxmode.max_rx_pkt_len); } static void @@ -2708,7 +2707,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev) if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) E1000_WRITE_REG(hw, E1000_RLPML, dev->data->dev_conf.rxmode.max_rx_pkt_len + - 2 * VLAN_TAG_SIZE); + VLAN_TAG_SIZE); } static int diff --git a/drivers/net/e1000/igb_rxtx.c b/drivers/net/e1000/igb_rxtx.c index dd520cd82c..3bf13d1420 100644 --- a/drivers/net/e1000/igb_rxtx.c +++ b/drivers/net/e1000/igb_rxtx.c @@ -2343,15 +2343,18 @@ eth_igb_rx_init(struct rte_eth_dev *dev) * Configure support of jumbo frames, if any. */ if (dev->data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_JUMBO_FRAME) { + uint32_t max_len = dev->data->dev_conf.rxmode.max_rx_pkt_len; + rctl |= E1000_RCTL_LPE; /* * Set maximum packet length by default, and might be updated * together with enabling/disabling dual VLAN. */ - E1000_WRITE_REG(hw, E1000_RLPML, - dev->data->dev_conf.rxmode.max_rx_pkt_len + - VLAN_TAG_SIZE); + if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND) + max_len += VLAN_TAG_SIZE; + + E1000_WRITE_REG(hw, E1000_RLPML, max_len); } else rctl &= ~E1000_RCTL_LPE; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.311953400 +0800 +++ 0184-net-e1000-fix-max-Rx-packet-size.patch 2021-05-10 23:59:26.630000000 +0800 @@ -1 +1 @@ -From ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 Mon Sep 17 00:00:00 2001 +From ac002ace6e93353bc70ee7ee4dcb01a84d8c99e8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit ddbc8c16a97fd6662ecccf7e8431a9a3c7f43366 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 7d6d04abcb..3fdffe3294 100644 +index f3c76bac9b..31927c5464 100644 @@ -26 +28 @@ -@@ -2686,8 +2686,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev) +@@ -2688,8 +2688,7 @@ igb_vlan_hw_extend_disable(struct rte_eth_dev *dev) @@ -36 +38 @@ -@@ -2706,7 +2705,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev) +@@ -2708,7 +2707,7 @@ igb_vlan_hw_extend_enable(struct rte_eth_dev *dev) @@ -46 +48 @@ -index 45da4ed9d2..278d5d2712 100644 +index dd520cd82c..3bf13d1420 100644