bnxt patches
v2 cover bnxt patches
A couple of bnxt PMD fixes and an enhancement
Somnath Kotur (3):
net/bnxt: fix to init/destroy locks only once net/bnxt: fix error path handling of dev start op net/bnxt: check for chip reset in dev stop/close ops
drivers/net/bnxt/bnxt.h | 5 + drivers/net/bnxt/bnxt_cpr.c | 2 + drivers/net/bnxt/bnxt_ethdev.c | 225 +++++++++++++++++++-------------- 3 files changed, 135 insertions(+), 97 deletions(-)
Signature · 2 lines
v1->v2: Modified patch 1/3 to return error 2.28.0.497.g54e85e7
PATCH v2 1/3 net/bnxt: fix to init/destroy locks only once
Invoking init/uninit locks in init_resources and uninit_resources would end up initializing and destroying locks on every port start stop which is not desired.
Move the 2 routines to dev_init and dev_close respectively as locks need to be initialized and destroyed only once during the lifetime of the driver.
--- drivers/net/bnxt/bnxt_ethdev.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +17 -17
@@ -1419,6 +1419,18 @@ static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)return 0 ; } +static void +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); + } +} +static int bnxt_dev_close_op (struct rte_eth_dev *eth_dev) {struct bnxt *bp = eth_dev->data->dev_private;
@@ -1444,6 +1456,7 @@ static int bnxt_dev_close_op(struct rte_eth_dev *eth_dev)bnxt_free_link_info (bp);bnxt_free_pf_info (bp);bnxt_free_parent_info (bp); +bnxt_uninit_locks (bp);rte_memzone_free ((const struct rte_memzone *)bp->tx_mem_zone); bp->tx_mem_zone =NULL ;
@@ -4790,10 +4803,6 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev)return rc; } - rc =bnxt_init_locks (bp); -if (rc) -return rc; -return 0 ; }
@@ -5280,6 +5289,10 @@ bnxt_dev_init(struct rte_eth_dev *eth_dev, void *params __rte_unused)if (rc) goto error_free; + rc =bnxt_init_locks (bp); +if (rc) + goto error_free; + rc =bnxt_init_resources (bp, false);if (rc) goto error_free;
@@ -5371,18 +5384,6 @@ bnxt_free_error_recovery_info(struct bnxt *bp) bp->fw_cap &= ~BNXT_FW_CAP_ERROR_RECOVERY ; } -static void -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); - } -} -static int bnxt_uninit_resources (struct bnxt *bp,bool reconfig_dev) {
@@ -5404,7 +5405,6 @@ bnxt_uninit_resources(struct bnxt *bp, bool reconfig_dev)bnxt_uninit_ctx_mem (bp); -bnxt_uninit_locks (bp);bnxt_free_flow_stats_info (bp);bnxt_free_rep_info (bp);rte_free (bp->ptp_cfg);
Signature · 1 line
2.28.0.497.g54e85e7
PATCH v2 2/3 net/bnxt: fix error path handling of dev start op
In reply to Somnath KoturCall bnxt_dev_stop in error path of bnxt_dev_start_op() to keep it simple and consistent
--- drivers/net/bnxt/bnxt_ethdev.c | 144 ++++++++++++++++----------------- 1 file changed, 70 insertions(+), 74 deletions(-)
drivers/net/bnxt/bnxt_ethdev.c +70 -74
@@ -1239,80 +1239,6 @@ static int bnxt_handle_if_change_status(struct bnxt *bp)return rc; } -static int bnxt_dev_start_op (struct rte_eth_dev *eth_dev) -{ -struct bnxt *bp = eth_dev->data->dev_private; -uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads; -int vlan_mask =0 ; -int rc, retry_cnt =BNXT_IF_CHANGE_RETRY_COUNT ; - -if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) { -PMD_DRV_LOG (ERR ,"Queues are not configured yet!\n" ); -return -EINVAL ; - } - -if (bp->rx_cp_nr_rings >RTE_ETHDEV_QUEUE_STAT_CNTRS ) -PMD_DRV_LOG (ERR , -"RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n" , - bp->rx_cp_nr_rings,RTE_ETHDEV_QUEUE_STAT_CNTRS ); - -do { - rc =bnxt_hwrm_if_change (bp, true); -if (rc ==0 || rc != -EAGAIN ) -break ; - -rte_delay_ms (BNXT_IF_CHANGE_RETRY_INTERVAL ); - }while (retry_cnt--); - -if (rc) -return rc; - -if (bp->flags &BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE ) { - rc =bnxt_handle_if_change_status (bp); -if (rc) -return rc; - } - -bnxt_enable_int (bp); - - rc =bnxt_init_chip (bp); -if (rc) - goto error; - - eth_dev->data->scattered_rx =bnxt_scattered_rx (eth_dev); - eth_dev->data->dev_started =1 ; - -bnxt_link_update_op (eth_dev,1 ); - -if (rx_offloads &DEV_RX_OFFLOAD_VLAN_FILTER ) - vlan_mask |=ETH_VLAN_FILTER_MASK ; -if (rx_offloads &DEV_RX_OFFLOAD_VLAN_STRIP ) - vlan_mask |=ETH_VLAN_STRIP_MASK ; - rc =bnxt_vlan_offload_set_op (eth_dev, vlan_mask); -if (rc) - goto error; - -/* Initialize bnxt ULP port details */ - rc =bnxt_ulp_port_init (bp); -if (rc) - goto error; - - eth_dev->rx_pkt_burst =bnxt_receive_function (eth_dev); - eth_dev->tx_pkt_burst =bnxt_transmit_function (eth_dev); - -bnxt_schedule_fw_health_check (bp); - -return 0 ; - -error: -bnxt_shutdown_nic (bp); -bnxt_free_tx_mbufs (bp); -bnxt_free_rx_mbufs (bp); -bnxt_hwrm_if_change (bp, false); - eth_dev->data->dev_started =0 ; -return rc; -} -static int bnxt_dev_set_link_up_op (struct rte_eth_dev *eth_dev) {struct bnxt *bp = eth_dev->data->dev_private;
@@ -1419,6 +1345,76 @@ static int bnxt_dev_stop_op(struct rte_eth_dev *eth_dev)return 0 ; } +static int bnxt_dev_start_op (struct rte_eth_dev *eth_dev) +{ +struct bnxt *bp = eth_dev->data->dev_private; +uint64_t rx_offloads = eth_dev->data->dev_conf.rxmode.offloads; +int vlan_mask =0 ; +int rc, retry_cnt =BNXT_IF_CHANGE_RETRY_COUNT ; + +if (!eth_dev->data->nb_tx_queues || !eth_dev->data->nb_rx_queues) { +PMD_DRV_LOG (ERR ,"Queues are not configured yet!\n" ); +return -EINVAL ; + } + +if (bp->rx_cp_nr_rings >RTE_ETHDEV_QUEUE_STAT_CNTRS ) +PMD_DRV_LOG (ERR , +"RxQ cnt %d > RTE_ETHDEV_QUEUE_STAT_CNTRS %d\n" , + bp->rx_cp_nr_rings,RTE_ETHDEV_QUEUE_STAT_CNTRS ); + +do { + rc =bnxt_hwrm_if_change (bp, true); +if (rc ==0 || rc != -EAGAIN ) +break ; + +rte_delay_ms (BNXT_IF_CHANGE_RETRY_INTERVAL ); + }while (retry_cnt--); + +if (rc) +return rc; + +if (bp->flags &BNXT_FLAG_IF_CHANGE_HOT_FW_RESET_DONE ) { + rc =bnxt_handle_if_change_status (bp); +if (rc) +return rc; + } + +bnxt_enable_int (bp); + + rc =bnxt_init_chip (bp); +if (rc) + goto error; + + eth_dev->data->scattered_rx =bnxt_scattered_rx (eth_dev); + eth_dev->data->dev_started =1 ; + +bnxt_link_update_op (eth_dev,1 ); + +if (rx_offloads &DEV_RX_OFFLOAD_VLAN_FILTER ) + vlan_mask |=ETH_VLAN_FILTER_MASK ; +if (rx_offloads &DEV_RX_OFFLOAD_VLAN_STRIP ) + vlan_mask |=ETH_VLAN_STRIP_MASK ; + rc =bnxt_vlan_offload_set_op (eth_dev, vlan_mask); +if (rc) + goto error; + +/* Initialize bnxt ULP port details */ + rc =bnxt_ulp_port_init (bp); +if (rc) + goto error; + + eth_dev->rx_pkt_burst =bnxt_receive_function (eth_dev); + eth_dev->tx_pkt_burst =bnxt_transmit_function (eth_dev); + +bnxt_schedule_fw_health_check (bp); + +return 0 ; + +error: +bnxt_dev_stop_op (eth_dev); +return rc; +} +static void bnxt_uninit_locks (struct bnxt *bp) {
Signature · 1 line
2.28.0.497.g54e85e7
PATCH v2 3/3 net/bnxt: check for chip reset in dev stop/close ops
In reply to Somnath KoturWhile the error recovery thread is running, an application can invoke dev_stop or dev_close_op thus triggering a race and unwanted consequences if dev_close is invoked while the recovery is not yet completed.
Fix by having another lock to synchronize between the 2 threads and return EGAIN if adapter is in the middle of recovery when dev_stop or dev_close ops are invoked
--- drivers/net/bnxt/bnxt.h | 5 ++++ drivers/net/bnxt/bnxt_cpr.c | 2 ++ drivers/net/bnxt/bnxt_ethdev.c | 49 +++++++++++++++++++++++++++++----- 3 files changed, 49 insertions(+), 7 deletions(-)
drivers/net/bnxt/bnxt.h +5 -0
@@ -719,6 +719,11 @@ struct bnxt {* health_check_lock */ pthread_mutex_t health_check_lock; +/* synchronize between dev_stop/dev_close_op and +* error recovery thread triggered as part of +* HWRM_ASYNC_EVENT_CMPL_EVENT_ID_RESET_NOTIFY +*/ +pthread_mutex_t err_recovery_lock;uint16_t max_req_len;uint16_t max_resp_len;uint16_t hwrm_max_ext_req_len;
drivers/net/bnxt/bnxt_cpr.c +2 -0
@@ -133,6 +133,7 @@ void bnxt_handle_async_event(struct bnxt *bp,return ; } +pthread_mutex_lock (&bp->err_recovery_lock); event_data =rte_le_to_cpu_32 (async_cmp->event_data1);/* timestamp_lo/hi values are in units of 100ms */ bp->fw_reset_max_msecs = async_cmp->timestamp_hi ?
@@ -152,6 +153,7 @@ void bnxt_handle_async_event(struct bnxt *bp, } bp->flags |=BNXT_FLAG_FW_RESET ; +pthread_mutex_unlock (&bp->err_recovery_lock);rte_eal_alarm_set (US_PER_MS , bnxt_dev_reset_and_resume, (void *)bp);break ;
drivers/net/bnxt/bnxt_ethdev.c +42 -7
115 lines not on this page · raw message
Signature · 1 line
2.28.0.497.g54e85e7