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 8E6A645E41 for ; Sat, 7 Dec 2024 09:06:59 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8538C40281; Sat, 7 Dec 2024 09:06:59 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2058.outbound.protection.outlook.com [40.107.236.58]) by mails.dpdk.org (Postfix) with ESMTP id 829CD40281 for ; Sat, 7 Dec 2024 09:06:58 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Fed1/ETWsMzdXkrw7RJppwZzU9yOeoNieDgc4lKXZsdZ2MVUCfviWjMVjtijN9glJxL/AD2IPypL1B7cUKPdh/YfPT/o2ABWHR7O5j6YE5YSu63jceYxCLZDUgOlW6httQLTlQMzgzdZy+J88IzZ0yChPfIkc/VZ87GVNQUm3LaheLojrXNa4/Ip5iB3HK3qZYkcBf4lr4E0nSxip7u2lqEGszGCEJr5fClHW8mmAlvGVQbeI1GGXX7HrrS3hFxGb5rCruForOhdXb4ptQ7cpiheJRVY6Bd0++Z8xp50BgdWYW7NOpuI748yDmapdg6XZXC8fsfAXVQJdCkL+iME8A== 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=GSg0EDcDgGwbetFEZcluU7/NM2b6Fq0SzAnIxqg6O1k=; b=NW9v/uQ07C1+g7Q502AQphR72LOM7sEsg5kwjAEDyNefvEzzcTQQcDEK2EGXu5tzrU5TpPSM7ZcdovVwhzMvk50ep/9XnPkC687OpwbUVDtsUogm2PLdj/Hr2EKH07nH6y1ONtcZEg//XcL2FUEJY2iwt8yGsTRQwa4+pdIN9w5djzkrwI69kH9ICXrDfW3Rvahm9FkGXicIwn9bRmAlk33Eil84nbV2NqB0Y8izwX4UJUkaJ0IJvD17v/x8Rkup1BpKsmNFbZwrd/p2qvzFfcbkn+6ZiMCMTJVkJg2lnhtODwNhCizvRFSG0YKvhOs6B5CR1BotMscPihnJCsZcIA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=networkplumber.org 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=GSg0EDcDgGwbetFEZcluU7/NM2b6Fq0SzAnIxqg6O1k=; b=CPpIBuDPFQ3n0R1BG+kb66MJyN2fQV52w/4bcuXlUibDLLMbDXQ5YDJB9dSZt0CSDPp9y4FbUAXZ/c7FGd5S1sVQHPKX3OJrHyBuKmLB0djT8CwgAH48zcqPw0y2xrpB+nFMcG+dc5Mmp/HpkZlJ6hW7dKRRSrT9VY5gMhTJNuk6E2V/C47OmI2LA1ehyG3hoYOLsyqC+x5/JwCp09Jij0vjiR7Q02UtpDmlI96C/xEymRMM6FAt+swF66Zw1jA4FQehn+NacMImjE9Dhr6TUBJdJnVv5dZyTrn6+fx+uwLuHzT5MCakfRqGqyaY0imVlDyFOUHINAXfXkkybmp+Aw== Received: from MN2PR08CA0026.namprd08.prod.outlook.com (2603:10b6:208:239::31) by CH3PR12MB8403.namprd12.prod.outlook.com (2603:10b6:610:133::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8230.11; Sat, 7 Dec 2024 08:06:54 +0000 Received: from BL02EPF00021F6F.namprd02.prod.outlook.com (2603:10b6:208:239:cafe::6) by MN2PR08CA0026.outlook.office365.com (2603:10b6:208:239::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8230.14 via Frontend Transport; Sat, 7 Dec 2024 08:06:53 +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 BL02EPF00021F6F.mail.protection.outlook.com (10.167.249.11) 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:53 +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:37 -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:35 -0800 From: Xueming Li To: Stephen Hemminger CC: Xueming Li , dpdk stable Subject: patch 'net/bnx2x: fix always true expression' has been queued to stable release 23.11.3 Date: Sat, 7 Dec 2024 16:00:17 +0800 Message-ID: <20241207080055.488538-60-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: BL02EPF00021F6F:EE_|CH3PR12MB8403:EE_ X-MS-Office365-Filtering-Correlation-Id: 91768c33-5d02-4131-262f-08dd16961c95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|376014|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?rqbrR+scAVRAPcMabFr/G5GyJIzqX36RsqMnzOyeN9q50ujTZ+RdlTYmSYAR?= =?us-ascii?Q?uSbTxLOHwxdodfK0IQvQEtQnMs2aKUcAGsudzpyBprWE0ZNvZX/GQQAHNbZC?= =?us-ascii?Q?mJOFLmJX76kWv/6WpWHub8mZTCAe4+2KbPQCMrGKMaAovF5fYQ/VLU22vypp?= =?us-ascii?Q?G1KcVmKEG6RU94FOTNBnoHvCNIRRAVXmgdPAoAD1yJmGo0eXGNqdJMSUtUyi?= =?us-ascii?Q?or6d/x620uH8fQ8Lzdo/6qDysGLi47Al1YhAEks50+5UBMXQyBNZ5S1qJ+YZ?= =?us-ascii?Q?LckRALfTmezqv5vqsgC9uJ8adOcCd8kNm5KCLw6oov3idtVwjDEvJtFXuWsA?= =?us-ascii?Q?yhiEReSQknconMsqe5Mz6ZS7s2j3x23qfExjrfBvvUHHlGeeEm335VIHmCm2?= =?us-ascii?Q?CMSESFr1gcpP77fJQd3d4ANGW3AgsKqNxvXcTqdJEK9VcAYoT1SwpxOB8k/N?= =?us-ascii?Q?cNoIAhZXg/gxICVBGhnidpFM5S5pXIXF86UQFJBTAtiPsvZjXu7zuSuqm1UI?= =?us-ascii?Q?mAVvOIsGgpNBXAtfIqQd9AoXZKzKdskehk+6yDnxl7HSlkuHDOJUQiOaHlMs?= =?us-ascii?Q?3VTZ2DsYVxVJt7T4w8a1Lr7JbqnVvZlnicVkmAod5a+MP3bNrwVSIUubsYeE?= =?us-ascii?Q?mW1XZm5+94AjYpFglm/cLL4wdHj82F5PkEeem+Xmn2N90DddaNwz1YIHndKw?= =?us-ascii?Q?YJvEP5WHIVP56vcVW0h9ZCHPSY95/Tl0FRcO/iRxNp3BdS9hAAxoV42n81MZ?= =?us-ascii?Q?3wrELiEdPw1Gpk2njbWBr/yRaTZmjlx6DKZzhKO805eP5vnBRFlviRzDyfsh?= =?us-ascii?Q?jo1sJVRIbpRDLJBt/4n2CN0cMdmJef7BDry+mYldSAXmFFMUuRaM7g97vYnB?= =?us-ascii?Q?mDCGQxrksgJuqRAJWUTRVO5IdI57PuQn5OdPwGGC9lGQPn/8ure8apEpVxpQ?= =?us-ascii?Q?0tBGqQCrsxJpPGqGLmekm6srqfEM9Hylcw6Q0kQNGV+triV71wLT2Bv7K7C1?= =?us-ascii?Q?Fi1D5wR2o2OYbidOztRdteXBK8KeeQeyTAnx59ZPVpbaF/y09wCVixC1XBMg?= =?us-ascii?Q?m7HK+8BGo6hNpzftbaVg7Gw7xOOsL1C2zXvbpyVa60P+0SqIVZYphSbAvl7L?= =?us-ascii?Q?IlHKWyGu+kemtDkM9gAzMTKyl070hzPVDVUKfyxjlhdjT/Hva6bhGE/93BFM?= =?us-ascii?Q?q9NQfePDpDhUDHJhX/OLdPDt1gz4qMytTBSm6tdNoKH0UouTDyzp5oTkGSpg?= =?us-ascii?Q?BAZT0xunZJMFEGRCZLmR0V1wF/AU8uhV+Nf5N5femvSeZ2xeQ9aIjRYEWgPZ?= =?us-ascii?Q?8cqXOYrVhe70ORM7FYNkquSIKKZdTQydSePZz0+S61GqhtG8+i/dVE7Ve51S?= =?us-ascii?Q?/BQi0MWOTdRLfgKjALbUAT+q1XbOsr68wGW979Q9yoppxbsdVrZCELnlv/cn?= =?us-ascii?Q?RB1UYB0+O49pW4DsZ44moZhN4PsyOfIJ?= 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)(376014)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2024 08:06:53.4889 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91768c33-5d02-4131-262f-08dd16961c95 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: BL02EPF00021F6F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8403 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=12ae6d06a38b50392c85c7ccb28278e61f9f4116 Thanks. Xueming Li --- >From 12ae6d06a38b50392c85c7ccb28278e61f9f4116 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 12 Nov 2024 09:43:54 -0800 Subject: [PATCH] net/bnx2x: fix always true expression Cc: Xueming Li [ upstream commit fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 ] Coverity spotted that the check to enable single interrupt mode would evaluate as always true since: The or condition sc->interrupt_mode != 2 || sc->interrupt_mode != 3 will always be true because sc->interrupt_mode cannot be equal to two different values at the same time, so it must be not equal to at least one of them. Coverity issue: 362046 Fixes: 540a211084a7 ("bnx2x: driver core") Signed-off-by: Stephen Hemminger --- drivers/net/bnx2x/bnx2x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 3153cc4d80..af31ac4604 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -11189,11 +11189,9 @@ static int bnx2x_init_hw_func(struct bnx2x_softc *sc) /* Turn on a single ISR mode in IGU if driver is going to use * INT#x or MSI */ - if ((sc->interrupt_mode != INTR_MODE_MSIX) - || (sc->interrupt_mode != INTR_MODE_SINGLE_MSIX)) { + if (sc->interrupt_mode == INTR_MODE_INTX || + sc->interrupt_mode == INTR_MODE_MSI) pf_conf |= IGU_PF_CONF_SINGLE_ISR_EN; - } - /* * Timers workaround bug: function init part. * Need to wait 20msec after initializing ILT, -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-12-06 23:26:46.026329004 +0800 +++ 0059-net-bnx2x-fix-always-true-expression.patch 2024-12-06 23:26:43.973044828 +0800 @@ -1 +1 @@ -From fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 Mon Sep 17 00:00:00 2001 +From 12ae6d06a38b50392c85c7ccb28278e61f9f4116 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit fb6b0e9a36326a4f13f496b00f7f92aaffe1d5f4 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org