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 EF3FFA0A0E for ; Mon, 10 May 2021 18:25:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E53D14003E; Mon, 10 May 2021 18:25:22 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2058.outbound.protection.outlook.com [40.107.93.58]) by mails.dpdk.org (Postfix) with ESMTP id D173F40140 for ; Mon, 10 May 2021 18:25:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WtTxN30qteg6J443AYUnF6pB4jj//716jVwwpLrYxtVl5FOwCePx3eeWTzC1okUEGPqDql8YfoQ1Y9D24c0ZoZw5AjQ7YQ/NSfMdugjdOKePezU7y3zPvyrpSNe3HvUfS/eq8QG6T/C/+eRx4sg5YHxsTL1f3c32IepIx19NHIw0mhmR1D65MCSwKb/KevvQD7HLuw4FwBEAnpF8SHtM4kjit5lohNPhrptuEmGMG6gC785fdgde+SVjj3fPu4ptfJ9aKLpqQq7UHBD+ik37aaRsFaxBUI7emTfYpFBrf51uxTFC0ghtU7O7CvbKigwiO3uhb7/uRrfth2jhsIv1Xg== 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=bk4Zl+Ncgi462/zj00MU4p3896frOl45YxjKgA02OPw=; b=K5alWP1K0GHOvrHqClNnnxb4ZqJXQI8Qoa08PjfgTOmHqU+Nb/WNnMIS1yfsBvmXCfbAGEsFdphwogXKyEsVZxexf4MOjUSa9vr3LCJlF6em7GN+Tt9TEHzrQatQZQ9c02w7QNn+xiY+7sL6dCpWSNpCHQMn1OKVVnDUApv1VHjLCU06OlKCuif3DACH+TEQ9jbW2wKkPxh84rrwzgpFdnbAJbFoHTPh/Ff1RnOCvlr8vpo+TWesmzg7SuV1ZnmQcHZP+2CAlIUp6t2MCFmbIcW5LD55hDBp5yg9tpsuAXqIBhJmoOSLKvOZEhskH30389NzFvse8W+x+YXmZIC0UA== 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=bk4Zl+Ncgi462/zj00MU4p3896frOl45YxjKgA02OPw=; b=kMPCJfWPM3Vq93AQmVU7+hFb/vTvUXbJeMzNem7vD0HSpL0l7fZF1phE86+V/5MdthtbeVkyiWQz2LkXRF/Kfpcib+66rqnR53zrQh6WiMQpGtyUPXjYVrzMuG49TV1fLbU+vaUqF3gvqUGIXx5mcrmWEweOAs5vNyXiYS0zqofzdqCkBBSNsvo9comDxaw07TLIKTpOTBgQYlIAiVfDtEioTWbpoc2YABGKjRyPT38vT4roZTIOkywSHS3YvMgjF0TsC5ouECvjr0a6uAnZSCf6D7hfpmUspdTrOcVJe42IQD7Mmk6u2iVW9Z5xkZ98kFjB3rwe+nXqPW0miLLLhg== Received: from BN8PR07CA0017.namprd07.prod.outlook.com (2603:10b6:408:ac::30) by BN7PR12MB2708.namprd12.prod.outlook.com (2603:10b6:408:21::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.31; Mon, 10 May 2021 16:25:20 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ac:cafe::9a) by BN8PR07CA0017.outlook.office365.com (2603:10b6:408:ac::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:25:20 +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 BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:25:20 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:25:18 +0000 From: Xueming Li To: Kalesh AP CC: Luca Boccassi , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Tue, 11 May 2021 00:02:52 +0800 Message-ID: <20210510160258.30982-223-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c932d4de-f70c-4c29-8ba8-08d913d034af X-MS-TrafficTypeDiagnostic: BN7PR12MB2708: 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: P7U60MfJFkfSQaF/beWf9Luzhruw+CaFl6kUlTzncVVpvBFWGeL+/iOJI4D1cFzIYVVwa2pwsh31LwdH7cf0fD0hkU7sRh8qsRJ4E1zgjOeBoMV5RErc8uSsuGusG8UUrye7tb3B81IH09v3YEsqKt/wEc+Md6GuuweXceYd3UgLtnjdawZKmouc8eFSYQDhwBeBzxJFHXSLi1biLYGDrl7hTUANdUe/NoEipDQjzaAGt6dkCVHMbW0+b8H/xcWQ783cPXkc/vmIrvTTEzVwAclFFmtYSO57oTZlgMV869D/65RqHvCc0LgBalJ5O0srEnxCNrKZ5WC8sD0PCc8o1N7e2A2ZGDpRfwov82Pmi1N+xwke4pjiNettTna5DS8kIkZID8F1uPFc1m1pwmW37h43YbGos4RoJsP9QyZpjBxC7szc+bPbYUgScdDQjfZ2n1GyjgmjIqnXX4GhfYUAUfQLD83eVucT/IaINex9O75sVL9EMvQaEtTnPRLurtBEXq9avZ5guQn4hl22pXVIDAZb1t3jvqORbw6T546n7DCkE/gviZUK1fi5gYeJKFjdMP/n3b80XBtWEoKuzwrYluKQ8UE7llK/G8cmLRlzAWZ4YOkGjNgr+GTadaQ1rCITB1N4Ro4ftwXOLJU884pJuh2abqPtpbqZNaomgh5OA2XTCnCy2bFXEicCIKLkqsQufQHeUfP8gyKJdgeO6yq/qstbvtZWdhPBKU1wjguhwtXmLtUPPwEKR2O5nQ5qIHZUx29VMWo/gOBiYbpXrEHM4w== 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)(136003)(396003)(376002)(39860400002)(346002)(46966006)(36840700001)(1076003)(6916009)(54906003)(316002)(70206006)(36906005)(36756003)(83380400001)(86362001)(6666004)(186003)(82740400003)(478600001)(2616005)(336012)(16526019)(426003)(2906002)(82310400003)(4326008)(55016002)(70586007)(7636003)(8676002)(26005)(53546011)(8936002)(356005)(7696005)(6286002)(47076005)(36860700001)(5660300002)(966005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:25:20.5891 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c932d4de-f70c-4c29-8ba8-08d913d034af 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2708 Subject: [dpdk-stable] patch 'net/bnxt: fix health check alarm cancellation' 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 05/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/608d69a62fdea7e664003553b9a29c5865a94a59 Thanks. Xueming Li --- >From 608d69a62fdea7e664003553b9a29c5865a94a59 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 20 Apr 2021 09:38:45 +0530 Subject: [PATCH] net/bnxt: fix health check alarm cancellation Cc: Luca Boccassi [ upstream commit d723d1fe5db00a266d38f5e8435eb9e4f2cc7add ] Driver cancels the health check alarm only if error recovery is enabled in the FW. This can cause an issue. There is a small window where the driver receives the async event from FW and port close is invoked immediately. Driver clears BNXT_FLAG_RECOVERY_ENABLED flag when it gets the async event from FW. As a result, the health check alarm will not get canceled during port close and causes a segfault when the alarm tries to read Heartbeat register. Fix this by canceling the health check alarm unconditionally during port stop. Fixes: 9d0cbaecc91a ("net/bnxt: support periodic FW health monitoring") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 1db2e1efd3..fcb6e99634 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4080,9 +4080,6 @@ done: static void bnxt_cancel_fw_health_check(struct bnxt *bp) { - if (!bnxt_is_recovery_enabled(bp)) - return; - rte_eal_alarm_cancel(bnxt_check_fw_health, (void *)bp); bp->flags &= ~BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:32.334280100 +0800 +++ 0224-net-bnxt-fix-health-check-alarm-cancellation.patch 2021-05-10 23:59:26.710000000 +0800 @@ -1 +1 @@ -From d723d1fe5db00a266d38f5e8435eb9e4f2cc7add Mon Sep 17 00:00:00 2001 +From 608d69a62fdea7e664003553b9a29c5865a94a59 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit d723d1fe5db00a266d38f5e8435eb9e4f2cc7add ] @@ -18 +20,0 @@ -Cc: stable@dpdk.org @@ -28 +30 @@ -index 9da817f487..f5d2dc8590 100644 +index 1db2e1efd3..fcb6e99634 100644 @@ -31 +33 @@ -@@ -4274,9 +4274,6 @@ done: +@@ -4080,9 +4080,6 @@ done: