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 [ 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 1db2e1efd3f..fcb6e99634b 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -4080,9 +4080,6 @@ void bnxt_schedule_fw_health_check(struct bnxt *bp) 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; }