From: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Date: Wed, 25 Jan 2017 11:29:18 +0000 (+0000)
Subject: app/test: fix build with overflowed EFD value
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=a085723ac8cdb41750738567b8da2d3fc7b2363c;p=dpdk.git

app/test: fix build with overflowed EFD value

When RTE_EFD_VALUE_NUM_BITS is 32, there was a compilation issue
because of an overflow:

app/test/test_efd.c:157:55: error: overflow in expression;
result is 2147483647 with type 'int' [-Werror,-Winteger-overflow]
        data[0] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);

This commit fixes the issue by using a setting a different
macro VALUE_BITMASK with a conditional

Fixes: 0e925aef2779 ("app/test: add EFD functional and perf tests")

Reported-by: Yong Liu <yong.liu@intel.com>
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
---

diff --git a/app/test/test_efd.c b/app/test/test_efd.c
index d5c3bd9e75..de49e1d7e1 100644
--- a/app/test/test_efd.c
+++ b/app/test/test_efd.c
@@ -44,6 +44,12 @@
 #define EFD_TEST_KEY_LEN 8
 #define TABLE_SIZE (1 << 21)
 #define ITERATIONS 3
+
+#if RTE_EFD_VALUE_NUM_BITS == 32
+#define VALUE_BITMASK 0xffffffff
+#else
+#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
+#endif
 static unsigned int test_socket_id;
 
 /* 5-tuple key type */
@@ -154,7 +160,7 @@ static int test_add_delete(void)
 			efd_get_all_sockets_bitmask(), test_socket_id);
 	TEST_ASSERT_NOT_NULL(handle, "Error creating the EFD table\n");
 
-	data[0] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+	data[0] = mrand48() & VALUE_BITMASK;
 	TEST_ASSERT_SUCCESS(rte_efd_update(handle, test_socket_id, &keys[0],
 			data[0]),
 			"Error inserting the key");
@@ -191,7 +197,7 @@ static int test_add_update_delete(void)
 	printf("Entering %s\n", __func__);
 	/* test with standard add/lookup/delete functions */
 	efd_value_t prev_value;
-	data[1] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+	data[1] = mrand48() & VALUE_BITMASK;
 
 	handle = rte_efd_create("test_add_update_delete", TABLE_SIZE,
 			sizeof(struct flow_key),
@@ -285,7 +291,7 @@ static int test_five_keys(void)
 
 	/* Setup data */
 	for (i = 0; i < 5; i++)
-		data[i] = mrand48() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+		data[i] = mrand48() & VALUE_BITMASK;
 
 	/* Add */
 	for (i = 0; i < 5; i++) {
diff --git a/app/test/test_efd_perf.c b/app/test/test_efd_perf.c
index 998a25b313..2b8a8eac5b 100644
--- a/app/test/test_efd_perf.c
+++ b/app/test/test_efd_perf.c
@@ -43,12 +43,19 @@
 #include <rte_thash.h>
 
 #include "test.h"
+
 #define NUM_KEYSIZES 10
 #define NUM_SHUFFLES 10
 #define MAX_KEYSIZE 64
 #define MAX_ENTRIES (1 << 19)
 #define KEYS_TO_ADD (MAX_ENTRIES * 3 / 4) /* 75% table utilization */
 #define NUM_LOOKUPS (KEYS_TO_ADD * 5) /* Loop among keys added, several times */
+
+#if RTE_EFD_VALUE_NUM_BITS == 32
+#define VALUE_BITMASK 0xffffffff
+#else
+#define VALUE_BITMASK ((1 << RTE_EFD_VALUE_NUM_BITS) - 1)
+#endif
 static unsigned int test_socket_id;
 
 static inline uint8_t efd_get_all_sockets_bitmask(void)
@@ -154,7 +161,7 @@ setup_keys_and_data(struct efd_perf_params *params, unsigned int cycle)
 		for (j = 0; j < params->key_size; j++)
 			keys[i][j] = rte_rand() & 0xFF;
 
-		data[i] = rte_rand() & ((1 << RTE_EFD_VALUE_NUM_BITS) - 1);
+		data[i] = rte_rand() & VALUE_BITMASK;
 	}
 
 	/* Remove duplicates from the keys array */