i40e: fix crash on DCB query

[dpdk.git] / app / test / test_lpm.c

diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index f367553..40fbbc6 100644 (file)
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -49,6 +49,7 @@
 
 #include "rte_lpm.h"
 #include "test_lpm_routes.h"
+#include "test_xmmt_ops.h"
 
 #define TEST_LPM_ASSERT(cond) do {                                            \
        if (!(cond)) {                                                        \
@@ -105,6 +106,7 @@ rte_lpm_test tests[] = {
 #define NUM_LPM_TESTS (sizeof(tests)/sizeof(tests[0]))
 #define MAX_DEPTH 32
 #define MAX_RULES 256
+#define NUMBER_TBL8S 256
 #define PASS 0
 
 /*
@@ -115,18 +117,25 @@ int32_t
 test0(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
 
        /* rte_lpm_create: lpm name == NULL */
-       lpm = rte_lpm_create(NULL, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(NULL, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm == NULL);
 
        /* rte_lpm_create: max_rules = 0 */
        /* Note: __func__ inserts the function name, in this case "test0". */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, 0, 0);
+       config.max_rules = 0;
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm == NULL);
 
        /* socket_id < -1 is invalid */
-       lpm = rte_lpm_create(__func__, -2, MAX_RULES, 0);
+       config.max_rules = MAX_RULES;
+       lpm = rte_lpm_create(__func__, -2, &config);
        TEST_LPM_ASSERT(lpm == NULL);
 
        return PASS;
@@ -140,11 +149,16 @@ int32_t
 test1(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        int32_t i;
 
        /* rte_lpm_free: Free NULL */
        for (i = 0; i < 100; i++) {
-               lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES - i, 0);
+               config.max_rules = MAX_RULES - i;
+               lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
                TEST_LPM_ASSERT(lpm != NULL);
 
                rte_lpm_free(lpm);
@@ -164,8 +178,13 @@ int32_t
 test2(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        rte_lpm_free(lpm);
@@ -180,6 +199,11 @@ int32_t
 test3(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip = IPv4(0, 0, 0, 0), next_hop = 100;
        uint8_t depth = 24;
        int32_t status = 0;
@@ -189,7 +213,7 @@ test3(void)
        TEST_LPM_ASSERT(status < 0);
 
        /*Create vaild lpm to use in rest of test. */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* rte_lpm_add: depth < 1 */
@@ -213,6 +237,11 @@ int32_t
 test4(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip = IPv4(0, 0, 0, 0);
        uint8_t depth = 24;
        int32_t status = 0;
@@ -222,7 +251,7 @@ test4(void)
        TEST_LPM_ASSERT(status < 0);
 
        /*Create vaild lpm to use in rest of test. */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* rte_lpm_delete: depth < 1 */
@@ -247,6 +276,11 @@ test5(void)
 {
 #if defined(RTE_LIBRTE_LPM_DEBUG)
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip = IPv4(0, 0, 0, 0), next_hop_return = 0;
        int32_t status = 0;
 
@@ -255,7 +289,7 @@ test5(void)
        TEST_LPM_ASSERT(status < 0);
 
        /*Create vaild lpm to use in rest of test. */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* rte_lpm_lookup: depth < 1 */
@@ -276,11 +310,16 @@ int32_t
 test6(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip = IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
        uint8_t depth = 24;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -307,14 +346,19 @@ test6(void)
 int32_t
 test7(void)
 {
-       __m128i ipx4;
+       xmm_t ipx4;
        uint32_t hop[4];
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip = IPv4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
        uint8_t depth = 32;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -323,7 +367,7 @@ test7(void)
        status = rte_lpm_lookup(lpm, ip, &next_hop_return);
        TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-       ipx4 = _mm_set_epi32(ip, ip + 0x100, ip - 0x100, ip);
+       ipx4 = vect_set_epi32(ip, ip + 0x100, ip - 0x100, ip);
        rte_lpm_lookupx4(lpm, ipx4, hop, UINT32_MAX);
        TEST_LPM_ASSERT(hop[0] == next_hop_add);
        TEST_LPM_ASSERT(hop[1] == UINT32_MAX);
@@ -353,15 +397,20 @@ test7(void)
 int32_t
 test8(void)
 {
-       __m128i ipx4;
+       xmm_t ipx4;
        uint32_t hop[4];
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip1 = IPv4(127, 255, 255, 255), ip2 = IPv4(128, 0, 0, 0);
        uint32_t next_hop_add, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* Loop with rte_lpm_add. */
@@ -380,7 +429,7 @@ test8(void)
                TEST_LPM_ASSERT((status == 0) &&
                        (next_hop_return == next_hop_add));
 
-               ipx4 = _mm_set_epi32(ip2, ip1, ip2, ip1);
+               ipx4 = vect_set_epi32(ip2, ip1, ip2, ip1);
                rte_lpm_lookupx4(lpm, ipx4, hop, UINT32_MAX);
                TEST_LPM_ASSERT(hop[0] == UINT32_MAX);
                TEST_LPM_ASSERT(hop[1] == next_hop_add);
@@ -407,7 +456,7 @@ test8(void)
                status = rte_lpm_lookup(lpm, ip1, &next_hop_return);
                TEST_LPM_ASSERT(status == -ENOENT);
 
-               ipx4 = _mm_set_epi32(ip1, ip1, ip2, ip2);
+               ipx4 = vect_set_epi32(ip1, ip1, ip2, ip2);
                rte_lpm_lookupx4(lpm, ipx4, hop, UINT32_MAX);
                if (depth != 1) {
                        TEST_LPM_ASSERT(hop[0] == next_hop_add);
@@ -436,6 +485,11 @@ int32_t
 test9(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, ip_1, ip_2;
        uint8_t depth, depth_1, depth_2;
        uint32_t next_hop_add, next_hop_add_1, next_hop_add_2, next_hop_return;
@@ -446,7 +500,7 @@ test9(void)
        depth = 24;
        next_hop_add = 100;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -600,13 +654,18 @@ test10(void)
 {
 
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, next_hop_add, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
        /* Add rule that covers a TBL24 range previously invalid & lookup
         * (& delete & lookup) */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        ip = IPv4(128, 0, 0, 0);
@@ -786,11 +845,16 @@ test11(void)
 {
 
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, next_hop_add, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        ip = IPv4(128, 0, 0, 0);
@@ -849,14 +913,19 @@ test11(void)
 int32_t
 test12(void)
 {
-       __m128i ipx4;
+       xmm_t ipx4;
        uint32_t hop[4];
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, i, next_hop_add, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        ip = IPv4(128, 0, 0, 0);
@@ -871,7 +940,7 @@ test12(void)
                TEST_LPM_ASSERT((status == 0) &&
                                (next_hop_return == next_hop_add));
 
-               ipx4 = _mm_set_epi32(ip, ip + 1, ip, ip - 1);
+               ipx4 = vect_set_epi32(ip, ip + 1, ip, ip - 1);
                rte_lpm_lookupx4(lpm, ipx4, hop, UINT32_MAX);
                TEST_LPM_ASSERT(hop[0] == UINT32_MAX);
                TEST_LPM_ASSERT(hop[1] == next_hop_add);
@@ -902,11 +971,16 @@ int32_t
 test13(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, i, next_hop_add_1, next_hop_add_2, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        ip = IPv4(128, 0, 0, 0);
@@ -964,12 +1038,17 @@ test14(void)
         * that we have enough storage for all rules at that depth*/
 
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = 256 * 32;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint32_t ip, next_hop_add, next_hop_return;
        uint8_t depth;
        int32_t status = 0;
 
        /* Add enough space for 256 rules for every depth */
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, 256 * 32, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        depth = 32;
@@ -1011,9 +1090,14 @@ int32_t
 test15(void)
 {
        struct rte_lpm *lpm = NULL, *result = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = 256 * 32;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
 
        /* Create lpm  */
-       lpm = rte_lpm_create("lpm_find_existing", SOCKET_ID_ANY, 256 * 32, 0);
+       lpm = rte_lpm_create("lpm_find_existing", SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* Try to find existing lpm */
@@ -1039,8 +1123,12 @@ int32_t
 test16(void)
 {
        uint32_t ip;
-       struct rte_lpm *lpm = rte_lpm_create(__func__, SOCKET_ID_ANY,
-                       256 * 32, 0);
+       struct rte_lpm_config config;
+
+       config.max_rules = 256 * 32;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
+       struct rte_lpm *lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 
        /* ip loops through all possibilities for top 24 bits of address */
        for (ip = 0; ip < 0xFFFFFF; ip++) {
@@ -1050,10 +1138,10 @@ test16(void)
                        break;
        }
 
-       if (ip != RTE_LPM_TBL8_NUM_GROUPS) {
+       if (ip != NUMBER_TBL8S) {
                printf("Error, unexpected failure with filling tbl8 groups\n");
                printf("Failed after %u additions, expected after %u\n",
-                               (unsigned)ip, (unsigned)RTE_LPM_TBL8_NUM_GROUPS);
+                               (unsigned)ip, (unsigned)NUMBER_TBL8S);
        }
 
        rte_lpm_free(lpm);
@@ -1071,6 +1159,11 @@ int32_t
 test17(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = MAX_RULES;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        const uint32_t ip_10_32 = IPv4(10, 10, 10, 2);
        const uint32_t ip_10_24 = IPv4(10, 10, 10, 0);
        const uint32_t ip_20_25 = IPv4(10, 10, 20, 2);
@@ -1083,7 +1176,7 @@ test17(void)
        uint32_t next_hop_return = 0;
        int32_t status = 0;
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, MAX_RULES, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        if ((status = rte_lpm_add(lpm, ip_10_32, d_ip_10_32,
@@ -1172,6 +1265,11 @@ int32_t
 perf_test(void)
 {
        struct rte_lpm *lpm = NULL;
+       struct rte_lpm_config config;
+
+       config.max_rules = 1000000;
+       config.number_tbl8s = NUMBER_TBL8S;
+       config.flags = 0;
        uint64_t begin, total_time, lpm_used_entries = 0;
        unsigned i, j;
        uint32_t next_hop_add = 0xAA, next_hop_return = 0;
@@ -1185,7 +1283,7 @@ perf_test(void)
 
        print_route_distribution(large_route_table, (uint32_t) NUM_ROUTE_ENTRIES);
 
-       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, 1000000, 0);
+       lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
        TEST_LPM_ASSERT(lpm != NULL);
 
        /* Measue add. */
@@ -1289,10 +1387,10 @@ perf_test(void)
                begin = rte_rdtsc();
                for (j = 0; j < BATCH_SIZE; j += RTE_DIM(next_hops)) {
                        unsigned k;
-                       __m128i ipx4;
+                       xmm_t ipx4;
 
-                       ipx4 = _mm_loadu_si128((__m128i *)(ip_batch + j));
-                       ipx4 = *(__m128i *)(ip_batch + j);
+                       ipx4 = vect_loadu_sil128((xmm_t *)(ip_batch + j));
+                       ipx4 = *(xmm_t *)(ip_batch + j);
                        rte_lpm_lookupx4(lpm, ipx4, next_hops, UINT32_MAX);
                        for (k = 0; k < RTE_DIM(next_hops); k++)
                                if (unlikely(next_hops[k] == UINT32_MAX))