* [dpdk-stable] [PATCH 24/25] net/bnxt: fix to check for vnic ptr in bnxt shutdown path [not found] <20200911015603.88359-1-ajit.khaparde@broadcom.com> @ 2020-09-11 1:56 ` Ajit Khaparde 2020-09-11 1:56 ` [dpdk-stable] [PATCH 25/25] net/bnxt: fix to have a separate mutex for FW health check Ajit Khaparde [not found] ` <20200916042851.32914-1-ajit.khaparde@broadcom.com> 2 siblings, 0 replies; 4+ messages in thread From: Ajit Khaparde @ 2020-09-11 1:56 UTC (permalink / raw) To: dev; +Cc: Somnath Kotur, stable From: Somnath Kotur <somnath.kotur@broadcom.com> Add a couple of NULL ptr checks in bnxt_free_all_filters() and bnxt_free_vnics() respectively to guard against certain error injection/recovery scenarios where it was found that the application was crashing with the bp->vnic_info ptr being NULL. Fixes: 51fafb89a9a0 ("net/bnxt: get rid of ff pools and use VNIC info array") Cc: stable@dpdk.org Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com> --- drivers/net/bnxt/bnxt_filter.c | 14 +++++++++----- drivers/net/bnxt/bnxt_vnic.c | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c index d822ff607..6d8598324 100644 --- a/drivers/net/bnxt/bnxt_filter.c +++ b/drivers/net/bnxt/bnxt_filter.c @@ -81,6 +81,15 @@ void bnxt_free_all_filters(struct bnxt *bp) struct bnxt_filter_info *filter, *temp_filter; unsigned int i; + for (i = 0; i < bp->pf->max_vfs; i++) { + STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { + bnxt_hwrm_clear_l2_filter(bp, filter); + } + } + + if (bp->vnic_info == NULL) + return; + for (i = 0; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; filter = STAILQ_FIRST(&vnic->filter); @@ -95,11 +104,6 @@ void bnxt_free_all_filters(struct bnxt *bp) STAILQ_INIT(&vnic->filter); } - for (i = 0; i < bp->pf->max_vfs; i++) { - STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { - bnxt_hwrm_clear_l2_filter(bp, filter); - } - } } void bnxt_free_filter_mem(struct bnxt *bp) diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 326c0d1b6..9a135ae88 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -78,6 +78,9 @@ void bnxt_free_all_vnics(struct bnxt *bp) struct bnxt_vnic_info *vnic; unsigned int i; + if (bp->vnic_info == NULL) + return; + for (i = 0; i < bp->max_vnics; i++) { vnic = &bp->vnic_info[i]; STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next); -- 2.21.1 (Apple Git-122.3) ^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH 25/25] net/bnxt: fix to have a separate mutex for FW health check [not found] <20200911015603.88359-1-ajit.khaparde@broadcom.com> 2020-09-11 1:56 ` [dpdk-stable] [PATCH 24/25] net/bnxt: fix to check for vnic ptr in bnxt shutdown path Ajit Khaparde @ 2020-09-11 1:56 ` Ajit Khaparde [not found] ` <20200916042851.32914-1-ajit.khaparde@broadcom.com> 2 siblings, 0 replies; 4+ messages in thread From: Ajit Khaparde @ 2020-09-11 1:56 UTC (permalink / raw) To: dev; +Cc: Somnath Kotur, stable, Sriharsha Basavapatna, Kalesh Anakkur Purayil From: Somnath Kotur <somnath.kotur@broadcom.com> 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") Cc: stable@dpdk.org Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Sriharsha Basavapatna <sriharsha.basavapatna@broadcom.com> Reviewed-by: Kalesh Anakkur Purayil <kalesh-anakkur.purayil@broadcom.com> --- drivers/net/bnxt/bnxt.h | 1 + drivers/net/bnxt/bnxt_ethdev.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index d2944aa74..5770f4b73 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -713,6 +713,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 e77e45486..8128b246a 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1252,9 +1252,7 @@ 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; @@ -4663,17 +4661,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) @@ -5461,6 +5464,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; } @@ -5869,6 +5876,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); if (bp->rep_info) { pthread_mutex_destroy(&bp->rep_info->vfr_lock); pthread_mutex_destroy(&bp->rep_info->vfr_start_lock); -- 2.21.1 (Apple Git-122.3) ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <20200916042851.32914-1-ajit.khaparde@broadcom.com>]
* [dpdk-stable] [PATCH v2 24/25] net/bnxt: fix to check VNIC in shutdown path [not found] ` <20200916042851.32914-1-ajit.khaparde@broadcom.com> @ 2020-09-16 4:28 ` Ajit Khaparde 2020-09-16 4:28 ` [dpdk-stable] [PATCH v2 25/25] net/bnxt: add separate mutex for FW health check Ajit Khaparde 1 sibling, 0 replies; 4+ messages in thread From: Ajit Khaparde @ 2020-09-16 4:28 UTC (permalink / raw) To: dev; +Cc: Somnath Kotur, stable From: Somnath Kotur <somnath.kotur@broadcom.com> Add a couple of NULL pointer checks in bnxt_free_all_filters() and bnxt_free_vnics() respectively to guard against certain error injection/recovery scenarios where it was found that the application was crashing with the bp->vnic_info pointer being NULL. Fixes: 51fafb89a9a0 ("net/bnxt: get rid of ff pools and use VNIC info array") Cc: stable@dpdk.org Signed-off-by: Somnath Kotur <somnath.kotur@broadcom.com> Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com> --- drivers/net/bnxt/bnxt_filter.c | 14 +++++++++----- drivers/net/bnxt/bnxt_vnic.c | 3 +++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c index d822ff607..6d8598324 100644 --- a/drivers/net/bnxt/bnxt_filter.c +++ b/drivers/net/bnxt/bnxt_filter.c @@ -81,6 +81,15 @@ void bnxt_free_all_filters(struct bnxt *bp) struct bnxt_filter_info *filter, *temp_filter; unsigned int i; + for (i = 0; i < bp->pf->max_vfs; i++) { + STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { + bnxt_hwrm_clear_l2_filter(bp, filter); + } + } + + if (bp->vnic_info == NULL) + return; + for (i = 0; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; filter = STAILQ_FIRST(&vnic->filter); @@ -95,11 +104,6 @@ void bnxt_free_all_filters(struct bnxt *bp) STAILQ_INIT(&vnic->filter); } - for (i = 0; i < bp->pf->max_vfs; i++) { - STAILQ_FOREACH(filter, &bp->pf->vf_info[i].filter, next) { - bnxt_hwrm_clear_l2_filter(bp, filter); - } - } } void bnxt_free_filter_mem(struct bnxt *bp) diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 326c0d1b6..9a135ae88 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -78,6 +78,9 @@ void bnxt_free_all_vnics(struct bnxt *bp) struct bnxt_vnic_info *vnic; unsigned int i; + if (bp->vnic_info == NULL) + return; + for (i = 0; i < bp->max_vnics; i++) { vnic = &bp->vnic_info[i]; STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next); -- 2.21.1 (Apple Git-122.3) ^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v2 25/25] net/bnxt: add separate mutex for FW health check [not found] ` <20200916042851.32914-1-ajit.khaparde@broadcom.com> 2020-09-16 4:28 ` [dpdk-stable] [PATCH v2 24/25] net/bnxt: fix to check VNIC in shutdown path Ajit Khaparde @ 2020-09-16 4:28 ` Ajit Khaparde 1 sibling, 0 replies; 4+ messages in thread From: Ajit Khaparde @ 2020-09-16 4:28 UTC (permalink / raw) To: dev; +Cc: Somnath Kotur, stable, Sriharsha Basavapatna, Kalesh AP From: Somnath Kotur <somnath.kotur@broadcom.com> 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") Cc: stable@dpdk.org 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 | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index f0b080015..bb265999d 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -712,6 +712,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 7c27e2435..05e9a6abb 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1252,9 +1252,7 @@ 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; @@ -4675,17 +4673,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) @@ -5473,6 +5476,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; } @@ -5884,6 +5891,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); if (bp->rep_info) { pthread_mutex_destroy(&bp->rep_info->vfr_lock); pthread_mutex_destroy(&bp->rep_info->vfr_start_lock); -- 2.21.1 (Apple Git-122.3) ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-16 4:30 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- [not found] <20200911015603.88359-1-ajit.khaparde@broadcom.com> 2020-09-11 1:56 ` [dpdk-stable] [PATCH 24/25] net/bnxt: fix to check for vnic ptr in bnxt shutdown path Ajit Khaparde 2020-09-11 1:56 ` [dpdk-stable] [PATCH 25/25] net/bnxt: fix to have a separate mutex for FW health check Ajit Khaparde [not found] ` <20200916042851.32914-1-ajit.khaparde@broadcom.com> 2020-09-16 4:28 ` [dpdk-stable] [PATCH v2 24/25] net/bnxt: fix to check VNIC in shutdown path Ajit Khaparde 2020-09-16 4:28 ` [dpdk-stable] [PATCH v2 25/25] net/bnxt: add separate mutex for FW health check Ajit Khaparde
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).