Commit dccc30cc authored by Steen Hegelund's avatar Steen Hegelund Committed by David S. Miller

net: microchip: sparx5: Add KUNIT test of counters and sorted rules

This tests the insert, move and deleting of rules and checks that the
unused VCAP addresses are initialized correctly.
Signed-off-by: default avatarSteen Hegelund <steen.hegelund@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 40e7fe18
......@@ -23,6 +23,9 @@ static u32 test_init_count;
static u32 test_hw_counter_id;
static struct vcap_cache_data test_hw_cache;
static struct net_device test_netdev = {};
static int test_move_addr;
static int test_move_offset;
static int test_move_count;
/* Callback used by the VCAP API */
static enum vcap_keyfield_set test_val_keyset(struct net_device *ndev,
......@@ -195,6 +198,9 @@ static void test_cache_update(struct net_device *ndev, struct vcap_admin *admin,
static void test_cache_move(struct net_device *ndev, struct vcap_admin *admin,
u32 addr, int offset, int count)
{
test_move_addr = addr;
test_move_offset = offset;
test_move_count = count;
}
/* Provide port information via a callback interface */
......@@ -242,6 +248,88 @@ static void vcap_test_api_init(struct vcap_admin *admin)
test_updateaddridx = 0;
}
/* Helper function to create a rule of a specific size */
static struct vcap_rule *
test_vcap_xn_rule_creator(struct kunit *test, int cid, enum vcap_user user,
u16 priority,
int id, int size, int expected_addr)
{
struct vcap_rule *rule = 0;
struct vcap_rule_internal *ri = 0;
enum vcap_keyfield_set keyset = VCAP_KFS_NO_VALUE;
enum vcap_actionfield_set actionset = VCAP_AFS_NO_VALUE;
int ret;
/* init before testing */
memset(test_updateaddr, 0, sizeof(test_updateaddr));
test_updateaddridx = 0;
test_move_addr = 0;
test_move_offset = 0;
test_move_count = 0;
switch (size) {
case 2:
keyset = VCAP_KFS_ETAG;
actionset = VCAP_AFS_CLASS_REDUCED;
break;
case 3:
keyset = VCAP_KFS_PURE_5TUPLE_IP4;
actionset = VCAP_AFS_CLASSIFICATION;
break;
case 6:
keyset = VCAP_KFS_NORMAL_5TUPLE_IP4;
actionset = VCAP_AFS_CLASSIFICATION;
break;
case 12:
keyset = VCAP_KFS_NORMAL_7TUPLE;
actionset = VCAP_AFS_FULL;
break;
default:
break;
}
/* Check that a valid size was used */
KUNIT_ASSERT_NE(test, VCAP_KFS_NO_VALUE, keyset);
/* Allocate the rule */
rule = vcap_alloc_rule(&test_vctrl, &test_netdev, cid, user, priority,
id);
KUNIT_EXPECT_PTR_NE(test, NULL, rule);
ri = (struct vcap_rule_internal *)rule;
/* Override rule keyset */
ret = vcap_set_rule_set_keyset(rule, keyset);
/* Add rule actions : there must be at least one action */
ret = vcap_rule_add_action_u32(rule, VCAP_AF_COSID_VAL, 0);
/* Override rule actionset */
ret = vcap_set_rule_set_actionset(rule, actionset);
ret = vcap_val_rule(rule, ETH_P_ALL);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, keyset, rule->keyset);
KUNIT_EXPECT_EQ(test, actionset, rule->actionset);
KUNIT_EXPECT_EQ(test, size, ri->size);
/* Add rule with write callback */
ret = vcap_add_rule(rule);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, expected_addr, ri->addr);
return rule;
}
/* Prepare testing rule deletion */
static void test_init_rule_deletion(void)
{
test_move_addr = 0;
test_move_offset = 0;
test_move_count = 0;
test_init_start = 0;
test_init_count = 0;
}
/* Define the test cases. */
static void vcap_api_set_bit_1_test(struct kunit *test)
......@@ -1333,6 +1421,414 @@ static void vcap_api_encode_rule_test(struct kunit *test)
KUNIT_EXPECT_EQ(test, true, ret);
}
static void vcap_api_set_rule_counter_test(struct kunit *test)
{
struct vcap_admin is2_admin = {
.cache = {
.counter = 100,
.sticky = true,
},
};
struct vcap_rule_internal ri = {
.data = {
.id = 1001,
},
.addr = 600,
.admin = &is2_admin,
.counter_id = 1002,
.vctrl = &test_vctrl,
};
struct vcap_rule_internal ri2 = {
.data = {
.id = 2001,
},
.addr = 700,
.admin = &is2_admin,
.counter_id = 2002,
.vctrl = &test_vctrl,
};
struct vcap_counter ctr = { .value = 0, .sticky = false};
struct vcap_counter ctr2 = { .value = 101, .sticky = true};
int ret;
vcap_test_api_init(&is2_admin);
list_add_tail(&ri.list, &is2_admin.rules);
list_add_tail(&ri2.list, &is2_admin.rules);
pr_info("%s:%d\n", __func__, __LINE__);
ret = vcap_rule_set_counter(&ri.data, &ctr);
pr_info("%s:%d\n", __func__, __LINE__);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 1002, test_hw_counter_id);
KUNIT_EXPECT_EQ(test, 0, test_hw_cache.counter);
KUNIT_EXPECT_EQ(test, false, test_hw_cache.sticky);
KUNIT_EXPECT_EQ(test, 600, test_updateaddr[0]);
ret = vcap_rule_set_counter(&ri2.data, &ctr2);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 2002, test_hw_counter_id);
KUNIT_EXPECT_EQ(test, 101, test_hw_cache.counter);
KUNIT_EXPECT_EQ(test, true, test_hw_cache.sticky);
KUNIT_EXPECT_EQ(test, 700, test_updateaddr[1]);
}
static void vcap_api_get_rule_counter_test(struct kunit *test)
{
struct vcap_admin is2_admin = {
.cache = {
.counter = 100,
.sticky = true,
},
};
struct vcap_rule_internal ri = {
.data = {
.id = 1010,
},
.addr = 400,
.admin = &is2_admin,
.counter_id = 1011,
.vctrl = &test_vctrl,
};
struct vcap_rule_internal ri2 = {
.data = {
.id = 2011,
},
.addr = 300,
.admin = &is2_admin,
.counter_id = 2012,
.vctrl = &test_vctrl,
};
struct vcap_counter ctr = {};
struct vcap_counter ctr2 = {};
int ret;
vcap_test_api_init(&is2_admin);
test_hw_cache.counter = 55;
test_hw_cache.sticky = true;
list_add_tail(&ri.list, &is2_admin.rules);
list_add_tail(&ri2.list, &is2_admin.rules);
ret = vcap_rule_get_counter(&ri.data, &ctr);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 1011, test_hw_counter_id);
KUNIT_EXPECT_EQ(test, 55, ctr.value);
KUNIT_EXPECT_EQ(test, true, ctr.sticky);
KUNIT_EXPECT_EQ(test, 400, test_updateaddr[0]);
test_hw_cache.counter = 22;
test_hw_cache.sticky = false;
ret = vcap_rule_get_counter(&ri2.data, &ctr2);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 2012, test_hw_counter_id);
KUNIT_EXPECT_EQ(test, 22, ctr2.value);
KUNIT_EXPECT_EQ(test, false, ctr2.sticky);
KUNIT_EXPECT_EQ(test, 300, test_updateaddr[1]);
}
static void vcap_api_rule_insert_in_order_test(struct kunit *test)
{
/* Data used by VCAP Library callback */
static u32 keydata[32] = {};
static u32 mskdata[32] = {};
static u32 actdata[32] = {};
struct vcap_admin admin = {
.vtype = VCAP_TYPE_IS0,
.first_cid = 10000,
.last_cid = 19999,
.lookups = 4,
.last_valid_addr = 3071,
.first_valid_addr = 0,
.last_used_addr = 800,
.cache = {
.keystream = keydata,
.maskstream = mskdata,
.actionstream = actdata,
},
};
vcap_test_api_init(&admin);
/* Create rules with different sizes and check that they are placed
* at the correct address in the VCAP according to size
*/
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 10, 500, 12, 780);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 20, 400, 6, 774);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 30, 300, 3, 771);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 40, 200, 2, 768);
}
static void vcap_api_rule_insert_reverse_order_test(struct kunit *test)
{
/* Data used by VCAP Library callback */
static u32 keydata[32] = {};
static u32 mskdata[32] = {};
static u32 actdata[32] = {};
struct vcap_admin admin = {
.vtype = VCAP_TYPE_IS0,
.first_cid = 10000,
.last_cid = 19999,
.lookups = 4,
.last_valid_addr = 3071,
.first_valid_addr = 0,
.last_used_addr = 800,
.cache = {
.keystream = keydata,
.maskstream = mskdata,
.actionstream = actdata,
},
};
struct vcap_rule_internal *elem;
u32 exp_addr[] = {780, 774, 771, 768, 767};
int idx;
vcap_test_api_init(&admin);
/* Create rules with different sizes and check that they are placed
* at the correct address in the VCAP according to size
*/
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 20, 200, 2, 798);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 30, 300, 3, 795);
KUNIT_EXPECT_EQ(test, 6, test_move_offset);
KUNIT_EXPECT_EQ(test, 3, test_move_count);
KUNIT_EXPECT_EQ(test, 798, test_move_addr);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 40, 400, 6, 792);
KUNIT_EXPECT_EQ(test, 6, test_move_offset);
KUNIT_EXPECT_EQ(test, 6, test_move_count);
KUNIT_EXPECT_EQ(test, 792, test_move_addr);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 50, 500, 12, 780);
KUNIT_EXPECT_EQ(test, 18, test_move_offset);
KUNIT_EXPECT_EQ(test, 12, test_move_count);
KUNIT_EXPECT_EQ(test, 786, test_move_addr);
idx = 0;
list_for_each_entry(elem, &admin.rules, list) {
KUNIT_EXPECT_EQ(test, exp_addr[idx], elem->addr);
++idx;
}
KUNIT_EXPECT_EQ(test, 768, admin.last_used_addr);
}
static void vcap_api_rule_remove_at_end_test(struct kunit *test)
{
/* Data used by VCAP Library callback */
static u32 keydata[32] = {};
static u32 mskdata[32] = {};
static u32 actdata[32] = {};
struct vcap_admin admin = {
.vtype = VCAP_TYPE_IS0,
.first_cid = 10000,
.last_cid = 19999,
.lookups = 4,
.last_valid_addr = 3071,
.first_valid_addr = 0,
.last_used_addr = 800,
.cache = {
.keystream = keydata,
.maskstream = mskdata,
.actionstream = actdata,
},
};
int ret;
vcap_test_api_init(&admin);
test_init_rule_deletion();
/* Create rules with different sizes and check that they are placed
* at the correct address in the VCAP according to size
*/
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 10, 500, 12, 780);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 20, 400, 6, 774);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 30, 300, 3, 771);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 40, 200, 2, 768);
/* Remove rules again from the end */
ret = vcap_del_rule(&test_vctrl, &test_netdev, 200);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 768, test_init_start);
KUNIT_EXPECT_EQ(test, 2, test_init_count);
KUNIT_EXPECT_EQ(test, 771, admin.last_used_addr);
ret = vcap_del_rule(&test_vctrl, &test_netdev, 300);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 771, test_init_start);
KUNIT_EXPECT_EQ(test, 3, test_init_count);
KUNIT_EXPECT_EQ(test, 774, admin.last_used_addr);
ret = vcap_del_rule(&test_vctrl, &test_netdev, 400);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 774, test_init_start);
KUNIT_EXPECT_EQ(test, 6, test_init_count);
KUNIT_EXPECT_EQ(test, 780, admin.last_used_addr);
ret = vcap_del_rule(&test_vctrl, &test_netdev, 500);
KUNIT_EXPECT_EQ(test, ret, 0);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 780, test_init_start);
KUNIT_EXPECT_EQ(test, 12, test_init_count);
KUNIT_EXPECT_EQ(test, 3071, admin.last_used_addr);
}
static void vcap_api_rule_remove_in_middle_test(struct kunit *test)
{
/* Data used by VCAP Library callback */
static u32 keydata[32] = {};
static u32 mskdata[32] = {};
static u32 actdata[32] = {};
struct vcap_admin admin = {
.vtype = VCAP_TYPE_IS0,
.first_cid = 10000,
.last_cid = 19999,
.lookups = 4,
.first_valid_addr = 0,
.last_used_addr = 800,
.last_valid_addr = 800 - 1,
.cache = {
.keystream = keydata,
.maskstream = mskdata,
.actionstream = actdata,
},
};
int ret;
vcap_test_api_init(&admin);
/* Create rules with different sizes and check that they are placed
* at the correct address in the VCAP according to size
*/
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 10, 500, 12, 780);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 20, 400, 6, 774);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 30, 300, 3, 771);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 40, 200, 2, 768);
/* Remove rules in the middle */
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 400);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 768, test_move_addr);
KUNIT_EXPECT_EQ(test, -6, test_move_offset);
KUNIT_EXPECT_EQ(test, 6, test_move_count);
KUNIT_EXPECT_EQ(test, 768, test_init_start);
KUNIT_EXPECT_EQ(test, 6, test_init_count);
KUNIT_EXPECT_EQ(test, 774, admin.last_used_addr);
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 300);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 774, test_move_addr);
KUNIT_EXPECT_EQ(test, -4, test_move_offset);
KUNIT_EXPECT_EQ(test, 2, test_move_count);
KUNIT_EXPECT_EQ(test, 774, test_init_start);
KUNIT_EXPECT_EQ(test, 4, test_init_count);
KUNIT_EXPECT_EQ(test, 778, admin.last_used_addr);
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 500);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 778, test_move_addr);
KUNIT_EXPECT_EQ(test, -20, test_move_offset);
KUNIT_EXPECT_EQ(test, 2, test_move_count);
KUNIT_EXPECT_EQ(test, 778, test_init_start);
KUNIT_EXPECT_EQ(test, 20, test_init_count);
KUNIT_EXPECT_EQ(test, 798, admin.last_used_addr);
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 200);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 798, test_init_start);
KUNIT_EXPECT_EQ(test, 2, test_init_count);
KUNIT_EXPECT_EQ(test, 799, admin.last_used_addr);
}
static void vcap_api_rule_remove_in_front_test(struct kunit *test)
{
/* Data used by VCAP Library callback */
static u32 keydata[32] = {};
static u32 mskdata[32] = {};
static u32 actdata[32] = {};
struct vcap_admin admin = {
.vtype = VCAP_TYPE_IS0,
.first_cid = 10000,
.last_cid = 19999,
.lookups = 4,
.first_valid_addr = 0,
.last_used_addr = 800,
.last_valid_addr = 800 - 1,
.cache = {
.keystream = keydata,
.maskstream = mskdata,
.actionstream = actdata,
},
};
int ret;
vcap_test_api_init(&admin);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 10, 500, 12, 780);
KUNIT_EXPECT_EQ(test, 780, admin.last_used_addr);
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 500);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 0, test_move_addr);
KUNIT_EXPECT_EQ(test, 0, test_move_offset);
KUNIT_EXPECT_EQ(test, 0, test_move_count);
KUNIT_EXPECT_EQ(test, 780, test_init_start);
KUNIT_EXPECT_EQ(test, 12, test_init_count);
KUNIT_EXPECT_EQ(test, 799, admin.last_used_addr);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 20, 400, 6, 792);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 30, 300, 3, 789);
test_vcap_xn_rule_creator(test, 10000, VCAP_USER_QOS, 40, 200, 2, 786);
test_init_rule_deletion();
ret = vcap_del_rule(&test_vctrl, &test_netdev, 400);
KUNIT_EXPECT_EQ(test, 0, ret);
KUNIT_EXPECT_EQ(test, 786, test_move_addr);
KUNIT_EXPECT_EQ(test, -8, test_move_offset);
KUNIT_EXPECT_EQ(test, 6, test_move_count);
KUNIT_EXPECT_EQ(test, 786, test_init_start);
KUNIT_EXPECT_EQ(test, 8, test_init_count);
KUNIT_EXPECT_EQ(test, 794, admin.last_used_addr);
}
static struct kunit_case vcap_api_rule_remove_test_cases[] = {
KUNIT_CASE(vcap_api_rule_remove_at_end_test),
KUNIT_CASE(vcap_api_rule_remove_in_middle_test),
KUNIT_CASE(vcap_api_rule_remove_in_front_test),
{}
};
static void vcap_api_next_lookup_basic_test(struct kunit *test)
{
struct vcap_admin admin1 = {
......@@ -1458,6 +1954,33 @@ static void vcap_api_next_lookup_advanced_test(struct kunit *test)
KUNIT_EXPECT_EQ(test, true, ret);
}
static struct kunit_suite vcap_api_rule_remove_test_suite = {
.name = "VCAP_API_Rule_Remove_Testsuite",
.test_cases = vcap_api_rule_remove_test_cases,
};
static struct kunit_case vcap_api_rule_insert_test_cases[] = {
KUNIT_CASE(vcap_api_rule_insert_in_order_test),
KUNIT_CASE(vcap_api_rule_insert_reverse_order_test),
{}
};
static struct kunit_suite vcap_api_rule_insert_test_suite = {
.name = "VCAP_API_Rule_Insert_Testsuite",
.test_cases = vcap_api_rule_insert_test_cases,
};
static struct kunit_case vcap_api_rule_counter_test_cases[] = {
KUNIT_CASE(vcap_api_set_rule_counter_test),
KUNIT_CASE(vcap_api_get_rule_counter_test),
{}
};
static struct kunit_suite vcap_api_rule_counter_test_suite = {
.name = "VCAP_API_Rule_Counter_Testsuite",
.test_cases = vcap_api_rule_counter_test_cases,
};
static struct kunit_case vcap_api_support_test_cases[] = {
KUNIT_CASE(vcap_api_next_lookup_basic_test),
KUNIT_CASE(vcap_api_next_lookup_advanced_test),
......@@ -1519,6 +2042,9 @@ static struct kunit_suite vcap_api_encoding_test_suite = {
.test_cases = vcap_api_encoding_test_cases,
};
kunit_test_suite(vcap_api_rule_remove_test_suite);
kunit_test_suite(vcap_api_rule_insert_test_suite);
kunit_test_suite(vcap_api_rule_counter_test_suite);
kunit_test_suite(vcap_api_support_test_suite);
kunit_test_suite(vcap_api_full_rule_test_suite);
kunit_test_suite(vcap_api_rule_value_test_suite);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment