From: Somnath Kotur <somnath.kotur@broadcom.com>
To: stable@dpdk.org
Cc: luca.boccassi@gmail.com,
Somnath Kotur <somnath.kotur@broadcom.com>,
Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>,
Kalesh AP <kalesh-anakkur.purayil@broadcom.com>,
Ajit Khaparde <ajit.khaparde@broadcom.com>
Subject: [dpdk-stable] [19.11 2/2] net/bnxt: add separate mutex for FW health check
Date: Thu, 29 Oct 2020 14:14:19 +0530 [thread overview]
Message-ID: <20201029084419.9783-2-somnath.kotur@broadcom.com> (raw)
In-Reply-To: <20201029084419.9783-1-somnath.kotur@broadcom.com>
[ backported from upstream commit 2993075dc253484ba3c87996981f32468aa86cbd ]
def_cp_lock was added to sync race between dev_configure and
int_handler. It should not be used to synchronize scheduling of FW
health check between dev_start and async event handler as well,
use a separate mutex for the same.
Fixes: a73b8e939f10 ("net/bnxt: fix race between start and interrupt handler")
Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com>
Reviewed-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt.h | 1 +
drivers/net/bnxt/bnxt_ethdev.c | 17 +++++++++++++----
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 46cf41864..cdb3e2d3f 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -593,6 +593,7 @@ struct bnxt {
rte_iova_t hwrm_short_cmd_req_dma_addr;
rte_spinlock_t hwrm_lock;
pthread_mutex_t def_cp_lock;
+ pthread_mutex_t health_check_lock;
uint16_t max_req_len;
uint16_t max_resp_len;
uint16_t hwrm_max_ext_req_len;
diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c
index fe240b6cc..d6afd03e5 100644
--- a/drivers/net/bnxt/bnxt_ethdev.c
+++ b/drivers/net/bnxt/bnxt_ethdev.c
@@ -885,9 +885,8 @@ static int bnxt_dev_start_op(struct rte_eth_dev *eth_dev)
eth_dev->rx_pkt_burst = bnxt_receive_function(eth_dev);
eth_dev->tx_pkt_burst = bnxt_transmit_function(eth_dev);
- pthread_mutex_lock(&bp->def_cp_lock);
bnxt_schedule_fw_health_check(bp);
- pthread_mutex_unlock(&bp->def_cp_lock);
+
return 0;
error:
@@ -4205,17 +4204,22 @@ void bnxt_schedule_fw_health_check(struct bnxt *bp)
{
uint32_t polling_freq;
+ pthread_mutex_lock(&bp->health_check_lock);
+
if (!bnxt_is_recovery_enabled(bp))
- return;
+ goto done;
if (bp->flags & BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED)
- return;
+ goto done;
polling_freq = bp->recovery_info->driver_polling_freq;
rte_eal_alarm_set(US_PER_MS * polling_freq,
bnxt_check_fw_health, (void *)bp);
bp->flags |= BNXT_FLAG_FW_HEALTH_CHECK_SCHEDULED;
+
+done:
+ pthread_mutex_unlock(&bp->health_check_lock);
}
static void bnxt_cancel_fw_health_check(struct bnxt *bp)
@@ -4747,6 +4751,10 @@ bnxt_init_locks(struct bnxt *bp)
err = pthread_mutex_init(&bp->def_cp_lock, NULL);
if (err)
PMD_DRV_LOG(ERR, "Unable to initialize def_cp_lock\n");
+
+ err = pthread_mutex_init(&bp->health_check_lock, NULL);
+ if (err)
+ PMD_DRV_LOG(ERR, "Unable to initialize health_check_lock\n");
return err;
}
@@ -4888,6 +4896,7 @@ bnxt_uninit_locks(struct bnxt *bp)
{
pthread_mutex_destroy(&bp->flow_lock);
pthread_mutex_destroy(&bp->def_cp_lock);
+ pthread_mutex_destroy(&bp->health_check_lock);
}
static int
--
2.28.0.497.g54e85e7
next prev parent reply other threads:[~2020-10-29 8:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-29 8:44 [dpdk-stable] [19.11 1/2] net/bnxt: fix checking VNIC in shutdown path Somnath Kotur
2020-10-29 8:44 ` Somnath Kotur [this message]
2020-10-29 10:36 ` Luca Boccassi
2020-10-29 10:44 ` Somnath Kotur
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201029084419.9783-2-somnath.kotur@broadcom.com \
--to=somnath.kotur@broadcom.com \
--cc=ajit.khaparde@broadcom.com \
--cc=kalesh-anakkur.purayil@broadcom.com \
--cc=luca.boccassi@gmail.com \
--cc=sriharsha.basavapatna@broadcom.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).