net/bnxt: fix cancelling health check alarm

Message ID 20210420040845.28725-1-kalesh-anakkur.purayil@broadcom.com (mailing list archive)
State Accepted, archived
Delegated to: Ajit Khaparde
Headers
Series net/bnxt: fix cancelling health check alarm |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/travis-robot success travis build: passed
ci/github-robot success github build: passed
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Kalesh A P April 20, 2021, 4:08 a.m. UTC
  From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>

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 cancelling the health check alarm unconditionally during
port stop.

Fixes: 9d0cbaecc91a ("net/bnxt: support periodic FW health monitoring")
Cc: stable@dpdk.org

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 3 ---
 1 file changed, 3 deletions(-)
  

Comments

Ajit Khaparde April 20, 2021, 5:31 a.m. UTC | #1
On Mon, Apr 19, 2021 at 8:46 PM Kalesh A P
<kalesh-anakkur.purayil@broadcom.com> wrote:
>
> From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
>
> 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 cancelling the health check alarm unconditionally during
> port stop.
>
> Fixes: 9d0cbaecc91a ("net/bnxt: support periodic FW health monitoring")
> Cc: stable@dpdk.org
>
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
> Reviewed-by: Ajit Kumar Khaparde <ajit.khaparde@broadcom.com>
Patch applied to dpdk-next-net-brcm.

> ---
>  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 9da817f..f5d2dc8 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -4274,9 +4274,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;
>  }
> --
> 2.10.1
>
  

Patch

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 9da817f..f5d2dc8 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4274,9 +4274,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;
 }