From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id C767E432B0;
Mon, 6 Nov 2023 14:14:15 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id EBA224067B;
Mon, 6 Nov 2023 14:14:14 +0100 (CET)
Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])
by mails.dpdk.org (Postfix) with ESMTP id B1196402B6
for <dev@dpdk.org>; Mon, 6 Nov 2023 14:14:13 +0100 (CET)
Received: from dggpeml100024.china.huawei.com (unknown [172.30.72.53])
by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4SPBd81YNbzvQY9;
Mon, 6 Nov 2023 21:14:04 +0800 (CST)
Received: from localhost.localdomain (10.50.165.33) by
dggpeml100024.china.huawei.com (7.185.36.115) with Microsoft SMTP Server
(version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id
15.1.2507.31; Mon, 6 Nov 2023 21:14:10 +0800
From: Chengwen Feng <fengchengwen@huawei.com>
To: <thomas@monjalon.net>, <ferruh.yigit@amd.com>,
<konstantin.ananyev@huawei.com>, <ajit.khaparde@broadcom.com>, Somnath Kotur
<somnath.kotur@broadcom.com>, Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
CC: <dev@dpdk.org>, <andrew.rybchenko@oktetlabs.ru>,
<Honnappa.Nagarahalli@arm.com>
Subject: [PATCH v3 3/7] net/bnxt: fix race-condition when report error recovery
Date: Mon, 6 Nov 2023 13:11:23 +0000
Message-ID: <20231106131128.33499-4-fengchengwen@huawei.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20231106131128.33499-1-fengchengwen@huawei.com>
References: <20230301030610.49468-1-fengchengwen@huawei.com>
<20231106131128.33499-1-fengchengwen@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [10.50.165.33]
X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To
dggpeml100024.china.huawei.com (7.185.36.115)
X-CFilter-Loop: Reflected
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
If set data path functions to dummy functions before reports error
recovering event, there maybe a race-condition with data path threads,
this patch fixes it by setting data path functions to dummy functions
only after reports such event.
Fixes: e11052f3a46f ("net/bnxt: support proactive error handling mode")
Cc: stable@dpdk.org
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@huawei.com>
Acked-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_cpr.c | 13 +++++++------
drivers/net/bnxt/bnxt_ethdev.c | 4 ++--
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_cpr.c b/drivers/net/bnxt/bnxt_cpr.c
index 0733cf4df2..d8947d5b5f 100644
--- a/drivers/net/bnxt/bnxt_cpr.c
+++ b/drivers/net/bnxt/bnxt_cpr.c
@@ -168,14 +168,9 @@ void bnxt_handle_async_event(struct bnxt *bp,
PMD_DRV_LOG(INFO, "Port conn async event\n");
break;
case HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY:
- /*
- * Avoid any rx/tx packet processing during firmware reset
- * operation.
- */
- bnxt_stop_rxtx(bp->eth_dev);
-
/* Ignore reset notify async events when stopping the port */
if (!bp->eth_dev->data->dev_started) {
+ bnxt_stop_rxtx(bp->eth_dev);
bp->flags |= BNXT_FLAG_FATAL_ERROR;
return;
}
@@ -184,6 +179,12 @@ void bnxt_handle_async_event(struct bnxt *bp,
RTE_ETH_EVENT_ERR_RECOVERING,
NULL);
+ /*
+ * Avoid any rx/tx packet processing during firmware reset
+ * operation.
+ */
+ bnxt_stop_rxtx(bp->eth_dev);
+
pthread_mutex_lock(&bp->err_recovery_lock);
event_data = data1;
/* timestamp_lo/hi values are in units of 100ms */
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index 5c4d96d4b1..003a6eec11 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -4616,14 +4616,14 @@ static void bnxt_check_fw_health(void *arg)
bp->flags |= BNXT_FLAG_FATAL_ERROR;
bp->flags |= BNXT_FLAG_FW_RESET;
- bnxt_stop_rxtx(bp->eth_dev);
-
PMD_DRV_LOG(ERR, "Detected FW dead condition\n");
rte_eth_dev_callback_process(bp->eth_dev,
RTE_ETH_EVENT_ERR_RECOVERING,
NULL);
+ bnxt_stop_rxtx(bp->eth_dev);
+
if (bnxt_is_primary_func(bp))
wait_msec = info->primary_func_wait_period;
else
--
2.17.1