hash: rename unused field

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 <thomas.monjalon@6wind.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/app/test/test_func_reentrancy.c b/app/test/test_func_reentrancy.c
index 85504c09bf75b8eb9a00548ea4cec41a1a3d4b66..be617739e3a09d291145ba7fd8663343967456cd 100644 (file)
--- 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 e9a522b5ac6ca8db2569ac7701f1fff59c9e2a42..a87fc80d0e4ee984c256d0fd1219b371076d9c2b 100644 (file)
--- 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 682ae94cc2435e79f001faf678198c037d22b9f3..39602cbc82d52398fca8b91dd9e570c42d1cf534 100644 (file)
--- 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 ca12d2d09a8e26bb5550b955ec1a092aa581a54c..9c2abfb4411191416a9cd9734493d26b1194688a 100644 (file)
--- 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 d4eba1a3c95a2373f4e1b12f156a0d0421b4dfde..6eb459dc53791410de0cdbc17182afb47735abdf 100644 (file)
--- 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 ccbb02fdcec8cbb4859ec5885a675c0d9f64166e..01f610ed61f8dfca6ed7a10cb7a528f197a7f181 100644 (file)
--- 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 5c22ed1846d289135b56c2989f2bb6ef300b0b42..def95940fb1aad7c53cb25022c151d48aa350c05 100644 (file)
--- 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 68109d5182762d7cea6898e4454191938f0e3ac6..1cddc077a2702b6a275f1cb76114a9ad8f6f5574 100644 (file)
--- 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. */