/**
* EM Pool
*/
-#if (TF_EM_ALLOC == 1)
#include "dpool.h"
-#else
-
-/**
- * Create EM Tbl pool of memory indexes.
- *
- * [in] dir
- * direction
- * [in] num_entries
- * number of entries to write
- * [in] start
- * starting offset
- *
- * Return:
- * 0 - Success, entry allocated - no search support
- * -ENOMEM -EINVAL -EOPNOTSUPP
- * - Failure, entry not allocated, out of resources
- */
-static int
-tf_create_em_pool(struct tf_session *tfs,
- enum tf_dir dir,
- uint32_t num_entries,
- uint32_t start)
-{
- struct tfp_calloc_parms parms;
- uint32_t i, j;
- int rc = 0;
- struct stack *pool;
-
- /*
- * Allocate stack pool
- */
- parms.nitems = 1;
- parms.size = sizeof(struct stack);
- parms.alignment = 0;
-
- rc = tfp_calloc(&parms);
-
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s, EM stack allocation failure %s\n",
- tf_dir_2_str(dir),
- strerror(-rc));
- return rc;
- }
-
- pool = (struct stack *)parms.mem_va;
- tfs->em_pool[dir] = (void *)pool;
-
- /* Assumes that num_entries has been checked before we get here */
- parms.nitems = num_entries / TF_SESSION_EM_ENTRY_SIZE;
- parms.size = sizeof(uint32_t);
- parms.alignment = 0;
-
- rc = tfp_calloc(&parms);
-
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s, EM pool allocation failure %s\n",
- tf_dir_2_str(dir),
- strerror(-rc));
- return rc;
- }
-
- /* Create empty stack
- */
- rc = stack_init(num_entries / TF_SESSION_EM_ENTRY_SIZE,
- (uint32_t *)parms.mem_va,
- pool);
-
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s, EM pool stack init failure %s\n",
- tf_dir_2_str(dir),
- strerror(-rc));
- goto cleanup;
- }
-
- /* Fill pool with indexes
- */
- j = start + num_entries - TF_SESSION_EM_ENTRY_SIZE;
-
- for (i = 0; i < (num_entries / TF_SESSION_EM_ENTRY_SIZE); i++) {
- rc = stack_push(pool, j);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s, EM pool stack push failure %s\n",
- tf_dir_2_str(dir),
- strerror(-rc));
- goto cleanup;
- }
-
- j -= TF_SESSION_EM_ENTRY_SIZE;
- }
-
- if (!stack_is_full(pool)) {
- rc = -EINVAL;
- TFP_DRV_LOG(ERR,
- "%s, EM pool stack failure %s\n",
- tf_dir_2_str(dir),
- strerror(-rc));
- goto cleanup;
- }
-
- return 0;
-cleanup:
- tfp_free((void *)parms.mem_va);
- tfp_free((void *)tfs->em_pool[dir]);
- tfs->em_pool[dir] = NULL;
- return rc;
-}
-
-/**
- * Create EM Tbl pool of memory indexes.
- *
- * [in] dir
- * direction
- *
- * Return:
- */
-static void
-tf_free_em_pool(struct tf_session *tfs,
- enum tf_dir dir)
-{
- struct stack *pool = (struct stack *)tfs->em_pool[dir];
- uint32_t *ptr;
-
- if (pool != NULL) {
- ptr = stack_items(pool);
-
- if (ptr != NULL)
- tfp_free(ptr);
-
- tfp_free(pool);
- tfs->em_pool[dir] = NULL;
- }
-}
-#endif /* TF_EM_ALLOC != 1 */
/**
* Insert EM internal entry API
uint8_t rptr_entry = 0;
uint8_t num_of_entries = 0;
struct tf_session *tfs;
-#if (TF_EM_ALLOC == 1)
struct dpool *pool;
-#else
- struct stack *pool;
-#endif
uint32_t index;
/* Retrieve the session information */
return rc;
}
-#if (TF_EM_ALLOC == 1)
pool = (struct dpool *)tfs->em_pool[parms->dir];
index = dpool_alloc(pool, TF_SESSION_EM_ENTRY_SIZE, 0);
if (index == DP_INVALID_INDEX) {
tf_dir_2_str(parms->dir));
return -1;
}
-#else
- pool = (struct stack *)tfs->em_pool[parms->dir];
- rc = stack_pop(pool, &index);
- if (rc) {
- PMD_DRV_LOG(ERR,
- "%s, EM entry index allocation failed\n",
- tf_dir_2_str(parms->dir));
- return rc;
- }
-#endif
rptr_index = index;
&num_of_entries);
if (rc) {
/* Free the allocated index before returning */
-#if (TF_EM_ALLOC == 1)
dpool_free(pool, index);
-#else
- stack_push(pool, index);
-#endif
return -1;
}
TF_SET_GFID(gfid,
{
int rc = 0;
struct tf_session *tfs;
-#if (TF_EM_ALLOC == 1)
struct dpool *pool;
-#else
- struct stack *pool;
-#endif
/* Retrieve the session information */
rc = tf_session_get_session(tfp, &tfs);
if (rc) {
/* Return resource to pool */
if (rc == 0) {
-#if (TF_EM_ALLOC == 1)
pool = (struct dpool *)tfs->em_pool[parms->dir];
dpool_free(pool, parms->index);
-#else
- pool = (struct stack *)tfs->em_pool[parms->dir];
- stack_push(pool, parms->index);
-#endif
}
return rc;
}
-#if (TF_EM_ALLOC == 1)
static int
tf_em_move_callback(void *user_data,
uint64_t entry_data,
return rc;
}
-#endif
int
tf_em_int_bind(struct tf *tfp,
struct tf_em_cfg_parms *parms)
{
int rc;
+ int db_rc[TF_DIR_MAX] = { 0 };
int i;
struct tf_rm_create_db_parms db_cfg = { 0 };
struct tf_rm_get_alloc_info_parms iparms;
db_cfg.rm_db = (void *)&em_db->em_db[i];
if (tf_session_is_shared_session(tfs) &&
(!tf_session_is_shared_session_creator(tfs)))
- rc = tf_rm_create_db_no_reservation(tfp, &db_cfg);
+ db_rc[i] = tf_rm_create_db_no_reservation(tfp, &db_cfg);
else
- rc = tf_rm_create_db(tfp, &db_cfg);
- if (rc) {
- TFP_DRV_LOG(ERR,
- "%s: EM Int DB creation failed\n",
- tf_dir_2_str(i));
+ db_rc[i] = tf_rm_create_db(tfp, &db_cfg);
+ }
- return rc;
- }
+ /* No db created */
+ if (db_rc[TF_DIR_RX] && db_rc[TF_DIR_TX]) {
+ TFP_DRV_LOG(ERR, "EM Int DB creation failed\n");
+ return db_rc[TF_DIR_RX];
}
+
if (!tf_session_is_shared_session(tfs)) {
for (i = 0; i < TF_DIR_MAX; i++) {
iparms.rm_db = em_db->em_db[i];
tf_dir_2_str(i));
return rc;
}
-#if (TF_EM_ALLOC == 1)
+
/*
* Allocate stack pool
*/
7,
(void *)tfp,
tf_em_move_callback);
-#else
- rc = tf_create_em_pool(tfs,
- i,
- iparms.info->entry.stride,
- iparms.info->entry.start);
-#endif
/* Logging handled in tf_create_em_pool */
if (rc)
return rc;
return rc;
if (!tf_session_is_shared_session(tfs)) {
- for (i = 0; i < TF_DIR_MAX; i++)
-#if (TF_EM_ALLOC == 1)
+ for (i = 0; i < TF_DIR_MAX; i++) {
+ if (tfs->em_pool[i] == NULL)
+ continue;
dpool_free_all(tfs->em_pool[i]);
-#else
- tf_free_em_pool(tfs, i);
-#endif
+ }
}
rc = tf_session_get_db(tfp, TF_MODULE_TYPE_EM, &em_db_ptr);
if (rc) {
- TFP_DRV_LOG(INFO,
- "Em_db is not initialized, rc:%s\n",
- strerror(-rc));
return 0;
}
em_db = (struct em_rm_db *)em_db_ptr;
TF_CHECK_PARMS2(tfp, em);
rc = tf_session_get_db(tfp, TF_MODULE_TYPE_EM, &em_db_ptr);
- if (rc) {
- TFP_DRV_LOG(INFO,
- "No resource allocated for em from session\n");
- return 0;
- }
+ if (rc == -ENOMEM)
+ return 0; /* db does not exist */
+ else if (rc)
+ return rc; /* db error */
+
em_db = (struct em_rm_db *)em_db_ptr;
- /* check if reserved resource for WC is multiple of num_slices */
+ /* check if reserved resource for EM is multiple of num_slices */
for (d = 0; d < TF_DIR_MAX; d++) {
ainfo.rm_db = em_db->em_db[d];
dinfo = em[d].info;
+ if (!ainfo.rm_db)
+ continue;
+
ainfo.info = (struct tf_rm_alloc_info *)dinfo;
ainfo.subtype = 0;
rc = tf_rm_get_all_info(&ainfo, TF_EM_TBL_TYPE_MAX);
git.droids-corp.org / dpdk.git / blobdiff