This patch includes cuckoo has table for testing all the APIs
The cuckoo hash is added for both test_table_tables and test_table_combined
cases.
The testing is completed and the results are OK.
Signed-off-by: Sankar Chokkalingam <sankarx.chokkalingam at intel.com>
Signed-off-by: Guruprasad Rao <guruprasadx.rao at intel.com>
---
app/test/test_table_combined.c | 72 ++++++++++++++++++-
app/test/test_table_combined.h | 3 +-
app/test/test_table_tables.c | 157 ++++++++++++++++++++++++++++++++++++++++-
app/test/test_table_tables.h | 3 +-
4 files changed, 231 insertions(+), 4 deletions(-)
diff --git a/app/test/test_table_combined.c b/app/test/test_table_combined.c
index acb4f4d..518ece0 100644
--- a/app/test/test_table_combined.c
+++ b/app/test/test_table_combined.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -69,6 +69,7 @@ combined_table_test table_tests_combined[] = {
test_table_hash16ext,
test_table_hash32lru,
test_table_hash32ext,
+ test_table_hash_cuckoo_combined,
};
unsigned n_table_tests_combined = RTE_DIM(table_tests_combined);
@@ -786,3 +787,72 @@ test_table_hash32ext(void)
return 0;
}
+
+int
+test_table_hash_cuckoo_combined(void)
+{
+ int status, i;
+
+ /* Traffic flow */
+ struct rte_table_hash_cuckoo_params cuckoo_params = {
+ .key_size = 32,
+ .n_keys = 1<<16,
+ .f_hash = pipeline_test_hash,
+ .seed = 0,
+ .signature_offset = APP_METADATA_OFFSET(0),
+ .key_offset = APP_METADATA_OFFSET(32),
+ .name = "CUCKOO_HASH",
+ };
+
+ uint8_t key_cuckoo[32];
+ uint32_t *kcuckoo = (uint32_t *) key_cuckoo;
+
+ memset(key_cuckoo, 0, sizeof(key_cuckoo));
+ kcuckoo[0] = 0xadadadad;
+
+ struct table_packets table_packets;
+
+ printf("--------------\n");
+ printf("RUNNING TEST - %s\n", __func__);
+ printf("--------------\n");
+ for (i = 0; i < 50; i++)
+ table_packets.hit_packet[i] = 0xadadadad;
+
+ for (i = 0; i < 50; i++)
+ table_packets.miss_packet[i] = 0xbdadadad;
+
+ table_packets.n_hit_packets = 50;
+ table_packets.n_miss_packets = 50;
+
+ status = test_table_type(&rte_table_hash_cuckoo_dosig_ops,
+ (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets,
+ NULL, 0);
+ VERIFY(status, CHECK_TABLE_OK);
+
+ /* Invalid parameters */
+ cuckoo_params.key_size = 0;
+
+ status = test_table_type(&rte_table_hash_cuckoo_dosig_ops,
+ (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets,
+ NULL, 0);
+ VERIFY(status, CHECK_TABLE_TABLE_CONFIG);
+
+ cuckoo_params.key_size = 32;
+ cuckoo_params.n_keys = 0;
+
+ status = test_table_type(&rte_table_hash_cuckoo_dosig_ops,
+ (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets,
+ NULL, 0);
+ VERIFY(status, CHECK_TABLE_TABLE_CONFIG);
+
+ cuckoo_params.n_keys = 1<<16;
+ cuckoo_params.f_hash = NULL;
+
+ status = test_table_type(&rte_table_hash_cuckoo_dosig_ops,
+ (void *)&cuckoo_params, (void *)key_cuckoo, &table_packets,
+ NULL, 0);
+ VERIFY(status, CHECK_TABLE_TABLE_CONFIG);
+
+ return 0;
+}
+
diff --git a/app/test/test_table_combined.h b/app/test/test_table_combined.h
index f94f09f..e1619f9 100644
--- a/app/test/test_table_combined.h
+++ b/app/test/test_table_combined.h
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -47,6 +47,7 @@ int test_table_hash16ext(void);
int test_table_hash32unoptimized(void);
int test_table_hash32lru(void);
int test_table_hash32ext(void);
+int test_table_hash_cuckoo_combined(void);
/* Extern variables */
typedef int (*combined_table_test)(void);
diff --git a/app/test/test_table_tables.c b/app/test/test_table_tables.c
index cbbbfc1..e8976f8 100644
--- a/app/test/test_table_tables.c
+++ b/app/test/test_table_tables.c
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,7 @@ table_test table_tests[] = {
test_table_lpm_ipv6,
test_table_hash_lru,
test_table_hash_ext,
+ test_table_hash_cuckoo,
};
#define PREPARE_PACKET(mbuf, value) do { \
@@ -942,3 +943,157 @@ test_table_hash_ext(void)
return 0;
}
+
+
+int
+test_table_hash_cuckoo(void)
+{
+ int status, i;
+ uint64_t expected_mask = 0, result_mask;
+ struct rte_mbuf *mbufs[RTE_PORT_IN_BURST_SIZE_MAX];
+ void *table;
+ char *entries[RTE_PORT_IN_BURST_SIZE_MAX];
+ char entry;
+ void *entry_ptr;
+ int key_found;
+ uint32_t entry_size = 1;
+
+ /* Initialize params and create tables */
+ struct rte_table_hash_cuckoo_params cuckoo_params = {
+ .key_size = 32,
+ .n_keys = 1 << 24,
+ .f_hash = pipeline_test_hash,
+ .seed = 0,
+ .signature_offset = APP_METADATA_OFFSET(0),
+ .key_offset = APP_METADATA_OFFSET(32),
+ .name = "CUCKOO",
+ };
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(NULL, 0, entry_size);
+ if (table != NULL)
+ return -1;
+
+ cuckoo_params.key_size = 0;
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0,
entry_size);
+ if (table != NULL)
+ return -2;
+
+ cuckoo_params.key_size = 32;
+ cuckoo_params.n_keys = 0;
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0,
entry_size);
+ if (table != NULL)
+ return -3;
+
+ cuckoo_params.n_keys = 1 << 24;
+ cuckoo_params.f_hash = NULL;
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0,
entry_size);
+ if (table != NULL)
+ return -4;
+
+ cuckoo_params.f_hash = pipeline_test_hash;
+ cuckoo_params.name= NULL;
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0,
entry_size);
+ if (table != NULL)
+ return -5;
+
+ cuckoo_params.name= "CUCKOO";
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0,
entry_size);
+ if (table == NULL)
+ return -6;
+
+ /* Free */
+ status = rte_table_hash_cuckoo_dosig_ops.f_free(table);
+ if (status < 0)
+ return -7;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_free(NULL);
+ if (status == 0)
+ return -8;
+
+ /* Add */
+ uint8_t key_cuckoo[32];
+ uint32_t *kcuckoo = (uint32_t *) &key_cuckoo;
+
+ memset(key_cuckoo, 0, 32);
+ kcuckoo[0] = rte_be_to_cpu_32(0xadadadad);
+
+ table = rte_table_hash_cuckoo_dosig_ops.f_create(&cuckoo_params, 0, 1);
+ if (table == NULL)
+ return -9;
+
+ entry = 'A';
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(NULL, &key_cuckoo,
&entry, &key_found,
+ &entry_ptr);
+ if (status == 0)
+ return -10;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(table, NULL, &entry,
&key_found,
+ &entry_ptr);
+ if (status == 0)
+ return -11;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo,
NULL, &key_found,
+ &entry_ptr);
+ if (status == 0)
+ return -12;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo,
&entry, &key_found,
+ &entry_ptr);
+ if (status != 0)
+ return -13;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo,
&entry, &key_found,
+ &entry_ptr);
+ if (status != 0)
+ return -14;
+
+ /* Delete */
+ status = rte_table_hash_cuckoo_dosig_ops.f_delete(NULL, &key_cuckoo,
&key_found, NULL);
+ if (status == 0)
+ return -15;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, NULL,
&key_found, NULL);
+ if (status == 0)
+ return -16;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, &key_cuckoo,
&key_found, NULL);
+ if (status != 0)
+ return -17;
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_delete(table, &key_cuckoo,
&key_found, NULL);
+ if (status != -ENOENT)
+ return -18;
+
+ /* Traffic flow */
+ entry = 'A';
+ status = rte_table_hash_cuckoo_dosig_ops.f_add(table, &key_cuckoo,
&entry, &key_found,
+ &entry_ptr);
+ if (status < 0)
+ return -19;
+
+ for (i = 0; i < RTE_PORT_IN_BURST_SIZE_MAX; i++)
+ if (i % 2 == 0) {
+ expected_mask |= (uint64_t)1 << i;
+ PREPARE_PACKET(mbufs[i], 0xadadadad);
+ } else
+ PREPARE_PACKET(mbufs[i], 0xadadadab);
+
+ rte_table_hash_cuckoo_dosig_ops.f_lookup(table, mbufs, -1,
+ &result_mask, (void **)entries);
+ if (result_mask != expected_mask)
+ return -20;
+
+ /* Free resources */
+ for (i = 0; i < RTE_PORT_IN_BURST_SIZE_MAX; i++)
+ rte_pktmbuf_free(mbufs[i]);
+
+ status = rte_table_hash_cuckoo_dosig_ops.f_free(table);
+
+ return 0;
+}
+
diff --git a/app/test/test_table_tables.h b/app/test/test_table_tables.h
index b368623..3531136 100644
--- a/app/test/test_table_tables.h
+++ b/app/test/test_table_tables.h
@@ -1,7 +1,7 @@
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -32,6 +32,7 @@
*/
/* Test prototypes */
+int test_table_hash_cuckoo(void);
int test_table_lpm(void);
int test_table_lpm_ipv6(void);
int test_table_array(void);
--
2.5.0
