diff mbox series

[v2] net/bnxt: fix nested lock at bond mode

Message ID 1625307642-1360-1-git-send-email-liweifeng96@126.com (mailing list archive)
State Accepted, archived
Delegated to: Ajit Khaparde
Headers show
Series [v2] net/bnxt: fix nested lock at bond mode | expand

Checks

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

Commit Message

Weifeng Li July 3, 2021, 10:20 a.m. UTC
Bnxt register lsc callback (bond_ethdev_lsc_event_callback) when
working at bond mode. This callback will dead lock when lsc
interrupt triggered.

lsc interrupt ->
bnxt_handle_async_event ->
bnxt_link_update_op ->
bond_ethdev_lsc_event_callback (lsc_lock) ->
bnxt_link_update_op ->
bond_ethdev_lsc_event_callback (lsc_lock dead lock)

Fixes: c2faa1d1969e ("net/bnxt: add support for LSC interrupt event")
Cc: stable@dpdk.org

Signed-off-by: Weifeng Li <liweifeng96@126.com>
---
v2: fix coding style issues
---
 drivers/net/bnxt/bnxt_cpr.c    | 2 ++
 drivers/net/bnxt/bnxt_ethdev.c | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

Comments

Ajit Khaparde July 13, 2021, 4:22 a.m. UTC | #1
On Sat, Jul 3, 2021 at 3:21 AM Weifeng Li <liweifeng96@126.com> wrote:

> Bnxt register lsc callback (bond_ethdev_lsc_event_callback) when
> working at bond mode. This callback will dead lock when lsc
> interrupt triggered.
>
> lsc interrupt ->
> bnxt_handle_async_event ->
> bnxt_link_update_op ->
> bond_ethdev_lsc_event_callback (lsc_lock) ->
> bnxt_link_update_op ->
> bond_ethdev_lsc_event_callback (lsc_lock dead lock)
>
> Fixes: c2faa1d1969e ("net/bnxt: add support for LSC interrupt event")
> Cc: stable@dpdk.org
>
> Signed-off-by: Weifeng Li <liweifeng96@126.com>
>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

Updated the commit headline to "fix nested lock during bonding" during
merge.
Patch applied to dpdk-next-net-brcm. Thanks


> ---
> v2: fix coding style issues
> ---
>  drivers/net/bnxt/bnxt_cpr.c    | 2 ++
>  drivers/net/bnxt/bnxt_ethdev.c | 5 -----
>  2 files changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
> index 2c7fd78..f4c9c72 100644
> --- a/drivers/net/bnxt/bnxt_cpr.c
> +++ b/drivers/net/bnxt/bnxt_cpr.c
> @@ -111,6 +111,8 @@ void bnxt_handle_async_event(struct bnxt *bp,
>         case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE:
>                 /* FALLTHROUGH */
>                 bnxt_link_update_op(bp->eth_dev, 0);
> +               rte_eth_dev_callback_process(bp->eth_dev,
> +                       RTE_ETH_EVENT_INTR_LSC, NULL);
>                 break;
>         case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD:
>                 PMD_DRV_LOG(INFO, "Async event: PF driver unloaded\n");
> diff --git a/drivers/net/bnxt/bnxt_ethdev.c
> b/drivers/net/bnxt/bnxt_ethdev.c
> index 495c6cd..619b7b8 100644
> --- a/drivers/net/bnxt/bnxt_ethdev.c
> +++ b/drivers/net/bnxt/bnxt_ethdev.c
> @@ -1844,11 +1844,6 @@ int bnxt_link_update_op(struct rte_eth_dev
> *eth_dev, int wait_to_complete)
>         if (new.link_status != eth_dev->data->dev_link.link_status ||
>             new.link_speed != eth_dev->data->dev_link.link_speed) {
>                 rte_eth_linkstatus_set(eth_dev, &new);
> -
> -               rte_eth_dev_callback_process(eth_dev,
> -                                            RTE_ETH_EVENT_INTR_LSC,
> -                                            NULL);
> -
>                 bnxt_print_link_info(eth_dev);
>         }
>
> --
> 1.8.3.1
>
>
diff mbox series

Patch

diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 2c7fd78..f4c9c72 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -111,6 +111,8 @@  void bnxt_handle_async_event(struct bnxt *bp,
 	case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_LINK_SPEED_CFG_CHANGE:
 		/* FALLTHROUGH */
 		bnxt_link_update_op(bp->eth_dev, 0);
+		rte_eth_dev_callback_process(bp->eth_dev,
+			RTE_ETH_EVENT_INTR_LSC, NULL);
 		break;
 	case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_PF_DRVR_UNLOAD:
 		PMD_DRV_LOG(INFO, "Async event: PF driver unloaded\n");
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 495c6cd..619b7b8 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -1844,11 +1844,6 @@  int bnxt_link_update_op(struct rte_eth_dev *eth_dev, int wait_to_complete)
 	if (new.link_status != eth_dev->data->dev_link.link_status ||
 	    new.link_speed != eth_dev->data->dev_link.link_speed) {
 		rte_eth_linkstatus_set(eth_dev, &new);
-
-		rte_eth_dev_callback_process(eth_dev,
-					     RTE_ETH_EVENT_INTR_LSC,
-					     NULL);
-
 		bnxt_print_link_info(eth_dev);
 	}