From: Farah Smith <[email protected]> Remove code allocating entry 0 during initialization as it is not required. 0 is a valid entry. Update session_bmp naming to more descriptive logical_id_bmp. The data structure cfa_tcam_mgr_data is per session. Within the cfa_tcam_mgr_data, logical ids for TCAM entries are allocated from a global pool.
Signed-off-by: Farah Smith <[email protected]> Reviewed-by: Peter Spreadborough <[email protected]> --- drivers/net/bnxt/tf_core/cfa_tcam_mgr.c | 35 +++++++------------ .../net/bnxt/tf_core/cfa_tcam_mgr_device.h | 6 ++-- drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c | 2 +- drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c | 2 +- 4 files changed, 19 insertions(+), 26 deletions(-) diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c index 89ca6814e5..c527750041 100644 --- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c +++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr.c @@ -914,9 +914,8 @@ cfa_tcam_mgr_bitmap_alloc(struct tf *tfp __rte_unused, struct cfa_tcam_mgr_data *tcam_mgr_data) { struct tfp_calloc_parms cparms; - uint64_t session_bmp_size; - struct bitalloc *session_bmp; - int32_t first_idx; + uint64_t logical_id_bmp_size; + struct bitalloc *logical_id_bmp; int max_entries; int rc; @@ -924,11 +923,11 @@ cfa_tcam_mgr_bitmap_alloc(struct tf *tfp __rte_unused, return -CFA_TCAM_MGR_ERR_CODE(INVAL); max_entries = tcam_mgr_data->cfa_tcam_mgr_max_entries; - session_bmp_size = (sizeof(uint64_t) * + logical_id_bmp_size = (sizeof(uint64_t) * (((max_entries - 1) / sizeof(uint64_t)) + 1)); cparms.nitems = 1; - cparms.size = session_bmp_size; + cparms.size = logical_id_bmp_size; cparms.alignment = 0; rc = tfp_calloc(&cparms); if (rc) { @@ -939,23 +938,15 @@ cfa_tcam_mgr_bitmap_alloc(struct tf *tfp __rte_unused, return -CFA_TCAM_MGR_ERR_CODE(NOMEM); } - session_bmp = (struct bitalloc *)cparms.mem_va; - rc = ba_init(session_bmp, max_entries, true); + logical_id_bmp = (struct bitalloc *)cparms.mem_va; + rc = ba_init(logical_id_bmp, max_entries, true); - tcam_mgr_data->session_bmp = session_bmp; - tcam_mgr_data->session_bmp_size = max_entries; - - /* Allocate first index to avoid idx 0 */ - first_idx = ba_alloc(tcam_mgr_data->session_bmp); - if (first_idx == BA_FAIL) { - tfp_free(tcam_mgr_data->session_bmp); - tcam_mgr_data->session_bmp = NULL; - return -CFA_TCAM_MGR_ERR_CODE(NOSPC); - } + tcam_mgr_data->logical_id_bmp = logical_id_bmp; + tcam_mgr_data->logical_id_bmp_size = max_entries; TFP_DRV_LOG(DEBUG, "session bitmap size is %" PRIX64 "\n", - tcam_mgr_data->session_bmp_size); + tcam_mgr_data->logical_id_bmp_size); return 0; } @@ -1135,7 +1126,7 @@ static int cfa_tcam_mgr_free_entries(struct tf *tfp) * may not be of the same type, resulting in errors. */ - while ((entry_id = ba_find_next_inuse_free(tcam_mgr_data->session_bmp, + while ((entry_id = ba_find_next_inuse_free(tcam_mgr_data->logical_id_bmp, 0)) >= 0) { free_parms.id = entry_id; free_parms.type = CFA_TCAM_MGR_TBL_TYPE_MAX; @@ -1405,7 +1396,7 @@ static int cfa_tcam_mgr_alloc_entry(struct tf *tfp __rte_unused, int32_t free_idx; /* Scan bitmap to get the free pool */ - free_idx = ba_alloc(tcam_mgr_data->session_bmp); + free_idx = ba_alloc(tcam_mgr_data->logical_id_bmp); if (free_idx == BA_FAIL) { PMD_DRV_LOG_LINE(ERR, "Table full (session)"); @@ -1423,10 +1414,10 @@ static int cfa_tcam_mgr_free_entry(struct tf *tfp __rte_unused, { int rc = 0; - if (entry_id >= tcam_mgr_data->session_bmp_size) + if (entry_id >= tcam_mgr_data->logical_id_bmp_size) return -CFA_TCAM_MGR_ERR_CODE(INVAL); - rc = ba_free(tcam_mgr_data->session_bmp, entry_id); + rc = ba_free(tcam_mgr_data->logical_id_bmp, entry_id); if (rc) return rc; diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_device.h b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_device.h index 9d7f560e7b..1b5803f021 100644 --- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_device.h +++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_device.h @@ -123,8 +123,10 @@ struct cfa_tcam_mgr_data { cfa_tcam_mgr_tables[TF_DIR_MAX][CFA_TCAM_MGR_TBL_TYPE_MAX]; void *table_rows; struct cfa_tcam_mgr_entry_data *entry_data; - struct bitalloc *session_bmp; - uint64_t session_bmp_size; + /* Logical ids assigned for all TCAM types */ + struct bitalloc *logical_id_bmp; + /* Sum of all TCAM entries allocated */ + uint64_t logical_id_bmp_size; void *row_tables[TF_DIR_MAX][TF_TCAM_TBL_TYPE_MAX]; void *rx_row_data; void *tx_row_data; diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c index ddc2728785..55b6b96439 100644 --- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c +++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p4.c @@ -374,7 +374,7 @@ static void cfa_tcam_mgr_data_free(struct tf_session *tfs) tfp_free(tcam_mgr_data->table_rows); tfp_free(tcam_mgr_data->entry_data); - tfp_free(tcam_mgr_data->session_bmp); + tfp_free(tcam_mgr_data->logical_id_bmp); cfa_tcam_mgr_row_data_free(tcam_mgr_data); tfp_free(tcam_mgr_data); diff --git a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c index d5725f92e0..5b7e469e8a 100644 --- a/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c +++ b/drivers/net/bnxt/tf_core/cfa_tcam_mgr_p58.c @@ -372,7 +372,7 @@ static void cfa_tcam_mgr_data_free(struct tf_session *tfs) tfp_free(tcam_mgr_data->table_rows); tfp_free(tcam_mgr_data->entry_data); - tfp_free(tcam_mgr_data->session_bmp); + tfp_free(tcam_mgr_data->logical_id_bmp); cfa_tcam_mgr_row_data_free(tcam_mgr_data); tfp_free(tcam_mgr_data); -- 2.39.5 (Apple Git-154)
