efd: allow more CPU sockets in table creation

rte_efd_create() function was using uint8_t for a socket bitmask,
for one of its parameters.
This limits the maximum of NUMA sockets to be 8.
Changing to uint64_t increases it to 64, which should be
more future-proof.

Coverity issue: 366390
Fixes: 56b6ef874f8 ("efd: new Elastic Flow Distributor library")
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Yipeng Wang <yipeng1.wang@intel.com>
Tested-by: David Christensen <drc@linux.vnet.ibm.com>

diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index 180dc4748ed0577b33de4e9804db22e09db3bed8..1b249e0447a5ff7c3211860828ed109e5af581e2 100644 (file)
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -91,9 +91,9 @@ static struct flow_key keys[5] = {
 /* Array to store the data */
 static efd_value_t data[5];
 
-static inline uint8_t efd_get_all_sockets_bitmask(void)
+static inline uint64_t efd_get_all_sockets_bitmask(void)
 {
-       uint8_t all_cpu_sockets_bitmask = 0;
+       uint64_t all_cpu_sockets_bitmask = 0;
        unsigned int i;
        unsigned int next_lcore = rte_get_main_lcore();
        const int val_true = 1, val_false = 0;
@@ -443,6 +443,7 @@ static int test_efd_creation_with_bad_parameters(void)
 static int
 test_efd(void)
 {
+       test_socket_id = rte_socket_id();
 
        /* Unit tests */
        if (test_add_delete() < 0)

diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c
index 1c4770447526bda510b89e4daf35a71cb9623179..f3fe3b17366f00d73274e9f90d265d1c5e093f4e 100644 (file)
--- a/app/test/test_efd_perf.c
+++ b/app/test/test_efd_perf.c
@@ -29,9 +29,9 @@
 #endif
 static unsigned int test_socket_id;
 
-static inline uint8_t efd_get_all_sockets_bitmask(void)
+static inline uint64_t efd_get_all_sockets_bitmask(void)
 {
-       uint8_t all_cpu_sockets_bitmask = 0;
+       uint64_t all_cpu_sockets_bitmask = 0;
        unsigned int i;
        unsigned int next_lcore = rte_get_main_lcore();
        const int val_true = 1, val_false = 0;

diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c
index 5bf517fee9886090d9286432ed024dc312f1b766..86ef46863ca60bef421d4642cd92242bc4ed2a22 100644 (file)
--- a/lib/efd/rte_efd.c
+++ b/lib/efd/rte_efd.c
@@ -495,7 +495,7 @@ efd_search_hash(struct rte_efd_table * const table,
 
 struct rte_efd_table *
 rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
-               uint8_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket)
+               uint64_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket)
 {
        struct rte_efd_table *table = NULL;
        uint8_t *key_array = NULL;

diff --git a/lib/efd/rte_efd.h b/lib/efd/rte_efd.h
index c2be4c09aef0ebc2196aebc9f4197decb2e5abe5..d3d7befd0c907ad453869ad0be71ca60263f503a 100644 (file)
--- a/lib/efd/rte_efd.h
+++ b/lib/efd/rte_efd.h
@@ -139,7 +139,7 @@ typedef uint16_t efd_hashfunc_t;
  */
 struct rte_efd_table *
 rte_efd_create(const char *name, uint32_t max_num_rules, uint32_t key_len,
-       uint8_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket);
+       uint64_t online_cpu_socket_bitmask, uint8_t offline_cpu_socket);
 
 /**
  * Releases the resources from an EFD table