X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-classifier.c;h=84f9367248e14334619f40defbdf887d0820b91f;hb=cabd4c43854275943792a8b1bb4c7b719e210259;hp=f6164947b60e25ebd7c328aaef74b3ca97f81cb0;hpb=368eefac37c490ad4f63e5d40deb94c724cf25c5;p=sliver-openvswitch.git diff --git a/tests/test-classifier.c b/tests/test-classifier.c index f6164947b..84f936724 100644 --- a/tests/test-classifier.c +++ b/tests/test-classifier.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +26,6 @@ */ #include -#include "classifier.h" #include #include #include "byte-order.h" @@ -34,11 +33,17 @@ #include "flow.h" #include "ofp-util.h" #include "packets.h" +#include "random.h" #include "unaligned.h" - +#include "ovstest.h" #undef NDEBUG #include +/* We need access to classifier internal definitions to be able to fully + * test them. The alternative would be to expose them all in the classifier + * API. */ +#include "classifier.c" + /* Fields in a rule. */ #define CLS_FIELDS \ /* struct flow all-caps */ \ @@ -190,7 +195,7 @@ tcls_remove(struct tcls *cls, const struct test_rule *rule) return; } } - NOT_REACHED(); + OVS_NOT_REACHED(); } static bool @@ -240,10 +245,11 @@ match(const struct cls_rule *wild_, const struct flow *fixed) eq = !((fixed->dl_type ^ wild.flow.dl_type) & wild.wc.masks.dl_type); } else if (f_idx == CLS_F_IDX_IN_PORT) { - eq = !((fixed->in_port ^ wild.flow.in_port) - & wild.wc.masks.in_port); + eq = !((fixed->in_port.ofp_port + ^ wild.flow.in_port.ofp_port) + & wild.wc.masks.in_port.ofp_port); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } if (!eq) { @@ -298,7 +304,7 @@ static ovs_be64 tun_id_values[] = { static ovs_be64 metadata_values[] = { 0, CONSTANT_HTONLL(UINT64_C(0xfedcba9876543210)) }; -static uint16_t in_port_values[] = { 1, OFPP_LOCAL }; +static ofp_port_t in_port_values[] = { OFP_PORT_C(1), OFPP_LOCAL }; static ovs_be16 vlan_tci_values[] = { CONSTANT_HTONS(101), CONSTANT_HTONS(0) }; static ovs_be16 dl_type_values[] = { CONSTANT_HTONS(ETH_TYPE_IP), CONSTANT_HTONS(ETH_TYPE_ARP) }; @@ -394,23 +400,27 @@ get_value(unsigned int *x, unsigned n_values) static void compare_classifiers(struct classifier *cls, struct tcls *tcls) + OVS_REQ_RDLOCK(cls->rwlock) { static const int confidence = 500; unsigned int i; assert(classifier_count(cls) == tcls->n_rules); for (i = 0; i < confidence; i++) { - struct cls_rule *cr0, *cr1; + struct cls_rule *cr0, *cr1, *cr2; struct flow flow; + struct flow_wildcards wc; unsigned int x; - x = rand () % N_FLOW_VALUES; + flow_wildcards_init_catchall(&wc); + x = random_range(N_FLOW_VALUES); memset(&flow, 0, sizeof flow); flow.nw_src = nw_src_values[get_value(&x, N_NW_SRC_VALUES)]; flow.nw_dst = nw_dst_values[get_value(&x, N_NW_DST_VALUES)]; flow.tunnel.tun_id = tun_id_values[get_value(&x, N_TUN_ID_VALUES)]; flow.metadata = metadata_values[get_value(&x, N_METADATA_VALUES)]; - flow.in_port = in_port_values[get_value(&x, N_IN_PORT_VALUES)]; + flow.in_port.ofp_port = in_port_values[get_value(&x, + N_IN_PORT_VALUES)]; flow.vlan_tci = vlan_tci_values[get_value(&x, N_VLAN_TCI_VALUES)]; flow.dl_type = dl_type_values[get_value(&x, N_DL_TYPE_VALUES)]; flow.tp_src = tp_src_values[get_value(&x, N_TP_SRC_VALUES)]; @@ -422,7 +432,7 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls) flow.nw_proto = nw_proto_values[get_value(&x, N_NW_PROTO_VALUES)]; flow.nw_tos = nw_dscp_values[get_value(&x, N_NW_DSCP_VALUES)]; - cr0 = classifier_lookup(cls, &flow, NULL); + cr0 = classifier_lookup(cls, &flow, &wc); cr1 = tcls_lookup(tcls, &flow); assert((cr0 == NULL) == (cr1 == NULL)); if (cr0 != NULL) { @@ -432,6 +442,8 @@ compare_classifiers(struct classifier *cls, struct tcls *tcls) assert(cls_rule_equal(cr0, cr1)); assert(tr0->aux == tr1->aux); } + cr2 = classifier_lookup(cls, &flow, NULL); + assert(cr2 == cr0); } } @@ -441,19 +453,21 @@ destroy_classifier(struct classifier *cls) struct test_rule *rule, *next_rule; struct cls_cursor cursor; + fat_rwlock_wrlock(&cls->rwlock); cls_cursor_init(&cursor, cls, NULL); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) { classifier_remove(cls, &rule->cls_rule); free_rule(rule); } + fat_rwlock_unlock(&cls->rwlock); classifier_destroy(cls); } static void -check_tables(const struct classifier *cls, - int n_tables, int n_rules, int n_dups) +check_tables(const struct classifier *cls, int n_tables, int n_rules, + int n_dups) OVS_REQ_RDLOCK(cls->rwlock) { - const struct cls_table *table; + const struct cls_subtable *table; struct test_rule *test_rule; struct cls_cursor cursor; int found_tables = 0; @@ -461,7 +475,7 @@ check_tables(const struct classifier *cls, int found_dups = 0; int found_rules2 = 0; - HMAP_FOR_EACH (table, hmap_node, &cls->tables) { + HMAP_FOR_EACH (table, hmap_node, &cls->cls->subtables) { const struct cls_rule *head; unsigned int max_priority = 0; unsigned int max_count = 0; @@ -495,8 +509,8 @@ check_tables(const struct classifier *cls, assert(table->max_count == max_count); } - assert(found_tables == hmap_count(&cls->tables)); - assert(n_tables == -1 || n_tables == hmap_count(&cls->tables)); + assert(found_tables == hmap_count(&cls->cls->subtables)); + assert(n_tables == -1 || n_tables == hmap_count(&cls->cls->subtables)); assert(n_rules == -1 || found_rules == n_rules); assert(n_dups == -1 || found_dups == n_dups); @@ -522,33 +536,33 @@ make_rule(int wc_fields, unsigned int priority, int value_pat) values[f_idx][value_idx], f->len); if (f_idx == CLS_F_IDX_NW_SRC) { - match.wc.masks.nw_src = htonl(UINT32_MAX); + match.wc.masks.nw_src = OVS_BE32_MAX; } else if (f_idx == CLS_F_IDX_NW_DST) { - match.wc.masks.nw_dst = htonl(UINT32_MAX); + match.wc.masks.nw_dst = OVS_BE32_MAX; } else if (f_idx == CLS_F_IDX_TP_SRC) { - match.wc.masks.tp_src = htons(UINT16_MAX); + match.wc.masks.tp_src = OVS_BE16_MAX; } else if (f_idx == CLS_F_IDX_TP_DST) { - match.wc.masks.tp_dst = htons(UINT16_MAX); + match.wc.masks.tp_dst = OVS_BE16_MAX; } else if (f_idx == CLS_F_IDX_DL_SRC) { memset(match.wc.masks.dl_src, 0xff, ETH_ADDR_LEN); } else if (f_idx == CLS_F_IDX_DL_DST) { memset(match.wc.masks.dl_dst, 0xff, ETH_ADDR_LEN); } else if (f_idx == CLS_F_IDX_VLAN_TCI) { - match.wc.masks.vlan_tci = htons(UINT16_MAX); + match.wc.masks.vlan_tci = OVS_BE16_MAX; } else if (f_idx == CLS_F_IDX_TUN_ID) { - match.wc.masks.tunnel.tun_id = htonll(UINT64_MAX); + match.wc.masks.tunnel.tun_id = OVS_BE64_MAX; } else if (f_idx == CLS_F_IDX_METADATA) { - match.wc.masks.metadata = htonll(UINT64_MAX); + match.wc.masks.metadata = OVS_BE64_MAX; } else if (f_idx == CLS_F_IDX_NW_DSCP) { match.wc.masks.nw_tos |= IP_DSCP_MASK; } else if (f_idx == CLS_F_IDX_NW_PROTO) { match.wc.masks.nw_proto = UINT8_MAX; } else if (f_idx == CLS_F_IDX_DL_TYPE) { - match.wc.masks.dl_type = htons(UINT16_MAX); + match.wc.masks.dl_type = OVS_BE16_MAX; } else if (f_idx == CLS_F_IDX_IN_PORT) { - match.wc.masks.in_port = UINT16_MAX; + match.wc.masks.in_port.ofp_port = u16_to_ofp(UINT16_MAX); } else { - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -579,7 +593,7 @@ static void shuffle(unsigned int *p, size_t n) { for (; n > 1; n--, p++) { - unsigned int *q = &p[rand() % n]; + unsigned int *q = &p[random_range(n)]; unsigned int tmp = *p; *p = *q; *q = tmp; @@ -590,7 +604,7 @@ static void shuffle_u32s(uint32_t *p, size_t n) { for (; n > 1; n--, p++) { - uint32_t *q = &p[rand() % n]; + uint32_t *q = &p[random_range(n)]; uint32_t tmp = *p; *p = *q; *q = tmp; @@ -599,6 +613,10 @@ shuffle_u32s(uint32_t *p, size_t n) /* Classifier tests. */ +static enum mf_field_id trie_fields[2] = { + MFF_IPV4_DST, MFF_IPV4_SRC +}; + /* Tests an empty classifier. */ static void test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) @@ -606,11 +624,14 @@ test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) struct classifier cls; struct tcls tcls; - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, ARRAY_SIZE(trie_fields)); tcls_init(&tcls); assert(classifier_is_empty(&cls)); assert(tcls_is_empty(&tcls)); compare_classifiers(&cls, &tcls); + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -636,7 +657,10 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) rule = make_rule(wc_fields, hash_bytes(&wc_fields, sizeof wc_fields, 0), 0); - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); tcls_rule = tcls_insert(&tcls, rule); @@ -651,6 +675,7 @@ test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); free_rule(rule); + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -673,7 +698,10 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) rule2->aux += 5; rule2->aux += 5; - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); tcls_insert(&tcls, rule1); classifier_insert(&cls, &rule1->cls_rule); @@ -689,6 +717,7 @@ test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) check_tables(&cls, 1, 1, 0); compare_classifiers(&cls, &tcls); tcls_destroy(&tcls); + fat_rwlock_unlock(&cls.rwlock); destroy_classifier(&cls); } } @@ -783,7 +812,10 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) pri_rules[i] = -1; } - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < ARRAY_SIZE(ops); i++) { @@ -822,6 +854,7 @@ test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); } + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); @@ -879,18 +912,21 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) int i; do { - wcf = rand() & ((1u << CLS_N_FIELDS) - 1); + wcf = random_uint32() & ((1u << CLS_N_FIELDS) - 1); value_mask = ~wcf & ((1u << CLS_N_FIELDS) - 1); } while ((1 << count_ones(value_mask)) < N_RULES); - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < N_RULES; i++) { - unsigned int priority = rand(); + unsigned int priority = random_uint32(); do { - value_pats[i] = rand() & value_mask; + value_pats[i] = random_uint32() & value_mask; } while (array_contains(value_pats, i, value_pats[i])); rules[i] = make_rule(wcf, priority, value_pats[i]); @@ -910,6 +946,7 @@ test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) compare_classifiers(&cls, &tcls); } + fat_rwlock_unlock(&cls.rwlock); classifier_destroy(&cls); tcls_destroy(&tcls); } @@ -928,7 +965,7 @@ test_many_rules_in_n_tables(int n_tables) assert(n_tables < 10); for (i = 0; i < n_tables; i++) { do { - wcfs[i] = rand() & ((1u << CLS_N_FIELDS) - 1); + wcfs[i] = random_uint32() & ((1u << CLS_N_FIELDS) - 1); } while (array_contains(wcfs, i, wcfs[i])); } @@ -937,20 +974,23 @@ test_many_rules_in_n_tables(int n_tables) struct classifier cls; struct tcls tcls; - srand(iteration); + random_set_seed(iteration + 1); for (i = 0; i < MAX_RULES; i++) { priorities[i] = i * 129; } shuffle(priorities, ARRAY_SIZE(priorities)); - classifier_init(&cls); + classifier_init(&cls, flow_segment_u32s); + fat_rwlock_wrlock(&cls.rwlock); + classifier_set_prefix_fields(&cls, trie_fields, + ARRAY_SIZE(trie_fields)); tcls_init(&tcls); for (i = 0; i < MAX_RULES; i++) { struct test_rule *rule; unsigned int priority = priorities[i]; - int wcf = wcfs[rand() % n_tables]; - int value_pat = rand() & ((1u << CLS_N_FIELDS) - 1); + int wcf = wcfs[random_range(n_tables)]; + int value_pat = random_uint32() & ((1u << CLS_N_FIELDS) - 1); rule = make_rule(wcf, priority, value_pat); tcls_insert(&tcls, rule); classifier_insert(&cls, &rule->cls_rule); @@ -963,7 +1003,7 @@ test_many_rules_in_n_tables(int n_tables) struct test_rule *target; struct cls_cursor cursor; - target = clone_rule(tcls.rules[rand() % tcls.n_rules]); + target = clone_rule(tcls.rules[random_range(tcls.n_rules)]); cls_cursor_init(&cursor, &cls, &target->cls_rule); CLS_CURSOR_FOR_EACH_SAFE (rule, next_rule, cls_rule, &cursor) { @@ -976,6 +1016,7 @@ test_many_rules_in_n_tables(int n_tables) free_rule(target); } + fat_rwlock_unlock(&cls.rwlock); destroy_classifier(&cls); tcls_destroy(&tcls); } @@ -1002,7 +1043,7 @@ random_value(void) { 0xffffffff, 0xaaaaaaaa, 0x55555555, 0x80000000, 0x00000001, 0xface0000, 0x00d00d1e, 0xdeadbeef }; - return values[random_uint32() % ARRAY_SIZE(values)]; + return values[random_range(ARRAY_SIZE(values))]; } static bool @@ -1076,7 +1117,7 @@ next_random_flow(struct flow *flow, unsigned int idx) } } } - NOT_REACHED(); + OVS_NOT_REACHED(); } /* 16 randomly chosen flows with N >= 3 nonzero values. */ @@ -1166,7 +1207,8 @@ test_miniflow(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Check that the flow equals its miniflow. */ assert(miniflow_get_vid(&miniflow) == vlan_tci_to_vid(flow.vlan_tci)); for (i = 0; i < FLOW_U32S; i++) { - assert(miniflow_get(&miniflow, i) == flow_u32[i]); + assert(MINIFLOW_GET_TYPE(&miniflow, uint32_t, i * 4) + == flow_u32[i]); } /* Check that the miniflow equals itself. */ @@ -1303,17 +1345,18 @@ static const struct command commands[] = { /* Miniflow and minimask tests. */ {"miniflow", 0, 0, test_miniflow}, - {"minimask_has_extra", 0, 0, test_minimask_has_extra}, - {"minimask_combine", 0, 0, test_minimask_combine}, + {"minimask_has_extra", 0, 0, test_minimask_has_extra}, + {"minimask_combine", 0, 0, test_minimask_combine}, {NULL, 0, 0, NULL}, }; -int -main(int argc, char *argv[]) +static void +test_classifier_main(int argc, char *argv[]) { set_program_name(argv[0]); init_values(); run_command(argc - 1, argv + 1, commands); - return 0; } + +OVSTEST_REGISTER("test-classifier", test_classifier_main);