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 63DFCA0C3F for ; Sat, 12 Jun 2021 01:12:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5BB174003F; Sat, 12 Jun 2021 01:12:14 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2075.outbound.protection.outlook.com [40.107.236.75]) by mails.dpdk.org (Postfix) with ESMTP id 364604003F for ; Sat, 12 Jun 2021 01:12:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HByv+DXiGQzbIIZhejywKDr5I/BBcFcZz/9CUe6ddHdZc8n44KOI2wg7v8EYaVMAwTQ5kVaQEeGMlKr2D1LaGN53o/wKztIT79jPTdlzQy5fImZh7q8Dwd1VzMAeudsLUpNLp3Lysain3IvsWdmhHfLtxrajR/TsDrMdaiwXZ5s8B80uxt45y4pcExSGGozBfZ8olT33EUCKaimloOqUFOItpwq+4LfYcgwcOL4rDoIjfu+AI54o+EINbW4eaPTq8vzaSOyFkENhDMpgnGfj0QE6LFsAxV0UAZLrASNOw6cCk4jEvCWRAOsRlrcxMYrsDOwCC0BDjwJlYWBWzbbqwA== 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=NOT5Zv6yXKZ+ah9FIRpWwX7qYOaZ79rVU2NPXvxUy9M=; b=iE2CMluBaNbjk9mP5GuGeNXqZZ3LGUqluFTjQftA6jMwMVNVRw/BSloIctPKy96cMuWhKFKKTsoGpOBZvH/dwCabPsRoFavaY1MWfVqlgeb62hQVyG8NM2535R/AF/Ed9xXossZJsKhFT5iGNHo3/DXSS1LOkKxC+bAS0+W0g5jZPRdfbketD0e5T6uDFUrzOaoAUQvekacErqu6SbcUHW9LXeVkzQnfXXGiUHYEONVCCAyzg0wUFoOGJaJQGY9s+M+6fDBCr1ZcHbx8eUfLeEcVqqbf3+W5ZSmF02Uu2LDVbBZBRxKURel7SjEoELzbUbw66DX2A/H221nNTCJRzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=broadcom.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=NOT5Zv6yXKZ+ah9FIRpWwX7qYOaZ79rVU2NPXvxUy9M=; b=nQHXKL4/KiHzCMoCIoS8pt6hRpxphijx7kKyzph6afcrm7N3pS+pJZhfwYMOUqBhKwGq3ASzIehU4kd9pBh9CPzRMyuUHgncT9E4pqJyfkKkATJqfjOIXeWzDf+M2M1Th2tnYUquwTtB6jFDrmREXhd8AolZMEMNNh10jtOhvtxWQIRcsDu7aSEbtYtJ15502+LRKpeNG5v3QXg6/PpIw0fdz5kZXxMYhScDbZOemeHXUuJE45m5rcpBFpsoS/cv9b8YcLtnKMtEhSjnDOgLTWmlW2oaPOuRGN38IwSAJKFrN5ZSe0n7xMphn7Z1eXd6zQmIZWJt8kyyI9E3oQQ+Xw== Received: from MWHPR11CA0008.namprd11.prod.outlook.com (2603:10b6:301:1::18) by BYAPR12MB2709.namprd12.prod.outlook.com (2603:10b6:a03:6d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4195.30; Fri, 11 Jun 2021 23:12:11 +0000 Received: from CO1NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:301:1:cafe::15) by MWHPR11CA0008.outlook.office365.com (2603:10b6:301:1::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:12:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; broadcom.com; dkim=none (message not signed) header.d=none;broadcom.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 CO1NAM11FT007.mail.protection.outlook.com (10.13.174.131) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:12:10 +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.2; Fri, 11 Jun 2021 23:12:08 +0000 From: Xueming Li To: Ajit Khaparde CC: Luca Boccassi , Kalesh AP , dpdk stable Date: Sat, 12 Jun 2021 07:02:51 +0800 Message-ID: <20210611230433.8208-77-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-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: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e0c10672-2c3c-4de5-64a5-08d92d2e577e X-MS-TrafficTypeDiagnostic: BYAPR12MB2709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AjuVVV9A2TcpflZ8cg7jnlFzw9ZhNThPGhMjeFmX+TRzx8FGur5PBp36uXFwzvRbQLger1lOCj4Gkhn48demmbMnwD/gnSjclKgbV2XAF1fi/zD2dyr7FJuiXn9EytUW1A6+HClffdfFZc7NKeMVGXNAgDw+RMNFsNgG8iJutap2ho+jD+/Ei3bkKGQiGRBM+daP8yWBqNCz3KPXGukZVWqU+ljmKol2HCipXzcBN0QXNQcbk2rYWdBd8CGalVY2TCD6Y52SG9tB1UV77CfAmFYPPY9S4CqjZoHOvqbtPhVeQW/yCoJ4imaWmHjuhxainXGLXCEIn5bKkmzeiYTTHQ3gELL9Rj0m/DLXzI6v9aupASnYwuNugiODDWFwuFfJoTTh7GNKTlLFQVqf/RS2OI3FbaTGk+ECxRDtGyjLMAxDMwhGaST5Nw3iYd12OTEUUNvBgR2s1assCn0yWJVs+6ufqEHTSQzVoh7t+G2bL+RX6toisJX5MNQD45v+Si/uTQsNHzSnYoQ2ISxCV5kPr7MaJb0lFzVvFfUZ46S9Xf+OXUCbbdgl6O9NeBer+nvB6EnzuFFDhukuhYNZ8FLPTxY5PA4KTDAa8Mfk8NnofwY7PQEy7j6qfDnRRl2jGjOPUhyfxmurPQme1YV9zPmy3rR2V55lj9gDvP3GDekROWMC43mZd88KeFEP0H23GoX6vrcO0p3O9l9zigXKqe36njJRurEw+qPMx9vKaPSP6OmddzwL+f2JAlTG87TA/IKvUMa4BqY9evKR1pFhjxGTj3K3baF2HMc6lGbxX980ws4S/phwaQcdKSS1R1c9/E7q 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)(346002)(376002)(136003)(36840700001)(46966006)(356005)(36906005)(186003)(316002)(4326008)(54906003)(82310400003)(36860700001)(966005)(6916009)(83380400001)(55016002)(6666004)(70206006)(53546011)(70586007)(478600001)(7696005)(8936002)(36756003)(7636003)(26005)(82740400003)(1076003)(16526019)(47076005)(5660300002)(2906002)(6286002)(426003)(86362001)(336012)(2616005)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:12:10.8203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0c10672-2c3c-4de5-64a5-08d92d2e577e 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: CO1NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB2709 Subject: [dpdk-stable] patch 'net/bnxt: fix mismatched type comparison in MAC restore' 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 06/14/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/91d4a1731abb2cd8b1f6df56beea9cf9df51932e Thanks. Xueming Li --- >From 91d4a1731abb2cd8b1f6df56beea9cf9df51932e Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Fri, 30 Apr 2021 13:14:10 -0700 Subject: [PATCH] net/bnxt: fix mismatched type comparison in MAC restore Cc: Luca Boccassi [ upstream commit c8e8154390b38f9242249eb1e023df1db976a285 ] dev_info.max_mac_addrs is of type uint32_t. But the counter i is of type uint16_t. This mismatch may cause the loop condition may always be true. Change the loop counter variable to uint32_t. Fixes: b02f1573cd07 ("net/bnxt: restore MAC filters during reset recovery") Signed-off-by: Ajit Khaparde Reviewed-by: Kalesh AP --- drivers/net/bnxt/bnxt_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index e042466995..25f99fbc70 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3972,7 +3972,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) struct rte_ether_addr *addr; uint64_t pool_mask; uint32_t pool = 0; - uint16_t i; + uint32_t i; int rc; if (BNXT_VF(bp) && !BNXT_VF_IS_TRUSTED(bp)) -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.592420200 +0800 +++ 0077-net-bnxt-fix-mismatched-type-comparison-in-MAC-resto.patch 2021-06-12 06:53:56.360000000 +0800 @@ -1 +1 @@ -From c8e8154390b38f9242249eb1e023df1db976a285 Mon Sep 17 00:00:00 2001 +From 91d4a1731abb2cd8b1f6df56beea9cf9df51932e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit c8e8154390b38f9242249eb1e023df1db976a285 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 9c3e0f9f36..115acda9b3 100644 +index e042466995..25f99fbc70 100644 @@ -23 +25 @@ -@@ -3989,7 +3989,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp) +@@ -3972,7 +3972,7 @@ static int bnxt_restore_mac_filters(struct bnxt *bp)