From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id C42AAAFCF for ; Fri, 20 Jun 2014 17:43:15 +0200 (CEST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 20 Jun 2014 08:43:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,514,1400050800"; d="scan'208";a="558547212" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga002.fm.intel.com with ESMTP; 20 Jun 2014 08:42:27 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s5KFgQOp024710; Fri, 20 Jun 2014 16:42:26 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id s5KFgQXJ003231; Fri, 20 Jun 2014 16:42:26 +0100 Received: (from aburakov@localhost) by sivswdev01.ir.intel.com with id s5KFgQWk003226; Fri, 20 Jun 2014 16:42:26 +0100 From: Anatoly Burakov To: dev@dpdk.org Date: Fri, 20 Jun 2014 16:42:21 +0100 Message-Id: <9def94781536525dfacb90f580ad080539b7bdd1.1403277437.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH 06/10] rte_fbk_hash: make rte_fbk_hash tailq fully local X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jun 2014 15:43:16 -0000 Signed-off-by: Anatoly Burakov --- lib/librte_hash/rte_fbk_hash.c | 73 ++++++++++++++++++++++++++++++++++-------- lib/librte_hash/rte_fbk_hash.h | 3 -- 2 files changed, 59 insertions(+), 17 deletions(-) diff --git a/lib/librte_hash/rte_fbk_hash.c b/lib/librte_hash/rte_fbk_hash.c index 4d67554..1356cf4 100644 --- a/lib/librte_hash/rte_fbk_hash.c +++ b/lib/librte_hash/rte_fbk_hash.c @@ -54,7 +54,7 @@ #include "rte_fbk_hash.h" -TAILQ_HEAD(rte_fbk_hash_list, rte_fbk_hash_table); +TAILQ_HEAD(rte_fbk_hash_list, rte_tailq_entry); /** * Performs a lookup for an existing hash table, and returns a pointer to @@ -69,24 +69,29 @@ TAILQ_HEAD(rte_fbk_hash_list, rte_fbk_hash_table); struct rte_fbk_hash_table * rte_fbk_hash_find_existing(const char *name) { - struct rte_fbk_hash_table *h; + struct rte_fbk_hash_table *h = NULL; + struct rte_tailq_entry *te; struct rte_fbk_hash_list *fbk_hash_list; /* check that we have an initialised tail queue */ if ((fbk_hash_list = - RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) { + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, + rte_fbk_hash_list)) == NULL) { rte_errno = E_RTE_NO_TAILQ; return NULL; } rte_rwlock_read_lock(RTE_EAL_TAILQ_RWLOCK); - TAILQ_FOREACH(h, fbk_hash_list, next) { + TAILQ_FOREACH(te, fbk_hash_list, next) { + h = (struct rte_fbk_hash_table *) te->data; if (strncmp(name, h->name, RTE_FBK_HASH_NAMESIZE) == 0) break; } rte_rwlock_read_unlock(RTE_EAL_TAILQ_RWLOCK); - if (h == NULL) + if (te == NULL) { rte_errno = ENOENT; + return NULL; + } return h; } @@ -104,6 +109,7 @@ struct rte_fbk_hash_table * rte_fbk_hash_create(const struct rte_fbk_hash_params *params) { struct rte_fbk_hash_table *ht = NULL; + struct rte_tailq_entry *te; char hash_name[RTE_FBK_HASH_NAMESIZE]; const uint32_t mem_size = sizeof(*ht) + (sizeof(ht->t[0]) * params->entries); @@ -112,7 +118,8 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) /* check that we have an initialised tail queue */ if ((fbk_hash_list = - RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list)) == NULL) { + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, + rte_fbk_hash_list)) == NULL) { rte_errno = E_RTE_NO_TAILQ; return NULL; } @@ -134,20 +141,28 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); /* guarantee there's no existing */ - TAILQ_FOREACH(ht, fbk_hash_list, next) { + TAILQ_FOREACH(te, fbk_hash_list, next) { + ht = (struct rte_fbk_hash_table *) te->data; if (strncmp(params->name, ht->name, RTE_FBK_HASH_NAMESIZE) == 0) break; } - if (ht != NULL) + if (te != NULL) goto exit; + te = rte_zmalloc("FBK_HASH_TAILQ_ENTRY", sizeof(*te), 0); + if (te == NULL) { + RTE_LOG(ERR, HASH, "Failed to allocate tailq entry\n"); + goto exit; + } + /* Allocate memory for table. */ - ht = (struct rte_fbk_hash_table *)rte_malloc_socket(hash_name, mem_size, + ht = (struct rte_fbk_hash_table *)rte_zmalloc_socket(hash_name, mem_size, 0, params->socket_id); - if (ht == NULL) + if (ht == NULL) { + RTE_LOG(ERR, HASH, "Failed to allocate fbk hash table\n"); + rte_free(te); goto exit; - - memset(ht, 0, mem_size); + } /* Set up hash table context. */ rte_snprintf(ht->name, sizeof(ht->name), "%s", params->name); @@ -169,7 +184,9 @@ rte_fbk_hash_create(const struct rte_fbk_hash_params *params) ht->init_val = RTE_FBK_HASH_INIT_VAL_DEFAULT; } - TAILQ_INSERT_TAIL(fbk_hash_list, ht, next); + te->data = (void *) ht; + + TAILQ_INSERT_TAIL(fbk_hash_list, te, next); exit: rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); @@ -186,10 +203,38 @@ exit: void rte_fbk_hash_free(struct rte_fbk_hash_table *ht) { + struct rte_tailq_entry *te; + struct rte_fbk_hash_list *fbk_hash_list; + if (ht == NULL) return; - RTE_EAL_TAILQ_REMOVE(RTE_TAILQ_FBK_HASH, rte_fbk_hash_list, ht); + /* check that we have an initialised tail queue */ + if ((fbk_hash_list = + RTE_TAILQ_LOOKUP_BY_IDX(RTE_TAILQ_FBK_HASH, + rte_fbk_hash_list)) == NULL) { + rte_errno = E_RTE_NO_TAILQ; + return; + } + + rte_rwlock_write_lock(RTE_EAL_TAILQ_RWLOCK); + + /* find out tailq entry */ + TAILQ_FOREACH(te, fbk_hash_list, next) { + if (te->data == (void *) ht) + break; + } + + if (te == NULL) { + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + return; + } + + TAILQ_REMOVE(fbk_hash_list, te, next); + + rte_rwlock_write_unlock(RTE_EAL_TAILQ_RWLOCK); + rte_free(ht); + rte_free(te); } diff --git a/lib/librte_hash/rte_fbk_hash.h b/lib/librte_hash/rte_fbk_hash.h index 4d1a316..3d229bf 100644 --- a/lib/librte_hash/rte_fbk_hash.h +++ b/lib/librte_hash/rte_fbk_hash.h @@ -103,11 +103,8 @@ union rte_fbk_hash_entry { }; - /** The four-byte key hash table structure. */ struct rte_fbk_hash_table { - TAILQ_ENTRY(rte_fbk_hash_table) next; /**< Linked list. */ - char name[RTE_FBK_HASH_NAMESIZE]; /**< Name of the hash. */ uint32_t entries; /**< Total number of entries. */ uint32_t entries_per_bucket; /**< Number of entries in a bucket. */ -- 1.8.1.4