From: Kishore Padmanabha Date: Fri, 11 Sep 2020 01:55:47 +0000 (-0700) Subject: net/bnxt: fix function id used in flow flush X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=c53c2f435f167d3d549061a983cb042eafd00b9a;p=dpdk.git net/bnxt: fix function id used in flow flush The function id being used in the flush is incorrect, fixed the flush of the flows. Fixes: 74bcfc062489 ("net/bnxt: add session and function flow flush") Cc: stable@dpdk.org Signed-off-by: Kishore Padmanabha Reviewed-by: Shahaji Bhosle Reviewed-by: Ajit Khaparde --- diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 073412de25..445c40820e 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -3723,6 +3723,7 @@ bnxt_filter_ctrl_op(struct rte_eth_dev *dev, if (BNXT_ETH_DEV_IS_REPRESENTOR(dev)) { struct bnxt_vf_representor *vfr = dev->data->dev_private; bp = vfr->parent_dev->data->dev_private; + /* parent is deleted while children are still valid */ if (!bp) return -EIO; } diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c index bd6039d2a8..63d453ffbb 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.c @@ -35,14 +35,12 @@ static pthread_mutex_t bnxt_ulp_global_mutex = PTHREAD_MUTEX_INITIALIZER; * created the session. */ bool -ulp_ctx_deinit_allowed(void *ptr) +ulp_ctx_deinit_allowed(struct bnxt_ulp_context *ulp_ctx) { - struct bnxt *bp = (struct bnxt *)ptr; - - if (!bp || !bp->ulp_ctx || !bp->ulp_ctx->cfg_data) + if (!ulp_ctx || !ulp_ctx->cfg_data) return false; - if (!bp->ulp_ctx->cfg_data->ref_cnt) { + if (!ulp_ctx->cfg_data->ref_cnt) { BNXT_TF_DBG(DEBUG, "ulp ctx shall initiate deinit\n"); return true; } @@ -629,9 +627,14 @@ bnxt_ulp_flush_port_flows(struct bnxt *bp) { uint16_t func_id; - func_id = bnxt_get_fw_func_id(bp->eth_dev->data->port_id, - BNXT_ULP_INTF_TYPE_INVALID); - ulp_flow_db_function_flow_flush(bp->ulp_ctx, func_id); + /* it is assumed that port is either TVF or PF */ + if (ulp_port_db_port_func_id_get(bp->ulp_ctx, + bp->eth_dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "Invalid argument\n"); + return; + } + (void)ulp_flow_db_function_flow_flush(bp->ulp_ctx, func_id); } /* Internal function to delete the VFR default flows */ diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h index 8a2825ae5b..5882c545c8 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp.h +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp.h @@ -83,12 +83,9 @@ struct ulp_tlv_param { /* * Allow the deletion of context only for the bnxt device that * created the session - * TBD - The implementation of the function should change to - * using the reference count once tf_session_attach functionality - * is fixed. */ bool -ulp_ctx_deinit_allowed(void *bp); +ulp_ctx_deinit_allowed(struct bnxt_ulp_context *ulp_ctx); /* Function to set the device id of the hardware. */ int32_t diff --git a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c index 2ab00453ac..566e1254ae 100644 --- a/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c +++ b/drivers/net/bnxt/tf_ulp/bnxt_ulp_flow.c @@ -10,6 +10,7 @@ #include "ulp_flow_db.h" #include "ulp_mapper.h" #include "ulp_fc_mgr.h" +#include "ulp_port_db.h" #include static int32_t @@ -146,8 +147,14 @@ bnxt_ulp_flow_create(struct rte_eth_dev *dev, mapper_cparms.act_prop = ¶ms.act_prop; mapper_cparms.class_tid = class_id; mapper_cparms.act_tid = act_tmpl; - mapper_cparms.func_id = bnxt_get_fw_func_id(dev->data->port_id, - BNXT_ULP_INTF_TYPE_INVALID); + + /* Get the function id */ + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &mapper_cparms.func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + goto parse_error; + } mapper_cparms.dir_attr = params.dir_attr; /* Call the ulp mapper to create the flow in the hardware. */ @@ -251,8 +258,17 @@ bnxt_ulp_flow_destroy(struct rte_eth_dev *dev, } flow_id = (uint32_t)(uintptr_t)flow; - func_id = bnxt_get_fw_func_id(dev->data->port_id, - BNXT_ULP_INTF_TYPE_INVALID); + + if (ulp_port_db_port_func_id_get(ulp_ctx, + dev->data->port_id, + &func_id)) { + BNXT_TF_DBG(ERR, "conversion of port to func id failed\n"); + if (error) + rte_flow_error_set(error, EINVAL, + RTE_FLOW_ERROR_TYPE_HANDLE, NULL, + "Failed to destroy flow."); + return -EINVAL; + } if (ulp_flow_db_validate_flow_func(ulp_ctx, flow_id, func_id) == false) { @@ -284,23 +300,24 @@ bnxt_ulp_flow_flush(struct rte_eth_dev *eth_dev, { struct bnxt_ulp_context *ulp_ctx; int32_t ret = 0; - struct bnxt *bp; uint16_t func_id; ulp_ctx = bnxt_ulp_eth_dev_ptr2_cntxt_get(eth_dev); if (!ulp_ctx) { - BNXT_TF_DBG(DEBUG, "ULP context is not initialized\n"); return ret; } - bp = eth_dev->data->dev_private; /* Free the resources for the last device */ - if (ulp_ctx_deinit_allowed(bp)) { + if (ulp_ctx_deinit_allowed(ulp_ctx)) { ret = ulp_flow_db_session_flow_flush(ulp_ctx); } else if (bnxt_ulp_cntxt_ptr2_flow_db_get(ulp_ctx)) { - func_id = bnxt_get_fw_func_id(eth_dev->data->port_id, - BNXT_ULP_INTF_TYPE_INVALID); - ret = ulp_flow_db_function_flow_flush(ulp_ctx, func_id); + ret = ulp_port_db_port_func_id_get(ulp_ctx, + eth_dev->data->port_id, + &func_id); + if (!ret) + ret = ulp_flow_db_function_flow_flush(ulp_ctx, func_id); + else + BNXT_TF_DBG(ERR, "convert port to func id failed\n"); } if (ret) rte_flow_error_set(error, ret, diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.c b/drivers/net/bnxt/tf_ulp/ulp_port_db.c index 30876478d2..4b4eaeb126 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_port_db.c +++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.c @@ -540,3 +540,44 @@ ulp_port_db_dev_func_id_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt, *ifindex = port_db->ulp_func_id_tbl[func_id].ifindex; return 0; } + +/* + * Api to get the function id for a given port id. + * + * ulp_ctxt [in] Ptr to ulp context + * port_id [in] dpdk port id + * func_id [out] the function id of the given ifindex. + * + * Returns 0 on success or negative number on failure. + */ +int32_t +ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt, + uint16_t port_id, uint16_t *func_id) +{ + struct bnxt_ulp_port_db *port_db; + uint32_t ifindex; + + port_db = bnxt_ulp_cntxt_ptr2_port_db_get(ulp_ctxt); + if (!port_db || port_id >= RTE_MAX_ETHPORTS) { + BNXT_TF_DBG(ERR, "Invalid Arguments\n"); + return -EINVAL; + } + ifindex = port_db->dev_port_list[port_id]; + if (!ifindex) + return -ENOENT; + + switch (port_db->ulp_intf_list[ifindex].type) { + case BNXT_ULP_INTF_TYPE_TRUSTED_VF: + case BNXT_ULP_INTF_TYPE_PF: + *func_id = port_db->ulp_intf_list[ifindex].drv_func_id; + break; + case BNXT_ULP_INTF_TYPE_VF: + case BNXT_ULP_INTF_TYPE_VF_REP: + *func_id = port_db->ulp_intf_list[ifindex].vf_func_id; + break; + default: + *func_id = 0; + break; + } + return 0; +} diff --git a/drivers/net/bnxt/tf_ulp/ulp_port_db.h b/drivers/net/bnxt/tf_ulp/ulp_port_db.h index 2b323d1687..7b85987a0c 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_port_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_port_db.h @@ -259,4 +259,17 @@ int32_t ulp_port_db_dev_func_id_to_ulp_index(struct bnxt_ulp_context *ulp_ctxt, uint32_t func_id, uint32_t *ifindex); +/* + * Api to get the function id for a given port id. + * + * ulp_ctxt [in] Ptr to ulp context + * port_id [in] dpdk port id + * func_id [out] the function id of the given ifindex. + * + * Returns 0 on success or negative number on failure. + */ +int32_t +ulp_port_db_port_func_id_get(struct bnxt_ulp_context *ulp_ctxt, + uint16_t port_id, uint16_t *func_id); + #endif /* _ULP_PORT_DB_H_ */