[dpdk-dev] [PATCH] net/bnxt: fix to cancel recovery alarm in port close

[dpdk-dev] [PATCH] net/bnxt: fix to cancel recovery alarm in port close

[Kalesh A P]

From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>

There is a race condition when port is closed while error recovery
is happening in driver. Fixed this by canceling the recovery threads
during port close.

Fixes: df6cd7c1f73a (net/bnxt: handle reset notify async event from FW)
Cc: stable@dpdk.org

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
---
 drivers/net/bnxt/bnxt_ethdev.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 18aa313..b8b30ed 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -133,6 +133,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
 static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
 static void bnxt_cancel_fw_health_check(struct bnxt *bp);
 static int bnxt_restore_vlan_filters(struct bnxt *bp);
+static void bnxt_dev_recover(void *arg);
 
 int is_bnxt_in_error(struct bnxt *bp)
 {
@@ -980,6 +981,10 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
 {
 	struct bnxt *bp = eth_dev->data->dev_private;
 
+	/* cancel the recovery handler before remove dev */
+	rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
+	rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
+
 	if (eth_dev->data->dev_started)
 		bnxt_dev_stop_op(eth_dev);
 
-- 
2.10.1

Re: [dpdk-dev] [PATCH] net/bnxt: fix to cancel recovery alarm in port close

[Kevin Traynor]

On 28/02/2020 08:52, Kalesh A P wrote:
> From: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
> 
> There is a race condition when port is closed while error recovery
> is happening in driver. Fixed this by canceling the recovery threads
> during port close.
> 
> Fixes: df6cd7c1f73a (net/bnxt: handle reset notify async event from FW)

Just a small nit, it should be with "", i.e.
("net/bnxt: handle reset notify async event from FW")

Can be generated with:
git config alias.fixline "log -1 --abbrev=12 --format='Fixes: %h
(\"%s\")%nCc: %ae'"

> Cc: stable@dpdk.org
> 
> Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
> Reviewed-by: Somnath Kotur <somnath.kotur@broadcom.com>
> Reviewed-by: Santoshkumar Karanappa Rastapur <santosh.rastapur@broadcom.com>
> ---
>  drivers/net/bnxt/bnxt_ethdev.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
> index 18aa313..b8b30ed 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -133,6 +133,7 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev);
>  static int bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev);
>  static void bnxt_cancel_fw_health_check(struct bnxt *bp);
>  static int bnxt_restore_vlan_filters(struct bnxt *bp);
> +static void bnxt_dev_recover(void *arg);
>  
>  int is_bnxt_in_error(struct bnxt *bp)
>  {
> @@ -980,6 +981,10 @@ static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev)
>  {
>  	struct bnxt *bp = eth_dev->data->dev_private;
>  
> +	/* cancel the recovery handler before remove dev */
> +	rte_eal_alarm_cancel(bnxt_dev_reset_and_resume, (void *)bp);
> +	rte_eal_alarm_cancel(bnxt_dev_recover, (void *)bp);
> +
>  	if (eth_dev->data->dev_started)
>  		bnxt_dev_stop_op(eth_dev);
>  
>