From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id A8A9D457A1
for <public@inbox.dpdk.org>; Mon, 12 Aug 2024 14:58:47 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id A38E0402C3;
Mon, 12 Aug 2024 14:58:47 +0200 (CEST)
Received: from NAM12-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52])
by mails.dpdk.org (Postfix) with ESMTP id 2CD704029C
for <stable@dpdk.org>; Mon, 12 Aug 2024 14:58:46 +0200 (CEST)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;
b=SA4MkvJoB8i9EUvkj7j/XmNfKL4U8KDk3SFGLbXmXMa9H5DEooUwHEYZBvBlAFeLCzhZ4QBT8p2a1MWqpo7WLdGoainf5vZHSNNlPwxhQ43iX7C7JPOORB0T5MMDuvR2vBbsR6J8U7NQddvCCXkEUBatqfEkHiduU55X3mTgWcOY2t1De04EaoaCsdC1g9hKeVGw0NWI+ySyJ7SCt7mRO2e0JYR1mASbDCLtf4U3+vdZKfJ3+WazMatQaNb3V/YQn0ko3QRX6Og/6jouZckzrK+0eTZ/z8E8Ux5tRRNBcIOYZSfLTBmWzESkLKkacVAP4BRoLpsnbgEgo0nItkhjXw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector10001;
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=Dl2/o3FObrUZbdNWmRzRez3MfCQtSRVCeJAidVt/8vU=;
b=pj6JLq9gRszuZ9JZOYhk0WyMdzyIqdtT/j8EjsL94EMQB/H+zxjfuWxQPd0jDn31kXUEMJnOlY4OB+AAX0CISpVGJQCXQzvAiBnwzrB1+WUobGk7FpCjMScJoW2K4f4FzfkaVaMwNADTPXEQJcMEnubGAAgXsxbb4h317Eb7YzNF8Y4mv3i3N3nkqXM6gJRx0MEe5F6J/hIA/Px/petW3SGeHWICklQqw8Jgx6q52xi5mcZQJyGJXBNFErvdjunCW07efHcpLL2gyqodFOMOINpH4OpHQO5bElU1N6z6c1zsLdwahhe4g0xRmuuU54OlHliRqOzvxU56/+qwimKKfw==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.117.160) smtp.rcpttodomain=trustnetic.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 (0)
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=Dl2/o3FObrUZbdNWmRzRez3MfCQtSRVCeJAidVt/8vU=;
b=uKVICqYh6dGgWv3fD0h+nL/Mxx6qRWgEactFxP8HCupym8DRXjhNur/+0zdIMr9Vl1ddmGW2A0guyvaq2MYcaCh8jFSc7MckSaNNnxNTlrqcscCPt0gis8BDOj5mmW90e4T6Ky7dj4VOYXwR29hH9Lk38SccVw4z84VTa4TRbe8mhjOYLz9YWZILrcMrvoGPG49syFSJTzfSdT8nclzQ/jDYVNgFFwbXiTUESzFvv9b3HxTyZ5oRcaI3t0263DfIK5FBSqYyBcsmMStn52f/IKl3l1F0m/4OEprgnvf8+ubN4XeuuT2WZXzF70VeQo6ezzwK8T1Uo5mUYkLClyxefQ==
Received: from BN9PR03CA0463.namprd03.prod.outlook.com (2603:10b6:408:139::18)
by PH8PR12MB7026.namprd12.prod.outlook.com (2603:10b6:510:1bd::19)
with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.31; Mon, 12 Aug
2024 12:58:42 +0000
Received: from BL02EPF0001A0FD.namprd03.prod.outlook.com
(2603:10b6:408:139:cafe::93) by BN9PR03CA0463.outlook.office365.com
(2603:10b6:408:139::18) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7828.33 via Frontend
Transport; Mon, 12 Aug 2024 12:58:42 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160)
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.160 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C
Received: from mail.nvidia.com (216.228.117.160) by
BL02EPF0001A0FD.mail.protection.outlook.com (10.167.242.104) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.7828.19 via Frontend Transport; Mon, 12 Aug 2024 12:58:41 +0000
Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com
(10.129.200.66) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 12 Aug
2024 05:58:27 -0700
Received: from nvidia.com (10.126.231.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.1544.4; Mon, 12 Aug
2024 05:58:26 -0700
From: Xueming Li <xuemingl@nvidia.com>
To: Jiawen Wu <jiawenwu@trustnetic.com>
CC: <xuemingl@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'net/txgbe: fix MTU range' has been queued to stable release
23.11.2
Date: Mon, 12 Aug 2024 20:49:17 +0800
Message-ID: <20240812125035.389667-81-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com>
References: <20240712110153.309690-23-xuemingl@nvidia.com>
<20240812125035.389667-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [10.126.231.35]
X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To
rnnvmail201.nvidia.com (10.129.68.8)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: BL02EPF0001A0FD:EE_|PH8PR12MB7026:EE_
X-MS-Office365-Filtering-Correlation-Id: 33e0f989-d305-4523-e88d-08dcbace7e22
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
ARA:13230040|36860700013|1800799024|82310400026|376014;
X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MmSEIk0fM9ubQECA73ZJ5y0h/5xRiGMgIL6cfFVIUIAvkVKLoKLrbuuqQFss?=
=?us-ascii?Q?VKbgtLexnH/uXVUYPUAV83/4Ag9IvH4FjWnQ2iCxq/ROV8kKiWzDf4tcN2Zg?=
=?us-ascii?Q?uinRzMLudyXOoh5SmwfnvMOs3WpJmELD8cwDF0GMtbgMZgq2ZXrgn7O2qUTI?=
=?us-ascii?Q?nXwWzxP5EhGoa9Z1r2tmvpoavn3CUvs/ZDg5DQPPwD3Sv0jDmPLsujiW7gX4?=
=?us-ascii?Q?21u9a2LvWHajXPPN1ep7uGJK/MwUIm1Ul3m7fA+dq5DtmeRsfUq/mOK5/TeM?=
=?us-ascii?Q?3hGnu50UvuPMfNL3BD9BB3uBb3KCJ6E8kAWdZGXgxf12tjLiuUjrqTfggiX7?=
=?us-ascii?Q?bWkoGFkoi31Jih7V1iA1TPPgKqS6sI7XL/S+WYkXgDKdI95F55i9jSahOCS6?=
=?us-ascii?Q?QiRzyl6/RZLCV30kiHAmVz03HL1zSwqSJH7YWkcdC/PVph8K7SNAphbDCqJK?=
=?us-ascii?Q?U4dL6SQ7zp3AozlLTIuI8l23cbgsh3AlLVYtVmk1PZvYQpMoas4Pkit4BdYq?=
=?us-ascii?Q?7l1zaQpYAv0XwIt3OwO9XEvEcbmU70EgFS+Yx6LbstsxBFAswl20A3K3jGbZ?=
=?us-ascii?Q?p6VLoWb9ovDecVpdz3snqbcqyAY8TjSwfdGY04QFSMCiDrFFUAMa2QomqT4U?=
=?us-ascii?Q?R+ZuqDbhlr9/J5SVM0EIYni+wrtvrnkvP/qNcBTdY7TUl+8jb7UEcyWLLMNJ?=
=?us-ascii?Q?iNhcvKo1z3XRQlgCJDElVRC1R+wSVf9Dx9wddYKWp1yFf9j6YnR5lq6DkN7Z?=
=?us-ascii?Q?SMXhWBTedN2BOEgLRBTOsAz1cRrSC6BhBJimLHKU53TTBh2r3Ne6qmY/dn/i?=
=?us-ascii?Q?0laKyo5+WrOnLzldoX18c03pAyUSAmrwXYT/CBK8Htz6lDjwVBesklFvPlPe?=
=?us-ascii?Q?sXsXad9ZwOR+xLDv77UM/V0opWpDCm57j1A9EFE6dfLa1OZBE3MR+fynzmjF?=
=?us-ascii?Q?2coCZhM38dD0pdQJevwCFszNACAKZgLNzMnB8xEE9ReHtK10e6/Q4rFkkfNe?=
=?us-ascii?Q?KZgtIUcaM7rfd9yPazjBXYiLzn4ymAusOPuSzVlF9gHJDDkeYPOAdtjNGLz7?=
=?us-ascii?Q?l8mvrHW6Qio4xmQJZdZAkpszQiZbRrXlbtlLA/6tENr/OIfXDWyo7fGW9rvt?=
=?us-ascii?Q?Ug/3drBXmqNd5rHV6sl5HUxg2WaUpqG3P64vigUJMCRxrkS4KLdwFDt1J66h?=
=?us-ascii?Q?1/cPPWrJO+2FU4zS2QUtGUxhxGQIVYXY9GKZ1v/+6kILhbKdQcC3H6hExazr?=
=?us-ascii?Q?J3mkv+Pd0xqrbijHsZ0GRKb5Zbi6KskTxZ97qpnKqOX9pR8G0vVi+3pOiZs7?=
=?us-ascii?Q?rQQXaKjI3nfHiAoZOGHtqmOAd1cv5aHGoapvTErqW36r51P8SVnpO1vKEarC?=
=?us-ascii?Q?6heJSmbjPX4pzqwuabbwukePXIh33A6Pp0V3hAeLDz69UHfPjY2FAC3EE/+l?=
=?us-ascii?Q?vVVT++aTKTQuDvYAToKoSUWluK0g8w27?=
X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE;
SFS:(13230040)(36860700013)(1800799024)(82310400026)(376014); DIR:OUT;
SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:58:41.9982 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 33e0f989-d305-4523-e88d-08dcbace7e22
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.160];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: BL02EPF0001A0FD.namprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7026
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 23.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 08/14/24. 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=23.11-staging
This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=0fe77d1de34c748c9eb36f57b632d950864d3690
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From 0fe77d1de34c748c9eb36f57b632d950864d3690 Mon Sep 17 00:00:00 2001
From: Jiawen Wu <jiawenwu@trustnetic.com>
Date: Tue, 18 Jun 2024 15:11:43 +0800
Subject: [PATCH] net/txgbe: fix MTU range
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit af2a8b597cbb5cf8e3d53bf27c02c658d68cf6cf ]
The valid range of MTU is 68 to 9414. Set min_mtu and max_mtu in
dev_info.
Fixes: 3926214fd80d ("net/txgbe: support MTU set")
Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
drivers/net/txgbe/txgbe_ethdev.c | 12 +++++-------
drivers/net/txgbe/txgbe_ethdev.h | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index b7b4763f1a..09cab60fa9 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -2669,7 +2669,9 @@ txgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
dev_info->max_rx_queues = (uint16_t)hw->mac.max_rx_queues;
dev_info->max_tx_queues = (uint16_t)hw->mac.max_tx_queues;
dev_info->min_rx_bufsize = 1024;
- dev_info->max_rx_pktlen = 15872;
+ dev_info->max_rx_pktlen = TXGBE_MAX_MTU + TXGBE_ETH_OVERHEAD;
+ dev_info->min_mtu = RTE_ETHER_MIN_MTU;
+ dev_info->max_mtu = TXGBE_MAX_MTU;
dev_info->max_mac_addrs = hw->mac.num_rar_entries;
dev_info->max_hash_mac_addrs = TXGBE_VMDQ_NUM_UC_MAC;
dev_info->max_vfs = pci_dev->max_vfs;
@@ -3687,12 +3689,8 @@ txgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
return -EINVAL;
}
- if (hw->mode)
- wr32m(hw, TXGBE_FRMSZ, TXGBE_FRMSZ_MAX_MASK,
- TXGBE_FRAME_SIZE_MAX);
- else
- wr32m(hw, TXGBE_FRMSZ, TXGBE_FRMSZ_MAX_MASK,
- TXGBE_FRMSZ_MAX(frame_size));
+ wr32m(hw, TXGBE_FRMSZ, TXGBE_FRMSZ_MAX_MASK,
+ TXGBE_FRMSZ_MAX(frame_size));
return 0;
}
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 7feb45d0cf..d5b58018a4 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -56,7 +56,7 @@
#define TXGBE_5TUPLE_MAX_PRI 7
#define TXGBE_5TUPLE_MIN_PRI 1
-
+#define TXGBE_MAX_MTU 9414
/* The overhead from MTU to max frame size. */
#define TXGBE_ETH_OVERHEAD (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN)
--
2.34.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2024-08-12 20:44:05.163226889 +0800
+++ 0080-net-txgbe-fix-MTU-range.patch 2024-08-12 20:44:02.285069332 +0800
@@ -1 +1 @@
-From af2a8b597cbb5cf8e3d53bf27c02c658d68cf6cf Mon Sep 17 00:00:00 2001
+From 0fe77d1de34c748c9eb36f57b632d950864d3690 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit af2a8b597cbb5cf8e3d53bf27c02c658d68cf6cf ]
@@ -10 +12,0 @@
-Cc: stable@dpdk.org
@@ -19 +21 @@
-index 20fa0a5b05..c2df5a314b 100644
+index b7b4763f1a..09cab60fa9 100644
@@ -22 +24 @@
-@@ -2670,7 +2670,9 @@ txgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+@@ -2669,7 +2669,9 @@ txgbe_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
@@ -33 +35 @@
-@@ -3694,12 +3696,8 @@ txgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
+@@ -3687,12 +3689,8 @@ txgbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
@@ -49 +51 @@
-index 050acd967f..f0f4ced5b0 100644
+index 7feb45d0cf..d5b58018a4 100644