From patchwork Mon Jul 13 16:38:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 6360 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A55DB592B; Mon, 13 Jul 2015 18:39:05 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id D2F80569E for ; Mon, 13 Jul 2015 18:39:03 +0200 (CEST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP; 13 Jul 2015 09:39:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,463,1432623600"; d="scan'208";a="523524400" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 13 Jul 2015 09:38:49 -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 t6DGcjdo009190; Mon, 13 Jul 2015 17:38:45 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t6DGcjnX025952; Mon, 13 Jul 2015 17:38:45 +0100 Received: (from bricha3@localhost) by sivswdev01.ir.intel.com with id t6DGcjdm025947; Mon, 13 Jul 2015 17:38:45 +0100 From: Bruce Richardson To: dev@dpdk.org Date: Mon, 13 Jul 2015 17:38:45 +0100 Message-Id: <1436805525-25916-1-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1436804751-23156-1-git-send-email-bruce.richardson@intel.com> References: <1436804751-23156-1-git-send-email-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2] hash: rename unused field to "reserved" 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The cuckoo hash has a fixed number of entries per bucket, so the configuration parameter for this is unused. We change this field in the parameters struct to "reserved" to indicate that there is now no such parameter value, while at the same time keeping ABI consistency. Fixes: 48a399119619 ("hash: replace with cuckoo hash implementation") Suggested-by: Thomas Monjalon Signed-off-by: Bruce Richardson --- app/test/test_func_reentrancy.c | 1 - app/test/test_hash_perf.c | 1 - app/test/test_hash_scaling.c | 1 - drivers/net/enic/enic_clsf.c | 2 -- examples/l3fwd-power/main.c | 2 -- examples/l3fwd-vf/main.c | 1 - examples/l3fwd/main.c | 2 -- lib/librte_hash/rte_hash.h | 2 +- 8 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c index 85504c0..be61773 100644 --- a/app/test/test_func_reentrancy.c +++ b/app/test/test_func_reentrancy.c @@ -226,7 +226,6 @@ hash_create_free(__attribute__((unused)) void *arg) struct rte_hash_parameters hash_params = { .name = NULL, .entries = 16, - .bucket_entries = 4, .key_len = 4, .hash_func = (rte_hash_function)rte_jhash_32b, .hash_func_init_val = 0, diff --git a/app/test/test_hash_perf.c b/app/test/test_hash_perf.c index e9a522b..a87fc80 100644 --- a/app/test/test_hash_perf.c +++ b/app/test/test_hash_perf.c @@ -100,7 +100,6 @@ int32_t positions[KEYS_TO_ADD]; /* Parameters used for hash table in unit test functions. */ static struct rte_hash_parameters ut_params = { .entries = MAX_ENTRIES, - .bucket_entries = BUCKET_SIZE, .hash_func = rte_jhash, .hash_func_init_val = 0, }; diff --git a/app/test/test_hash_scaling.c b/app/test/test_hash_scaling.c index 682ae94..39602cb 100644 --- a/app/test/test_hash_scaling.c +++ b/app/test/test_hash_scaling.c @@ -129,7 +129,6 @@ test_hash_scaling(int locking_mode) uint64_t i, key; struct rte_hash_parameters hash_params = { .entries = num_iterations*2, - .bucket_entries = 16, .key_len = sizeof(key), .hash_func = rte_hash_crc, .hash_func_init_val = 0, diff --git a/drivers/net/enic/enic_clsf.c b/drivers/net/enic/enic_clsf.c index ca12d2d..9c2abfb 100644 --- a/drivers/net/enic/enic_clsf.c +++ b/drivers/net/enic/enic_clsf.c @@ -63,7 +63,6 @@ #define SOCKET_0 0 #define ENICPMD_CLSF_HASH_ENTRIES ENICPMD_FDIR_MAX -#define ENICPMD_CLSF_BUCKET_ENTRIES 4 void enic_fdir_stats_get(struct enic *enic, struct rte_eth_fdir_stats *stats) { @@ -245,7 +244,6 @@ int enic_clsf_init(struct enic *enic) struct rte_hash_parameters hash_params = { .name = "enicpmd_clsf_hash", .entries = ENICPMD_CLSF_HASH_ENTRIES, - .bucket_entries = ENICPMD_CLSF_BUCKET_ENTRIES, .key_len = RTE_HASH_KEY_LENGTH_MAX, .hash_func = DEFAULT_HASH_FUNC, .hash_func_init_val = 0, diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index d4eba1a..6eb459d 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1247,7 +1247,6 @@ setup_hash(int socketid) struct rte_hash_parameters ipv4_l3fwd_hash_params = { .name = NULL, .entries = L3FWD_HASH_ENTRIES, - .bucket_entries = 4, .key_len = sizeof(struct ipv4_5tuple), .hash_func = DEFAULT_HASH_FUNC, .hash_func_init_val = 0, @@ -1256,7 +1255,6 @@ setup_hash(int socketid) struct rte_hash_parameters ipv6_l3fwd_hash_params = { .name = NULL, .entries = L3FWD_HASH_ENTRIES, - .bucket_entries = 4, .key_len = sizeof(struct ipv6_5tuple), .hash_func = DEFAULT_HASH_FUNC, .hash_func_init_val = 0, diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c index ccbb02f..01f610e 100644 --- a/examples/l3fwd-vf/main.c +++ b/examples/l3fwd-vf/main.c @@ -251,7 +251,6 @@ static lookup_struct_t *l3fwd_lookup_struct[NB_SOCKETS]; struct rte_hash_parameters l3fwd_hash_params = { .name = "l3fwd_hash_0", .entries = L3FWD_HASH_ENTRIES, - .bucket_entries = 4, .key_len = sizeof(struct ipv4_5tuple), .hash_func = DEFAULT_HASH_FUNC, .hash_func_init_val = 0, diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c index 5c22ed1..def9594 100644 --- a/examples/l3fwd/main.c +++ b/examples/l3fwd/main.c @@ -2162,7 +2162,6 @@ setup_hash(int socketid) struct rte_hash_parameters ipv4_l3fwd_hash_params = { .name = NULL, .entries = L3FWD_HASH_ENTRIES, - .bucket_entries = 4, .key_len = sizeof(union ipv4_5tuple_host), .hash_func = ipv4_hash_crc, .hash_func_init_val = 0, @@ -2171,7 +2170,6 @@ setup_hash(int socketid) struct rte_hash_parameters ipv6_l3fwd_hash_params = { .name = NULL, .entries = L3FWD_HASH_ENTRIES, - .bucket_entries = 4, .key_len = sizeof(union ipv6_5tuple_host), .hash_func = ipv6_hash_crc, .hash_func_init_val = 0, diff --git a/lib/librte_hash/rte_hash.h b/lib/librte_hash/rte_hash.h index 68109d5..1cddc07 100644 --- a/lib/librte_hash/rte_hash.h +++ b/lib/librte_hash/rte_hash.h @@ -75,7 +75,7 @@ typedef uint32_t (*rte_hash_function)(const void *key, uint32_t key_len, struct rte_hash_parameters { const char *name; /**< Name of the hash. */ uint32_t entries; /**< Total hash table entries. */ - uint32_t bucket_entries; /**< Bucket entries. */ + uint32_t reserved; /**< Unused field. Should be set to 0 */ uint32_t key_len; /**< Length of hash key. */ rte_hash_function hash_func; /**< Primary Hash function used to calculate hash. */ uint32_t hash_func_init_val; /**< Init value used by hash_func. */