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 17E97A0A0C for ; Sat, 3 Jul 2021 08:26:09 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DEFE040696; Sat, 3 Jul 2021 08:26:08 +0200 (CEST) Received: from localhost.localdomain (unknown [36.28.25.58]) by mails.dpdk.org (Postfix) with ESMTP id 5556740696 for ; Sat, 3 Jul 2021 08:26:07 +0200 (CEST) Received: by localhost.localdomain (Postfix, from userid 0) id C75F5534C9C; Sat, 3 Jul 2021 02:26:04 -0400 (EDT) From: Weifeng Li To: liweifeng96@126.com Cc: stable@dpdk.org Date: Sat, 3 Jul 2021 02:26:01 -0400 Message-Id: <1625293561-1626-1-git-send-email-liweifeng96@126.com> X-Mailer: git-send-email 1.8.3.1 Subject: [dpdk-stable] [PATCH] net/bnxt: fix nested lock at bond mode 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" Bnxt regist lsc callback (bond_ethdev_lsc_event_callback) when working at bond mode. This callback will dead lock when lsc interrupt triggerred. 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 --- 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..bf8570f 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(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