From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id E07E2558A for ; Mon, 1 Aug 2016 09:05:30 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 01 Aug 2016 00:05:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,454,1464678000"; d="scan'208";a="1006110431" Received: from dpdk2.bj.intel.com ([172.16.182.189]) by orsmga001.jf.intel.com with ESMTP; 01 Aug 2016 00:05:15 -0700 From: Wei Dai To: dev@dpdk.org Cc: Wei Dai Date: Mon, 1 Aug 2016 15:03:44 +0800 Message-Id: <1470035024-72972-1-git-send-email-wei.dai@intel.com> X-Mailer: git-send-email 2.5.5 Subject: [dpdk-dev] [PATCH 2/2] app/test: add a case to verify lpm tlb8 recycle X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Aug 2016 07:05:31 -0000 As a bug-fix for lpm tlb8 recycle is introduced, add a test case to verify tlb8 group is correctly freed when it only includes a rule with depth=24. Signed-off-by: Wei Dai --- app/test/test_lpm.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/app/test/test_lpm.c b/app/test/test_lpm.c index b6ad2eb..e053f99 100644 --- a/app/test/test_lpm.c +++ b/app/test/test_lpm.c @@ -68,6 +68,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 +90,7 @@ rte_lpm_test tests[] = { test15, test16, test17, + test18 }; #define NUM_LPM_TESTS (sizeof(tests)/sizeof(tests[0])) @@ -1218,6 +1220,83 @@ test17(void) } /* + * Test for recycle of tlb8 + * - 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 tlb8 is freed + * - step 5: add a rule same as the first one (depth=28) + * - step 6: check same tlb8 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 tlb8 is freed + * - step 10: add a rule with same 24-bit prefix and depth = 28 + * - setp 11: check same tlb8 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 = 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->tbl8[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->tbl8[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->tbl8[ip>>8].group_idx); + + rte_lpm_free(lpm); +#undef group_idx + return PASS; +} + + +/* * Do all unit tests. */ @@ -1230,7 +1309,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; } } -- 2.5.5