From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4478FA0566 for ; Wed, 11 Mar 2020 04:40:26 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BC791BFF9; Wed, 11 Mar 2020 04:40:25 +0100 (CET) Received: from relay.smtp.broadcom.com (unknown [192.19.211.62]) by dpdk.org (Postfix) with ESMTP id BFC621BF96 for ; Wed, 11 Mar 2020 04:40:23 +0100 (CET) Received: from dhcp-10-123-153-22.dhcp.broadcom.net (bgccx-dev-host-lnx2.bec.broadcom.net [10.123.153.22]) by relay.smtp.broadcom.com (Postfix) with ESMTP id EB27A2907DB; Tue, 10 Mar 2020 20:40:22 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.10.3 relay.smtp.broadcom.com EB27A2907DB DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1583898023; bh=pyNboMXwGKM1HdG1GigOVfFECZ7FhV2Nz/Sl3Vw4fC8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tEk0nsZAWw1j+N6fae94M/L6q1DCNL76k61RllM/Ji4wRO7mTE8NvFmf4xXxLuFci bJLreWuA06rLXRhdFIjKBQK0gPNeF+dfd4zJHiuJuUzW4HVntO0vS04u15VT+yphgU UkMUd3ZG2BpjlimQoPdqpxrKqQ6D3ZY0to4rW35E= From: Kalesh A P To: stable@dpdk.org Cc: luca.boccassi@gmail.com, ajit.khaparde@broadcom.com Date: Wed, 11 Mar 2020 09:26:59 +0530 Message-Id: <20200311035659.24583-3-kalesh-anakkur.purayil@broadcom.com> X-Mailer: git-send-email 2.10.1 In-Reply-To: <20200311035659.24583-1-kalesh-anakkur.purayil@broadcom.com> References: <20200311035659.24583-1-kalesh-anakkur.purayil@broadcom.com> Subject: [dpdk-stable] [PATCH 19.11 2/2] net/bnxt: fix recovery alarm race condition in port close X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" From: Kalesh AP [ upstream commit 28124d9cdc729dc07dfebddf0b3e2aecfc021dee ] 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") Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Santoshkumar Karanappa Rastapur --- 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 c0b965b..dedb012 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) { @@ -963,6 +964,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