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 636FA45E41 for ; Sat, 7 Dec 2024 09:06:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BC8B40E64; Sat, 7 Dec 2024 09:06:56 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2047.outbound.protection.outlook.com [40.107.236.47]) by mails.dpdk.org (Postfix) with ESMTP id 873B040E5E for ; Sat, 7 Dec 2024 09:06:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QoGuhVxO7ZRuomJfSKQUI+X7jLD3lmpBYU3tT4jqTQo/fMpwJ4Rnfg1aSYe7uDyu1V7UmI2p/oMiEiQPMzLyy/NaZYXt+G2GLrRRe1Jxc5/3CMfZGRaSOtYcOInrI3Rgnl6Giu0tVuUa8e8hyi8OmQs0K57kTe3LBsrKyn0llbZMykIjk7oQe8fKtqnjmv16z3Pu2IZ+y7uwGa2tFFPbOvAy1+1NRIa3F4OtpweBOq8757pHNYvk3BKN9dDrcIEadZtTZCTSj2Jj4FflUqHe/wdSXjz/LDN5ITKR/GjZRZncf+lsqLpdmCbrn+XcZMo3iq6o9RfKEjJfWhSXBHnkgQ== 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=8ByBE59yssITHMBtbyxa5oXiSfpMDhfmSfu6IY4NgTI=; b=WepCkNFgiQQpPvRpX+WDw+gt5PrmgFB/qKVo1ozi2Ss31REMQ98GieqGCA/5IfN8r2RY7UpriqZIT2cFEu7vKSUcKPQgixs/ElBWeca3dv9Lz9tjDK7Vpo4gpzTmKEjtfLF84hoe25UbDu1e/SAijckUL1M4FP25GNZtQjda2Oqn56vIUrGxtrrlFT47pTbOuCOs4iZs6jD3bpF79KQ1uegAKVq48oQ/MlYja1ZB6cPyOwWJItiCOxzAAZGDSngTKpkqbhJ6MD0cg80TiONn/FyWZktcvCDjrwmTrU5tMJpC3MfexE1N1avilHtBR0l8n+NiEyN0pwHLtHutuNDryA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=broadcom.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=8ByBE59yssITHMBtbyxa5oXiSfpMDhfmSfu6IY4NgTI=; b=tLvISRzUq5dBUe7Yxr1Y8imOC6wKy6UVLIBoFOplMWIrJnXuhDuUwF0K3sw6CJ0WYZMMo7/yLVYhfOuD2gczrr/2B/8LAry/JfHRIeNMe5Xn+8FvpvYGLCK+KxSJhwh/s8QpFozRouf5E8h28yUJYZGr6IxsxaKtWSzwfu9pfDjPunQY4aliiGX7BTbk1jAWyNMB286vU9dyYAA1rQcB2Jeh4RtiK6jtKayXbUmIwFAbQ8f4LYlEirqeuqIjjtU+god0ENBCvcbZJCh/nP/QXAhkSb+w3Jei4hTxu6aAWimnDbdtraszpi6nteZfr1J3ZXLyBD+x7uz/jPpDDNJ7Kg== Received: from BN9PR03CA0578.namprd03.prod.outlook.com (2603:10b6:408:10d::13) by CYXPR12MB9278.namprd12.prod.outlook.com (2603:10b6:930:e5::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8207.19; Sat, 7 Dec 2024 08:06:49 +0000 Received: from BL02EPF00021F68.namprd02.prod.outlook.com (2603:10b6:408:10d:cafe::e4) by BN9PR03CA0578.outlook.office365.com (2603:10b6:408:10d::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.13 via Frontend Transport; Sat, 7 Dec 2024 08:06:49 +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 BL02EPF00021F68.mail.protection.outlook.com (10.167.249.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.7 via Frontend Transport; Sat, 7 Dec 2024 08:06:49 +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; Sat, 7 Dec 2024 00:06:33 -0800 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; Sat, 7 Dec 2024 00:06:31 -0800 From: Xueming Li To: Peter Spreadborough CC: Xueming Li , Kishore Padmanabha , Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix bad action offset in Tx BD' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:15 +0800 Message-ID: <20241207080055.488538-58-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241207080055.488538-1-xuemingl@nvidia.com> References: <20241111062847.216344-122-xuemingl@nvidia.com> <20241207080055.488538-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: BL02EPF00021F68:EE_|CYXPR12MB9278:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d6738ac-02b3-4c3d-a965-08dd16961a1b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|82310400026|36860700013|1800799024|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?NEtRVxb5EHsM4VueWdwaWhngt/v+N6D+pQVtuLEuBVphAWNFSodSaZxtm8jX?= =?us-ascii?Q?kAoxL1LLAQ8n0PurE96W+37VbK0phHNiGL30+j7RPN8TjD5JLsFTXZJ8ZCd8?= =?us-ascii?Q?KV5IV3j7iB3rrhdsuyIZiN0w5YjXDD4mkJq8mdTuQJSt9YPwZGs77if5C3c5?= =?us-ascii?Q?80zX2u5WVX7b++V8ztdjgeeW4T9c+3Z3a7FdwU26ovKZ9m4lHs3vulnBC4dm?= =?us-ascii?Q?L5mleDjQbKPfvde6a5D5w5x+25PgXdP1jPt0DinnJc8RRaY8V+4U+telP50v?= =?us-ascii?Q?emItn/uRdW+K6FSjueLVR+UCLF7Tem9Th1pkZrKJGJBjVJbnb5wBCw20EgLO?= =?us-ascii?Q?/+N8D+gBR7TjCurTxDb0Vgl50nE+alnalWC5KMtjkhzkHHAD3jc4HeNPjDGJ?= =?us-ascii?Q?8UOtMfXqm4vIoCGm78NY7+QCRc4C5zMZWwP5V3YM1SsMOdiW50FZOtAEInc9?= =?us-ascii?Q?aglEitPqE0GkpuT9dC1cVtnpUtTJ9agQqx/mKmiTX8JxqxrQPCxe9rfaBlJn?= =?us-ascii?Q?4CsiuZX3CSDKM++7gZWrii0lt3q3heNGSZr9/dKnY6HF115J1nOBR6vRa8lA?= =?us-ascii?Q?EumOtLOp7iBXYHFCoyjZUPNmAEBagq//rEqxlGJC2mSBLTJ6bUeX3+6bTc5v?= =?us-ascii?Q?bTipw1vg8n8RBiPVn4J5841oFPXgNiWoAsl9SsyjOeRvaoi/9fd99KRQ/zF3?= =?us-ascii?Q?hIPJ4EHYY5tJX6qCp4avj4zn53ZOSymf6DQLH4xSdkmcaGrMWUi+R0FQ+cSr?= =?us-ascii?Q?9uK2jV2Fd22Okt/2xfxr6cm8suGq7VyP7kMpyXsuOGjozQCm6AKGerLCrIN5?= =?us-ascii?Q?Sg9oG/cnuWn0EhIFgeVxa0yryAhmJxyfJV7LRJCXR0UjY0CEDTu+bn4p99Sc?= =?us-ascii?Q?NhDb4aAv6Md+dTMV8dDrLXsl2s0CeAXNrFsECmwVWoAOSiPOq0msh6OKzqaF?= =?us-ascii?Q?A6L4NBbPjIeciFkYWCxIdYJFqNQj17SEKLUKOcWzSxs8CJ1N4R5vRPu2Z80/?= =?us-ascii?Q?u9XwCbnu0PLhDvKDmsARThZqopGbIM/JZrpKgPvlzyhoZ3PYkCV/1JtUsUMb?= =?us-ascii?Q?nfNkRwood3FFZY+KbWs2YZcG8zK6/KTCf+MI95OZEyABIVGPegxBDDWu/qXB?= =?us-ascii?Q?LRKFVN/8x4rEFl972icCmQP7GtofA6SZdsyeA9GIRyLcLum5yOzoCQKCiCz/?= =?us-ascii?Q?bHOeQvWBkbn6C8fqXy1xhgOKURjwlXLdPXfXePLvYkcsFlM09J8Klrv2ayuN?= =?us-ascii?Q?77UHBoJGjS3oRCYK68x5EXZRy9J2D2nQtrYdvH6pSgVUmK6VAAhIiSqlu768?= =?us-ascii?Q?Kc7JMRgXTReufIJ9QgDjpNATqbBP6d9kDMAILRpmYe7I8WJGgdCIEoowUMKt?= =?us-ascii?Q?BmMEj/DZKuhNSEUZr6kQHq0ZqNLJ6gCq7t0QzwRuNbVOn5WdB9k6MC3Kf5K3?= =?us-ascii?Q?wvh7fvGQP0FUQ2M+095cOUYsb0wnljjq?= 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)(376014)(82310400026)(36860700013)(1800799024)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:06:49.3373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d6738ac-02b3-4c3d-a965-08dd16961a1b 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: BL02EPF00021F68.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9278 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 23.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/10/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=1cc98f6f93302133b9b735a9f9b09267f9fb659a Thanks. Xueming Li --- >From 1cc98f6f93302133b9b735a9f9b09267f9fb659a Mon Sep 17 00:00:00 2001 From: Peter Spreadborough Date: Tue, 16 Apr 2024 14:15:56 -0400 Subject: [PATCH] net/bnxt: fix bad action offset in Tx BD Cc: Xueming Li [ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ] This change ensures that the high part of an action table entry offset stored in the Tx BD is set correctly. A bad value will cause the PDCU to abort a fetch an may stall the pipeline. Fixes: 527b10089cc5 ("net/bnxt: optimize Tx completion handling") Signed-off-by: Peter Spreadborough Reviewed-by: Kishore Padmanabha Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_txr.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 67e8a9990b..6500738ff2 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -303,10 +303,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, */ txbd1->kid_or_ts_high_mss = 0; - if (txq->vfr_tx_cfa_action) - txbd1->cfa_action = txq->vfr_tx_cfa_action; - else - txbd1->cfa_action = txq->bp->tx_cfa_action; + if (txq->vfr_tx_cfa_action) { + txbd1->cfa_action = txq->vfr_tx_cfa_action & 0xffff; + txbd1->cfa_action_high = (txq->vfr_tx_cfa_action >> 16) & + TX_BD_LONG_CFA_ACTION_HIGH_MASK; + } else { + txbd1->cfa_action = txq->bp->tx_cfa_action & 0xffff; + txbd1->cfa_action_high = (txq->bp->tx_cfa_action >> 16) & + TX_BD_LONG_CFA_ACTION_HIGH_MASK; + } if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { uint16_t hdr_size; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:45.976852005 +0800 +++ 0057-net-bnxt-fix-bad-action-offset-in-Tx-BD.patch 2024-12-06 23:26:43.973044828 +0800 @@ -1 +1 @@ -From b019ddf9b1de65491b4c07c25bbab3dc70c15f79 Mon Sep 17 00:00:00 2001 +From 1cc98f6f93302133b9b735a9f9b09267f9fb659a Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b019ddf9b1de65491b4c07c25bbab3dc70c15f79 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 38f858f27f..c82b11e733 100644 +index 67e8a9990b..6500738ff2 100644 @@ -24 +26 @@ -@@ -308,10 +308,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, +@@ -303,10 +303,15 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt, @@ -42,2 +44,2 @@ - if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG || - tx_pkt->ol_flags & RTE_MBUF_F_TX_UDP_SEG) { + if (tx_pkt->ol_flags & RTE_MBUF_F_TX_TCP_SEG) { + uint16_t hdr_size;