X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_lpm.c;h=e969fe05100ce7320d3b0d34d98ee83228b49d5a;hb=15e67d41c0564000f919aa86d78a6702399b79d3;hp=b6ad2ebd3e6baca768d9ac457e88b6b2c6f1c95a;hpb=26e09db6cb5fd9bbf0feb928561af9932694574b;p=dpdk.git

diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c
index b6ad2ebd3e..e969fe0510 100644
--- a/app/test/test_lpm.c
+++ b/app/test/test_lpm.c
@@ -1,44 +1,15 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
- *   All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 
+#include <rte_ip.h>
 #include <rte_lpm.h>
 
 #include "test.h"
-#include "test_lpm_routes.h"
 #include "test_xmmt_ops.h"
 
 #define TEST_LPM_ASSERT(cond) do {                                            \
@@ -68,6 +39,7 @@ static int32_t test14(void);
 static int32_t test15(void);
 static int32_t test16(void);
 static int32_t test17(void);
+static int32_t test18(void);
 
 rte_lpm_test tests[] = {
 /* Test Cases */
@@ -89,6 +61,7 @@ rte_lpm_test tests[] = {
 	test15,
 	test16,
 	test17,
+	test18
 };
 
 #define NUM_LPM_TESTS (sizeof(tests)/sizeof(tests[0]))
@@ -192,7 +165,7 @@ test3(void)
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = IPv4(0, 0, 0, 0), next_hop = 100;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop = 100;
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -230,7 +203,7 @@ test4(void)
 	config.max_rules = MAX_RULES;
 	config.number_tbl8s = NUMBER_TBL8S;
 	config.flags = 0;
-	uint32_t ip = IPv4(0, 0, 0, 0);
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0);
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -269,7 +242,7 @@ test5(void)
 	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;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_return = 0;
 	int32_t status = 0;
 
 	/* rte_lpm_lookup: lpm == NULL */
@@ -303,7 +276,7 @@ test6(void)
 	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;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
 	uint8_t depth = 24;
 	int32_t status = 0;
 
@@ -342,7 +315,7 @@ test7(void)
 	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;
+	uint32_t ip = RTE_IPV4(0, 0, 0, 0), next_hop_add = 100, next_hop_return = 0;
 	uint8_t depth = 32;
 	int32_t status = 0;
 
@@ -393,7 +366,7 @@ test8(void)
 	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 ip1 = RTE_IPV4(127, 255, 255, 255), ip2 = RTE_IPV4(128, 0, 0, 0);
 	uint32_t next_hop_add, next_hop_return;
 	uint8_t depth;
 	int32_t status = 0;
@@ -484,7 +457,7 @@ test9(void)
 	int32_t status = 0;
 
 	/* Add & lookup to hit invalid TBL24 entry */
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
@@ -506,7 +479,7 @@ test9(void)
 	rte_lpm_delete_all(lpm);
 
 	/* Add & lookup to hit valid TBL24 entry not extended */
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 23;
 	next_hop_add = 100;
 
@@ -542,7 +515,7 @@ test9(void)
 
 	/* Add & lookup to hit valid extended TBL24 entry with invalid TBL8
 	 * entry */
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -552,7 +525,7 @@ test9(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = IPv4(128, 0, 0, 5);
+	ip = RTE_IPV4(128, 0, 0, 5);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -568,7 +541,7 @@ test9(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -585,11 +558,11 @@ test9(void)
 
 	/* Add & lookup to hit valid extended TBL24 entry with valid TBL8
 	 * entry */
-	ip_1 = IPv4(128, 0, 0, 0);
+	ip_1 = RTE_IPV4(128, 0, 0, 0);
 	depth_1 = 25;
 	next_hop_add_1 = 101;
 
-	ip_2 = IPv4(128, 0, 0, 5);
+	ip_2 = RTE_IPV4(128, 0, 0, 5);
 	depth_2 = 32;
 	next_hop_add_2 = 102;
 
@@ -656,7 +629,7 @@ test10(void)
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 16;
 	next_hop_add = 100;
 
@@ -674,7 +647,7 @@ test10(void)
 
 	rte_lpm_delete_all(lpm);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 25;
 	next_hop_add = 100;
 
@@ -692,14 +665,14 @@ test10(void)
 	/* Add rule that extends a TBL24 valid entry & lookup for both rules
 	 * (& delete & lookup) */
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 	TEST_LPM_ASSERT(status == 0);
 
-	ip = IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -709,13 +682,13 @@ test10(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	next_hop_add = 100;
 
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -724,7 +697,7 @@ test10(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -738,7 +711,7 @@ test10(void)
 	/* Add rule that updates the next hop in TBL24 & lookup
 	 * (& delete & lookup) */
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
@@ -767,7 +740,7 @@ test10(void)
 	/* Add rule that updates the next hop in TBL8 & lookup
 	 * (& delete & lookup) */
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -795,7 +768,7 @@ test10(void)
 
 	/* Delete a rule that is not present in the TBL24 & lookup */
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -808,7 +781,7 @@ test10(void)
 
 	/* Delete a rule that is not present in the TBL8 & lookup */
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -845,14 +818,14 @@ test11(void)
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add = 100;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 	TEST_LPM_ASSERT(status == 0);
 
-	ip = IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 	next_hop_add = 101;
 
@@ -862,13 +835,13 @@ test11(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	next_hop_add = 100;
 
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT((status == 0) && (next_hop_return == next_hop_add));
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -877,7 +850,7 @@ test11(void)
 	status = rte_lpm_lookup(lpm, ip, &next_hop_return);
 	TEST_LPM_ASSERT(status == -ENOENT);
 
-	ip = IPv4(128, 0, 0, 10);
+	ip = RTE_IPV4(128, 0, 0, 10);
 	depth = 32;
 
 	status = rte_lpm_delete(lpm, ip, depth);
@@ -916,7 +889,7 @@ test12(void)
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 32;
 	next_hop_add = 100;
 
@@ -971,7 +944,7 @@ test13(void)
 	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
 	TEST_LPM_ASSERT(lpm != NULL);
 
-	ip = IPv4(128, 0, 0, 0);
+	ip = RTE_IPV4(128, 0, 0, 0);
 	depth = 24;
 	next_hop_add_1 = 100;
 
@@ -1041,10 +1014,10 @@ test14(void)
 
 	depth = 32;
 	next_hop_add = 100;
-	ip = IPv4(0, 0, 0, 0);
+	ip = RTE_IPV4(0, 0, 0, 0);
 
 	/* Add 256 rules that require a tbl8 extension */
-	for (; ip <= IPv4(0, 0, 255, 0); ip += 256) {
+	for (; ip <= RTE_IPV4(0, 0, 255, 0); ip += 256) {
 		status = rte_lpm_add(lpm, ip, depth, next_hop_add);
 		TEST_LPM_ASSERT(status == 0);
 
@@ -1055,7 +1028,7 @@ test14(void)
 
 	/* All tbl8 extensions have been used above. Try to add one more and
 	 * we get a fail */
-	ip = IPv4(1, 0, 0, 0);
+	ip = RTE_IPV4(1, 0, 0, 0);
 	depth = 32;
 
 	status = rte_lpm_add(lpm, ip, depth, next_hop_add);
@@ -1152,9 +1125,9 @@ test17(void)
 	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);
+	const uint32_t ip_10_32 = RTE_IPV4(10, 10, 10, 2);
+	const uint32_t ip_10_24 = RTE_IPV4(10, 10, 10, 0);
+	const uint32_t ip_20_25 = RTE_IPV4(10, 10, 20, 2);
 	const uint8_t d_ip_10_32 = 32,
 			d_ip_10_24 = 24,
 			d_ip_20_25 = 25;
@@ -1217,6 +1190,82 @@ test17(void)
 	return PASS;
 }
 
+/*
+ * Test for recycle of tbl8
+ *  - step 1: add a rule with depth=28 (> 24)
+ *  - step 2: add a rule with same 24-bit prefix and depth=23 (< 24)
+ *  - step 3: delete the first rule
+ *  - step 4: check tbl8 is freed
+ *  - step 5: add a rule same as the first one (depth=28)
+ *  - step 6: check same tbl8 is allocated
+ *  - step 7: add a rule with same 24-bit prefix and depth=24
+ *  - step 8: delete the rule (depth=28) added in step 5
+ *  - step 9: check tbl8 is freed
+ *  - step 10: add a rule with same 24-bit prefix and depth = 28
+ *  - setp 11: check same tbl8 is allocated again
+ */
+int32_t
+test18(void)
+{
+#define group_idx next_hop
+	struct rte_lpm *lpm = NULL;
+	struct rte_lpm_config config;
+	uint32_t ip, next_hop;
+	uint8_t depth;
+	uint32_t tbl8_group_index;
+
+	config.max_rules = MAX_RULES;
+	config.number_tbl8s = NUMBER_TBL8S;
+	config.flags = 0;
+
+	lpm = rte_lpm_create(__func__, SOCKET_ID_ANY, &config);
+	TEST_LPM_ASSERT(lpm != NULL);
+
+	ip = RTE_IPV4(192, 168, 100, 100);
+	depth = 28;
+	next_hop = 1;
+	rte_lpm_add(lpm, ip, depth, next_hop);
+
+	TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+	tbl8_group_index = lpm->tbl24[ip>>8].group_idx;
+
+	depth = 23;
+	next_hop = 2;
+	rte_lpm_add(lpm, ip, depth, next_hop);
+	TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+
+	depth = 28;
+	rte_lpm_delete(lpm, ip, depth);
+
+	TEST_LPM_ASSERT(!lpm->tbl24[ip>>8].valid_group);
+
+	next_hop = 3;
+	rte_lpm_add(lpm, ip, depth, next_hop);
+
+	TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+	TEST_LPM_ASSERT(tbl8_group_index == lpm->tbl24[ip>>8].group_idx);
+
+	depth = 24;
+	next_hop = 4;
+	rte_lpm_add(lpm, ip, depth, next_hop);
+	TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+
+	depth = 28;
+	rte_lpm_delete(lpm, ip, depth);
+
+	TEST_LPM_ASSERT(!lpm->tbl24[ip>>8].valid_group);
+
+	next_hop = 5;
+	rte_lpm_add(lpm, ip, depth, next_hop);
+
+	TEST_LPM_ASSERT(lpm->tbl24[ip>>8].valid_group);
+	TEST_LPM_ASSERT(tbl8_group_index == lpm->tbl24[ip>>8].group_idx);
+
+	rte_lpm_free(lpm);
+#undef group_idx
+	return PASS;
+}
+
 /*
  * Do all unit tests.
  */
@@ -1230,7 +1279,7 @@ test_lpm(void)
 	for (i = 0; i < NUM_LPM_TESTS; i++) {
 		status = tests[i]();
 		if (status < 0) {
-			printf("ERROR: LPM Test %s: FAIL\n", RTE_STR(tests[i]));
+			printf("ERROR: LPM Test %u: FAIL\n", i);
 			global_status = status;
 		}
 	}