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 5B018A0A02 for ; Mon, 17 May 2021 18:16:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 51266410E2; Mon, 17 May 2021 18:16:01 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id E887840041 for ; Mon, 17 May 2021 18:15:59 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuR-0008HI-OT; Mon, 17 May 2021 16:15:59 +0000 From: Christian Ehrhardt To: Kalesh AP Cc: Somnath Kotur , Ajit Khaparde , dpdk stable Date: Mon, 17 May 2021 18:09:26 +0200 Message-Id: <20210517161039.3132619-137-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix health check alarm cancellation' has been queued to stable release 19.11.9 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 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/937f2a99fca01f1b0fd2381197add7778b4e80d7 Thanks. Christian Ehrhardt --- >From 937f2a99fca01f1b0fd2381197add7778b4e80d7 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 [ 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 a6c902535a..29330f5250 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4301,9 +4301,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.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.776863093 +0200 +++ 0137-net-bnxt-fix-health-check-alarm-cancellation.patch 2021-05-17 17:40:29.411811365 +0200 @@ -1 +1 @@ -From d723d1fe5db00a266d38f5e8435eb9e4f2cc7add Mon Sep 17 00:00:00 2001 +From 937f2a99fca01f1b0fd2381197add7778b4e80d7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d723d1fe5db00a266d38f5e8435eb9e4f2cc7add ] + @@ -18 +19,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 9da817f487..f5d2dc8590 100644 +index a6c902535a..29330f5250 100644 @@ -31 +32 @@ -@@ -4274,9 +4274,6 @@ done: +@@ -4301,9 +4301,6 @@ done: