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 E00A2A034F for ; Wed, 10 Nov 2021 07:38:43 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D9ED740683; Wed, 10 Nov 2021 07:38:43 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2069.outbound.protection.outlook.com [40.107.236.69]) by mails.dpdk.org (Postfix) with ESMTP id DBE6F4068B for ; Wed, 10 Nov 2021 07:38:42 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hfrV9yJEzvlnzWGLqBRtq6T3aV61l5siKVbeBDJk+t96l//7ReSvi/HFir4z0jdd/Zt84ngDvtiDwW79svthsagw9aaSQkVDstOqEWWBQfwIxmMvi01XUQ/BJT3ZQE1bU+uQoq8hO24b1YwnidKmVpd1HozKi7ihe0D55hyCMRtVlbpvOQEzEInzBrKM8U6Pq1u/KHI+qsHLTegbAcCKZUSsCY0Ryz4lEvxXBoChOBJ1jRTFIgiVPDqhbnF9Qy0fFZRNE6Sv63aOX8GBwYstVFqERfxxdPGqgNT2Biq6Mwjcz3eJ54gKQt2oTMzJrGjC8pHU/gjYhzWQo+ooFHdjoQ== 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=BTkOYnhrMTv/hVb4kbv5HAIipShWEwfqwheUXxgtiNo=; b=QaT1B9AUB/48NiKN4PuUl38W7X9Ulwp56dAcjQ2HSGlI+biz+xOC7qzcp1vP4ygYjBjQV4R2gf1D2m5Onyx7BlF+fGhZL23o0KSyM6GkqfVIsdNbh0MDgRE5tFpysH7+LuLlncYrLCcXKNnH2Bw16mPBaKGwOP4CGO4qJgEaByXepx2LXvLVTxhoiZZ4Rap+hyz+FEKCwo879pMbwskN3Jn7PIt9TQC8oE9R1sMhDa1WU5ERyO/eLOkAc4HanlytTYFyhQpS9MzZ+hoJNvbJmN3z3BbRvyFAmUsXbEWgauWys2wUP1tjFKBdriFgXlpfUpTxSiy9kRdBgQMXdAjfkg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=BTkOYnhrMTv/hVb4kbv5HAIipShWEwfqwheUXxgtiNo=; b=OQQm+TABMp24Ffd6YhAPwdA06lleHXVtRovGc9aOnMpU8UZLJ1kz3cF/louUhsz2pFJUzhUaIN53tTnkbbuPemnMG9YGQyhFgfGDMJlRZqQLmSrTwZ6kZxu6AppAPq4M8zPhMjvCF902mcE5jJR9Vhjao3bdK2Zz1jPnKkVpJZ8ANFOcABvXjajYZPORPc0kdn2KCkrw6TvteKYBN8hqqENI73BBM1zBiVe0yk8U9B7g9R79zXaAtSsh/NdOd/CKu7WsNJ+MAG1telaf1qpJrR6+fCS0JuG0dYkg417kWdL959MFPZdvIx9W0R3EZ/bN/JFBQBCLyY2+VOBbRtFJOg== Received: from DM6PR01CA0009.prod.exchangelabs.com (2603:10b6:5:296::14) by DM6PR12MB5567.namprd12.prod.outlook.com (2603:10b6:5:1ba::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.13; Wed, 10 Nov 2021 06:38:41 +0000 Received: from DM6NAM11FT044.eop-nam11.prod.protection.outlook.com (2603:10b6:5:296:cafe::2a) by DM6PR01CA0009.outlook.office365.com (2603:10b6:5:296::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:38:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; marvell.com; dkim=none (message not signed) header.d=none;marvell.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 DM6NAM11FT044.mail.protection.outlook.com (10.13.173.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:38:41 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:38:38 +0000 From: Xueming Li To: Hanumanth Reddy Pothula CC: Luca Boccassi , Jerin Jacob , dpdk stable Date: Wed, 10 Nov 2021 14:29:01 +0800 Message-ID: <20211110063216.2744012-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd9b51dc-a538-44fc-89d7-08d9a414bc24 X-MS-TrafficTypeDiagnostic: DM6PR12MB5567: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WjMptH+H9hnHlESHY9EX1NZQnBjvuCoozHX+77KNyEhejDm3hCLP9yJ9lNv7DeHhYDkpDczJsnvfhTkKSI2snGectnKPKIdK9yDDuYST+sIbpPKcHHM5LUN+XpaXfUfy9/CBn0KTpggl1k16me6ADrxfj6CWrKyGrqXghJcH+bMuY07IYEPeB5EjHaXoUHJCHxuIFWLE0RKsD3+SGr6ij1dUeylZfa5kuSJs06I0W7mKYLCnlaWwiBvAGnWxyPnqERcJAbZwU2JHIm7B9hL9GSqHXi7q551NsMF5kMF7eM/5NIoK8WFuDg1SXVzYUT16yhX44O3V3l21IfwFhWoGfwbdML3Atpl6jzy0CbbyR6gkm6sY9B9bwwJGvOGZW2uKzt/+M291nYRQsg5mvGdspa15fbZ7+OBvAlxPGcPetk+tsZE6IXWfSqKWv8kL+PN/dINOpDLbKLb4JmQdVDsgX4K9khiThnU0HyMVyh5HiDCpJnz4l4lFgEPOKEDzASR52KlSuAi2omixNZhqpF+QkrLXWu06j+E4MWF25Rwj0KxpPvCUoB/nln6T2bNYGlULlHMN4dCejz2SZ5ZLbg4pQtsVSPTkc1sRWOWO5TSagVbPl32w200Nax3EU0Lxs05LzT5lEWkcEtwMgSYDCPn1bYKzvLK83Wk0sVLfgsBj7Nuj2X3rG+kxWHXdc5sF9/3oca+KCo9GDG1qUvGQjUxFBUrfXFKqyKjCv1h6OpriN4yncYQ9hIuyKCE69BmSv8ODqqoARceyeM5Tm2XFrYay1UPqkcRGLm/tQRNv6OQfCCTw4Qveny9Y9mf1b3sMd6wP2Y/drANGFka9XPZqL9xknA== 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)(36840700001)(46966006)(53546011)(4326008)(4001150100001)(6286002)(70586007)(6666004)(54906003)(16526019)(36906005)(7636003)(316002)(36860700001)(26005)(2616005)(186003)(8676002)(8936002)(356005)(47076005)(426003)(86362001)(1076003)(82310400003)(55016002)(6916009)(70206006)(7696005)(336012)(2906002)(508600001)(83380400001)(5660300002)(966005)(36756003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:38:41.1398 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bd9b51dc-a538-44fc-89d7-08d9a414bc24 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: DM6NAM11FT044.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB5567 Subject: [dpdk-stable] patch 'net/octeontx2: fix MTU when PTP is enabled' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/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/c7afc9980446a742d86fbf758d635f7c4b96a03b Thanks. Xueming Li --- >From c7afc9980446a742d86fbf758d635f7c4b96a03b Mon Sep 17 00:00:00 2001 From: Hanumanth Reddy Pothula Date: Tue, 10 Aug 2021 12:51:00 +0530 Subject: [PATCH] net/octeontx2: fix MTU when PTP is enabled Cc: Xueming Li [ upstream commit 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 ] Update MTU value based on PTP enable status and reserve eight bytes in TX path to accommodate VLAN tags. If PTP is enabled maximum allowed MTU is 9200 otherwise it's 9208. Fixes: b5dc3140448e ("net/octeontx2: support base PTP") Signed-off-by: Hanumanth Reddy Pothula Acked-by: Jerin Jacob --- drivers/net/octeontx2/otx2_ethdev_ops.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c index f586e9ef59..99ddcb0170 100644 --- a/drivers/net/octeontx2/otx2_ethdev_ops.c +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c @@ -17,7 +17,8 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu) struct nix_frs_cfg *req; int rc; - frame_size += NIX_TIMESYNC_RX_OFFSET * otx2_ethdev_is_ptp_en(dev); + if (dev->configured && otx2_ethdev_is_ptp_en(dev)) + frame_size += NIX_TIMESYNC_RX_OFFSET; /* Check if MTU is within the allowed range */ if (frame_size < NIX_MIN_FRS || frame_size > NIX_MAX_FRS) @@ -560,6 +561,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) devinfo->max_vfs = pci_dev->max_vfs; devinfo->max_mtu = devinfo->max_rx_pktlen - NIX_L2_OVERHEAD; devinfo->min_mtu = devinfo->min_rx_bufsize - NIX_L2_OVERHEAD; + if (dev->configured && otx2_ethdev_is_ptp_en(dev)) { + devinfo->max_mtu -= NIX_TIMESYNC_RX_OFFSET; + devinfo->min_mtu -= NIX_TIMESYNC_RX_OFFSET; + devinfo->max_rx_pktlen -= NIX_TIMESYNC_RX_OFFSET; + } devinfo->rx_offload_capa = dev->rx_offload_capa; devinfo->tx_offload_capa = dev->tx_offload_capa; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:04.630227413 +0800 +++ 0057-net-octeontx2-fix-MTU-when-PTP-is-enabled.patch 2021-11-10 14:17:01.807413276 +0800 @@ -1 +1 @@ -From 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 Mon Sep 17 00:00:00 2001 +From c7afc9980446a742d86fbf758d635f7c4b96a03b Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 07d15d4d84e89a2f7a56bec24225c8ff326a9cf8 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 5a4501208e..552e6bd43d 100644 +index f586e9ef59..99ddcb0170 100644 @@ -34 +36 @@ -@@ -547,6 +548,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo) +@@ -560,6 +561,11 @@ otx2_nix_info_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *devinfo)