@@ -73,6 +73,7 @@ SRCS-y += test_bitmap.c
SRCS-y += test_reciprocal_division.c
SRCS-y += test_reciprocal_division_perf.c
SRCS-y += test_fbarray.c
+SRCS-y += test_kv_hash.c
SRCS-y += test_external_mem.c
SRCS-y += test_rand_perf.c
@@ -99,6 +99,18 @@
"Report": None,
},
{
+ "Name": "KV hash autotest",
+ "Command": "kv_hash_autotest",
+ "Func": default_autotest,
+ "Report": None,
+ },
+ {
+ "Name": "KV hash autotest",
+ "Command": "kv_hash_slow_autotest",
+ "Func": default_autotest,
+ "Report": None,
+ },
+ {
"Name": "LPM autotest",
"Command": "lpm_autotest",
"Func": default_autotest,
@@ -45,6 +45,7 @@ test_sources = files('commands.c',
'test_eventdev.c',
'test_external_mem.c',
'test_fbarray.c',
+ 'test_kv_hash.c',
'test_fib.c',
'test_fib_perf.c',
'test_fib6.c',
@@ -203,6 +204,7 @@ fast_tests = [
['hash_autotest', true],
['interrupt_autotest', true],
['ipfrag_autotest', false],
+ ['kv_hash_autotest', true],
['logs_autotest', true],
['lpm_autotest', true],
['lpm6_autotest', true],
@@ -291,6 +293,7 @@ perf_test_names = [
'hash_readwrite_perf_autotest',
'hash_readwrite_lf_perf_autotest',
'trace_perf_autotest',
+ 'kv_hash_slow_autotest',
]
driver_test_names = [
new file mode 100644
@@ -0,0 +1,242 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2020 Intel Corporation
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <rte_lcore.h>
+#include <rte_kv_hash.h>
+#include <rte_hash_crc.h>
+
+#include "test.h"
+
+typedef int32_t (*rte_kv_hash_test)(void);
+
+static int32_t test_create_invalid(void);
+static int32_t test_multiple_create(void);
+static int32_t test_free_null(void);
+static int32_t test_add_del_invalid(void);
+static int32_t test_basic(void);
+
+#define MAX_ENT (1 << 22)
+
+/*
+ * Check that rte_kv_hash_create fails gracefully for incorrect user input
+ * arguments
+ */
+int32_t
+test_create_invalid(void)
+{
+ struct rte_kv_hash_table *kv_hash = NULL;
+ struct rte_kv_hash_params config;
+
+ config.name = "test_kv_hash";
+ config.socket_id = rte_socket_id();
+ config.entries = MAX_ENT;
+ config.type = RTE_KV_HASH_K32V64;
+
+ /* rte_kv_hash_create: kv_hash name == NULL */
+ config.name = NULL;
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash == NULL,
+ "Call succeeded with invalid parameters\n");
+ config.name = "test_kv_hash";
+
+ /* rte_kv_hash_create: config == NULL */
+ kv_hash = rte_kv_hash_create(NULL);
+ RTE_TEST_ASSERT(kv_hash == NULL,
+ "Call succeeded with invalid parameters\n");
+
+ /* socket_id < -1 is invalid */
+ config.socket_id = -2;
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash == NULL,
+ "Call succeeded with invalid parameters\n");
+ config.socket_id = rte_socket_id();
+
+ /* rte_kv_hash_create: entries = 0 */
+ config.entries = 0;
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash == NULL,
+ "Call succeeded with invalid parameters\n");
+ config.entries = MAX_ENT;
+
+ /* rte_kv_hash_create: invalid type*/
+ config.type = RTE_KV_HASH_MAX;
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash == NULL,
+ "Call succeeded with invalid parameters\n");
+
+ return TEST_SUCCESS;
+}
+
+/*
+ * Create kv_hash table then delete kv_hash table 10 times
+ * Use a slightly different rules size each time
+ */
+#include <rte_errno.h>
+int32_t
+test_multiple_create(void)
+{
+ struct rte_kv_hash_table *kv_hash = NULL;
+ struct rte_kv_hash_params config;
+ int32_t i;
+
+ for (i = 0; i < 100; i++) {
+ config.name = "test_kv_hash";
+ config.socket_id = -1;
+ config.entries = MAX_ENT - i;
+ config.type = RTE_KV_HASH_K32V64;
+
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash != NULL,
+ "Failed to create kv hash\n");
+ rte_kv_hash_free(kv_hash);
+ }
+
+ return TEST_SUCCESS;
+}
+
+/*
+ * Call rte_kv_hash_free for NULL pointer user input.
+ * Note: free has no return and therefore it is impossible
+ * to check for failure but this test is added to
+ * increase function coverage metrics and to validate that
+ * freeing null does not crash.
+ */
+int32_t
+test_free_null(void)
+{
+ struct rte_kv_hash_table *kv_hash = NULL;
+ struct rte_kv_hash_params config;
+
+ config.name = "test_kv";
+ config.socket_id = -1;
+ config.entries = MAX_ENT;
+ config.type = RTE_KV_HASH_K32V64;
+
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash != NULL, "Failed to create kv hash\n");
+
+ rte_kv_hash_free(kv_hash);
+ rte_kv_hash_free(NULL);
+ return TEST_SUCCESS;
+}
+
+/*
+ * Check that rte_kv_hash_add fails gracefully for
+ * incorrect user input arguments
+ */
+int32_t
+test_add_del_invalid(void)
+{
+ uint32_t key = 10;
+ uint64_t val = 20;
+ int ret, found;
+
+ /* rte_kv_hash_add: kv_hash == NULL */
+ ret = rte_kv_hash_add(NULL, &key, rte_hash_crc_4byte(key, 0),
+ &val, &found);
+ RTE_TEST_ASSERT(ret == -EINVAL,
+ "Call succeeded with invalid parameters\n");
+
+ /* rte_kv_hash_delete: kv_hash == NULL */
+ ret = rte_kv_hash_delete(NULL, &key, rte_hash_crc_4byte(key, 0), &val);
+ RTE_TEST_ASSERT(ret == -EINVAL,
+ "Call succeeded with invalid parameters\n");
+
+ return TEST_SUCCESS;
+}
+
+/*
+ * Call add, lookup and delete for a single rule
+ */
+int32_t
+test_basic(void)
+{
+ struct rte_kv_hash_table *kv_hash = NULL;
+ struct rte_kv_hash_params config;
+ uint32_t key = 10;
+ uint64_t value = 20;
+ uint64_t ret_val = 0;
+ int ret, found;
+ uint32_t hash_sig;
+
+ config.name = "test_kv";
+ config.socket_id = -1;
+ config.entries = MAX_ENT;
+ config.type = RTE_KV_HASH_K32V64;
+
+ kv_hash = rte_kv_hash_create(&config);
+ RTE_TEST_ASSERT(kv_hash != NULL, "Failed to create kv hash\n");
+
+ hash_sig = rte_hash_crc_4byte(key, 0);
+ ret = rte_kv_hash_bulk_lookup(kv_hash, &key,
+ &hash_sig, &ret_val, 1);
+ RTE_TEST_ASSERT(ret == 0, "Lookup return incorrect result\n");
+
+ ret = rte_kv_hash_delete(kv_hash, &key, hash_sig, &ret_val);
+ RTE_TEST_ASSERT(ret == -ENOENT, "Delete return incorrect result\n");
+
+ ret = rte_kv_hash_add(kv_hash, &key, hash_sig, &value, &found);
+ RTE_TEST_ASSERT(ret == 0, "Can not add key into the table\n");
+
+ ret = rte_kv_hash_bulk_lookup(kv_hash, &key,
+ &hash_sig, &ret_val, 1);
+ RTE_TEST_ASSERT(((ret == 1) && (value == ret_val)),
+ "Lookup return incorrect result\n");
+
+ ret = rte_kv_hash_delete(kv_hash, &key, hash_sig, &ret_val);
+ RTE_TEST_ASSERT(ret == 0, "Can not delete key from table\n");
+
+ ret = rte_kv_hash_bulk_lookup(kv_hash, &key,
+ &hash_sig, &ret_val, 1);
+ RTE_TEST_ASSERT(ret == 0, "Lookup return incorrect result\n");
+
+ rte_kv_hash_free(kv_hash);
+
+ return TEST_SUCCESS;
+}
+
+static struct unit_test_suite kv_hash_tests = {
+ .suite_name = "kv_hash autotest",
+ .setup = NULL,
+ .teardown = NULL,
+ .unit_test_cases = {
+ TEST_CASE(test_create_invalid),
+ TEST_CASE(test_free_null),
+ TEST_CASE(test_add_del_invalid),
+ TEST_CASE(test_basic),
+ TEST_CASES_END()
+ }
+};
+
+static struct unit_test_suite kv_hash_slow_tests = {
+ .suite_name = "kv_hash slow autotest",
+ .setup = NULL,
+ .teardown = NULL,
+ .unit_test_cases = {
+ TEST_CASE(test_multiple_create),
+ TEST_CASES_END()
+ }
+};
+
+/*
+ * Do all unit tests.
+ */
+static int
+test_kv_hash(void)
+{
+ return unit_test_suite_runner(&kv_hash_tests);
+}
+
+static int
+test_slow_kv_hash(void)
+{
+ return unit_test_suite_runner(&kv_hash_slow_tests);
+}
+
+REGISTER_TEST_COMMAND(kv_hash_autotest, test_kv_hash);
+REGISTER_TEST_COMMAND(kv_hash_slow_autotest, test_slow_kv_hash);