/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
#include <config.h>
+#undef NDEBUG
#include "classifier.h"
+#include <assert.h>
#include <errno.h>
#include <limits.h>
#include "byte-order.h"
+#include "classifier-private.h"
#include "command-line.h"
#include "flow.h"
#include "ofp-util.h"
+#include "ovstest.h"
#include "packets.h"
#include "random.h"
#include "unaligned.h"
-
-#undef NDEBUG
-#include <assert.h>
+#include "util.h"
/* Fields in a rule. */
-#define CLS_FIELDS \
+#define CLS_FIELDS \
/* struct flow all-caps */ \
/* member name name */ \
/* ----------- -------- */ \
}
}
-static struct test_rule *make_rule(int wc_fields, unsigned int priority,
- int value_pat);
+static struct test_rule *make_rule(int wc_fields, int priority, int value_pat);
static void free_rule(struct test_rule *);
static struct test_rule *clone_rule(const struct test_rule *);
const struct cls_rule *pos = &tcls->rules[i]->cls_rule;
if (cls_rule_equal(pos, &rule->cls_rule)) {
/* Exact match. */
- free_rule(tcls->rules[i]);
+ ovsrcu_postpone(free_rule, tcls->rules[i]);
tcls->rules[i] = clone_rule(rule);
return tcls->rules[i];
} else if (pos->priority < rule->cls_rule.priority) {
return;
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
static bool
^ wild.flow.in_port.ofp_port)
& wild.wc.masks.in_port.ofp_port);
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
if (!eq) {
static ovs_be16 tp_src_values[] = { CONSTANT_HTONS(49362),
CONSTANT_HTONS(80) };
static ovs_be16 tp_dst_values[] = { CONSTANT_HTONS(6667), CONSTANT_HTONS(22) };
-static uint8_t dl_src_values[][6] = { { 0x00, 0x02, 0xe3, 0x0f, 0x80, 0xa4 },
+static uint8_t dl_src_values[][ETH_ADDR_LEN] = {
+ { 0x00, 0x02, 0xe3, 0x0f, 0x80, 0xa4 },
{ 0x5e, 0x33, 0x7f, 0x5f, 0x1e, 0x99 } };
-static uint8_t dl_dst_values[][6] = { { 0x4a, 0x27, 0x71, 0xae, 0x64, 0xc1 },
+static uint8_t dl_dst_values[][ETH_ADDR_LEN] = {
+ { 0x4a, 0x27, 0x71, 0xae, 0x64, 0xc1 },
{ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff } };
static uint8_t nw_proto_values[] = { IPPROTO_TCP, IPPROTO_ICMP };
static uint8_t nw_dscp_values[] = { 48, 0 };
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;
+ const struct cls_rule *cr0, *cr1, *cr2;
struct flow flow;
+ struct flow_wildcards wc;
unsigned int x;
+ 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_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);
+ /* This assertion is here to suppress a GCC 4.9 array-bounds warning */
+ ovs_assert(cls->n_tries <= CLS_MAX_TRIES);
+
+ cr0 = classifier_lookup(cls, &flow, &wc);
cr1 = tcls_lookup(tcls, &flow);
assert((cr0 == NULL) == (cr1 == NULL));
if (cr0 != NULL) {
assert(cls_rule_equal(cr0, cr1));
assert(tr0->aux == tr1->aux);
}
+ cr2 = classifier_lookup(cls, &flow, NULL);
+ assert(cr2 == cr0);
}
}
static void
destroy_classifier(struct classifier *cls)
{
- struct test_rule *rule, *next_rule;
- struct cls_cursor cursor;
-
- ovs_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);
+ struct test_rule *rule;
+
+ classifier_defer(cls);
+ CLS_FOR_EACH (rule, cls_rule, cls) {
+ if (classifier_remove(cls, &rule->cls_rule)) {
+ ovsrcu_postpone(free_rule, rule);
+ }
}
- ovs_rwlock_unlock(&cls->rwlock);
classifier_destroy(cls);
}
+static void
+pvector_verify(const struct pvector *pvec)
+{
+ void *ptr OVS_UNUSED;
+ int prev_priority = INT_MAX;
+
+ PVECTOR_FOR_EACH (ptr, pvec) {
+ int priority = cursor__.vector[cursor__.entry_idx].priority;
+ if (priority > prev_priority) {
+ ovs_abort(0, "Priority vector is out of order (%u > %u)",
+ priority, prev_priority);
+ }
+ prev_priority = priority;
+ }
+}
+
+static unsigned int
+trie_verify(const rcu_trie_ptr *trie, unsigned int ofs, unsigned int n_bits)
+{
+ const struct trie_node *node = ovsrcu_get(struct trie_node *, trie);
+
+ if (node) {
+ assert(node->n_rules == 0 || node->n_bits > 0);
+ ofs += node->n_bits;
+ assert((ofs > 0 || (ofs == 0 && node->n_bits == 0)) && ofs <= n_bits);
+
+ return node->n_rules
+ + trie_verify(&node->edges[0], ofs, n_bits)
+ + trie_verify(&node->edges[1], ofs, n_bits);
+ }
+ return 0;
+}
+
+static void
+verify_tries(struct classifier *cls)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
+{
+ unsigned int n_rules = 0;
+ int i;
+
+ for (i = 0; i < cls->n_tries; i++) {
+ n_rules += trie_verify(&cls->tries[i].root, 0,
+ cls->tries[i].field->n_bits);
+ }
+ assert(n_rules <= cls->n_rules);
+}
+
static void
check_tables(const struct classifier *cls, int n_tables, int n_rules,
- int n_dups) OVS_REQ_RDLOCK(cls->rwlock)
+ int n_dups)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
- const struct cls_table *table;
+ const struct cls_subtable *table;
struct test_rule *test_rule;
- struct cls_cursor cursor;
int found_tables = 0;
int found_rules = 0;
int found_dups = 0;
int found_rules2 = 0;
- HMAP_FOR_EACH (table, hmap_node, &cls->tables) {
- const struct cls_rule *head;
- unsigned int max_priority = 0;
+ pvector_verify(&cls->subtables);
+ CMAP_FOR_EACH (table, cmap_node, &cls->subtables_map) {
+ const struct cls_match *head;
+ int max_priority = INT_MIN;
unsigned int max_count = 0;
+ bool found = false;
+ const struct cls_subtable *iter;
+
+ /* Locate the subtable from 'subtables'. */
+ PVECTOR_FOR_EACH (iter, &cls->subtables) {
+ if (iter == table) {
+ if (found) {
+ ovs_abort(0, "Subtable %p duplicated in 'subtables'.",
+ table);
+ }
+ found = true;
+ }
+ }
+ if (!found) {
+ ovs_abort(0, "Subtable %p not found from 'subtables'.", table);
+ }
- assert(!hmap_is_empty(&table->rules));
+ assert(!cmap_is_empty(&table->rules));
+ assert(trie_verify(&table->ports_trie, 0, table->ports_mask_len)
+ == (table->ports_mask_len ? cmap_count(&table->rules) : 0));
found_tables++;
- HMAP_FOR_EACH (head, hmap_node, &table->rules) {
- unsigned int prev_priority = UINT_MAX;
- const struct cls_rule *rule;
+ CMAP_FOR_EACH (head, cmap_node, &table->rules) {
+ int prev_priority = INT_MAX;
+ const struct cls_match *rule;
if (head->priority > max_priority) {
max_priority = head->priority;
}
found_rules++;
- LIST_FOR_EACH (rule, list, &head->list) {
+ RCULIST_FOR_EACH (rule, list, &head->list) {
assert(rule->priority < prev_priority);
assert(rule->priority <= table->max_priority);
prev_priority = rule->priority;
found_rules++;
found_dups++;
- assert(classifier_find_rule_exactly(cls, rule) == rule);
+ assert(classifier_find_rule_exactly(cls, rule->cls_rule)
+ == rule->cls_rule);
}
}
assert(table->max_priority == max_priority);
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 == cmap_count(&cls->subtables_map));
+ assert(found_tables == pvector_count(&cls->subtables));
+ assert(n_tables == -1 || n_tables == cmap_count(&cls->subtables_map));
assert(n_rules == -1 || found_rules == n_rules);
assert(n_dups == -1 || found_dups == n_dups);
- cls_cursor_init(&cursor, cls, NULL);
- CLS_CURSOR_FOR_EACH (test_rule, cls_rule, &cursor) {
+ CLS_FOR_EACH (test_rule, cls_rule, cls) {
found_rules2++;
}
assert(found_rules == found_rules2);
}
static struct test_rule *
-make_rule(int wc_fields, unsigned int priority, int value_pat)
+make_rule(int wc_fields, int priority, int value_pat)
{
const struct cls_field *f;
struct test_rule *rule;
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.ofp_port = u16_to_ofp(UINT16_MAX);
} else {
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
rule = xzalloc(sizeof *rule);
- cls_rule_init(&rule->cls_rule, &match, wc_fields ? priority : UINT_MAX);
+ cls_rule_init(&rule->cls_rule, &match, wc_fields
+ ? (priority == INT_MIN ? priority + 1 : priority)
+ : INT_MAX);
return rule;
}
}
static void
-shuffle(unsigned int *p, size_t n)
+shuffle(int *p, size_t n)
{
for (; n > 1; n--, p++) {
- unsigned int *q = &p[random_range(n)];
- unsigned int tmp = *p;
+ int *q = &p[random_range(n)];
+ int tmp = *p;
*p = *q;
*q = tmp;
}
\f
/* Classifier tests. */
+static enum mf_field_id trie_fields[2] = {
+ MFF_IPV4_DST, MFF_IPV4_SRC
+};
+
+static void
+set_prefix_fields(struct classifier *cls)
+{
+ verify_tries(cls);
+ classifier_set_prefix_fields(cls, trie_fields, ARRAY_SIZE(trie_fields));
+ verify_tries(cls);
+}
+
/* Tests an empty classifier. */
static void
-test_empty(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_empty(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct classifier cls;
struct tcls tcls;
- classifier_init(&cls);
- ovs_rwlock_rdlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
assert(classifier_is_empty(&cls));
assert(tcls_is_empty(&tcls));
compare_classifiers(&cls, &tcls);
- ovs_rwlock_unlock(&cls.rwlock);
classifier_destroy(&cls);
tcls_destroy(&tcls);
}
/* Destroys a null classifier. */
static void
-test_destroy_null(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_destroy_null(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
classifier_destroy(NULL);
}
/* Tests classification with one rule at a time. */
static void
-test_single_rule(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_single_rule(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
unsigned int wc_fields; /* Hilarious. */
rule = make_rule(wc_fields,
hash_bytes(&wc_fields, sizeof wc_fields, 0), 0);
- classifier_init(&cls);
- ovs_rwlock_wrlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
tcls_rule = tcls_insert(&tcls, rule);
- classifier_insert(&cls, &rule->cls_rule);
- check_tables(&cls, 1, 1, 0);
+ classifier_insert(&cls, &rule->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
+ check_tables(&cls, 1, 1, 0);
classifier_remove(&cls, &rule->cls_rule);
tcls_remove(&tcls, tcls_rule);
assert(tcls_is_empty(&tcls));
compare_classifiers(&cls, &tcls);
- free_rule(rule);
- ovs_rwlock_unlock(&cls.rwlock);
+ ovsrcu_postpone(free_rule, rule);
classifier_destroy(&cls);
tcls_destroy(&tcls);
}
/* Tests replacing one rule by another. */
static void
-test_rule_replacement(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_rule_replacement(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
unsigned int wc_fields;
rule2->aux += 5;
rule2->aux += 5;
- classifier_init(&cls);
- ovs_rwlock_wrlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
tcls_insert(&tcls, rule1);
- classifier_insert(&cls, &rule1->cls_rule);
- check_tables(&cls, 1, 1, 0);
+ classifier_insert(&cls, &rule1->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
+ check_tables(&cls, 1, 1, 0);
tcls_destroy(&tcls);
tcls_init(&tcls);
tcls_insert(&tcls, rule2);
+
assert(test_rule_from_cls_rule(
- classifier_replace(&cls, &rule2->cls_rule)) == rule1);
- free_rule(rule1);
- check_tables(&cls, 1, 1, 0);
+ classifier_replace(&cls, &rule2->cls_rule,
+ NULL, 0)) == rule1);
+ ovsrcu_postpone(free_rule, rule1);
compare_classifiers(&cls, &tcls);
+ check_tables(&cls, 1, 1, 0);
+ classifier_defer(&cls);
+ classifier_remove(&cls, &rule2->cls_rule);
+
tcls_destroy(&tcls);
- ovs_rwlock_unlock(&cls.rwlock);
destroy_classifier(&cls);
}
}
/* Tests classification with rules that have the same matching criteria. */
static void
-test_many_rules_in_one_list (int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_many_rules_in_one_list (struct ovs_cmdl_context *ctx OVS_UNUSED)
{
enum { N_RULES = 3 };
int n_pris;
pri_rules[i] = -1;
}
- classifier_init(&cls);
- ovs_rwlock_wrlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
for (i = 0; i < ARRAY_SIZE(ops); i++) {
tcls_rules[j] = tcls_insert(&tcls, rules[j]);
displaced_rule = test_rule_from_cls_rule(
- classifier_replace(&cls, &rules[j]->cls_rule));
+ classifier_replace(&cls, &rules[j]->cls_rule,
+ NULL, 0));
if (pri_rules[pris[j]] >= 0) {
int k = pri_rules[pris[j]];
assert(displaced_rule != NULL);
tcls_rules[j] = NULL;
pri_rules[pris[j]] = -1;
}
+ compare_classifiers(&cls, &tcls);
n = 0;
for (m = 0; m < N_RULES; m++) {
n += tcls_rules[m] != NULL;
}
check_tables(&cls, n > 0, n, n - 1);
-
- compare_classifiers(&cls, &tcls);
}
- ovs_rwlock_unlock(&cls.rwlock);
- classifier_destroy(&cls);
- tcls_destroy(&tcls);
-
+ classifier_defer(&cls);
for (i = 0; i < N_RULES; i++) {
- free_rule(rules[i]);
+ if (classifier_remove(&cls, &rules[i]->cls_rule)) {
+ ovsrcu_postpone(free_rule, rules[i]);
+ }
}
+ classifier_destroy(&cls);
+ tcls_destroy(&tcls);
} while (next_permutation(ops, ARRAY_SIZE(ops)));
assert(n_permutations == (factorial(N_RULES * 2) >> N_RULES));
}
/* Tests classification with two rules at a time that fall into the same
* table but different lists. */
static void
-test_many_rules_in_one_table(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_many_rules_in_one_table(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
int iteration;
value_mask = ~wcf & ((1u << CLS_N_FIELDS) - 1);
} while ((1 << count_ones(value_mask)) < N_RULES);
- classifier_init(&cls);
- ovs_rwlock_wrlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
for (i = 0; i < N_RULES; i++) {
- unsigned int priority = random_uint32();
+ int priority = random_range(INT_MAX);
do {
value_pats[i] = random_uint32() & value_mask;
rules[i] = make_rule(wcf, priority, value_pats[i]);
tcls_rules[i] = tcls_insert(&tcls, rules[i]);
- classifier_insert(&cls, &rules[i]->cls_rule);
- check_tables(&cls, 1, i + 1, 0);
+ classifier_insert(&cls, &rules[i]->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
+
+ check_tables(&cls, 1, i + 1, 0);
}
for (i = 0; i < N_RULES; i++) {
tcls_remove(&tcls, tcls_rules[i]);
classifier_remove(&cls, &rules[i]->cls_rule);
- free_rule(rules[i]);
+ compare_classifiers(&cls, &tcls);
+ ovsrcu_postpone(free_rule, rules[i]);
check_tables(&cls, i < N_RULES - 1, N_RULES - (i + 1), 0);
- compare_classifiers(&cls, &tcls);
}
- ovs_rwlock_unlock(&cls.rwlock);
classifier_destroy(&cls);
tcls_destroy(&tcls);
}
}
for (iteration = 0; iteration < 30; iteration++) {
- unsigned int priorities[MAX_RULES];
+ int priorities[MAX_RULES];
struct classifier cls;
struct tcls tcls;
random_set_seed(iteration + 1);
for (i = 0; i < MAX_RULES; i++) {
- priorities[i] = i * 129;
+ priorities[i] = (i * 129) & INT_MAX;
}
shuffle(priorities, ARRAY_SIZE(priorities));
- classifier_init(&cls);
- ovs_rwlock_wrlock(&cls.rwlock);
+ classifier_init(&cls, flow_segment_u64s);
+ set_prefix_fields(&cls);
tcls_init(&tcls);
for (i = 0; i < MAX_RULES; i++) {
struct test_rule *rule;
- unsigned int priority = priorities[i];
+ int priority = priorities[i];
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);
- check_tables(&cls, -1, i + 1, -1);
+ classifier_insert(&cls, &rule->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
+ check_tables(&cls, -1, i + 1, -1);
}
while (!classifier_is_empty(&cls)) {
- struct test_rule *rule, *next_rule;
struct test_rule *target;
- struct cls_cursor cursor;
+ struct test_rule *rule;
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) {
- classifier_remove(&cls, &rule->cls_rule);
- free_rule(rule);
+ CLS_FOR_EACH_TARGET (rule, cls_rule, &cls, &target->cls_rule) {
+ if (classifier_remove(&cls, &rule->cls_rule)) {
+ ovsrcu_postpone(free_rule, rule);
+ }
}
+
tcls_delete_matches(&tcls, &target->cls_rule);
compare_classifiers(&cls, &tcls);
check_tables(&cls, -1, -1, -1);
free_rule(target);
}
- ovs_rwlock_unlock(&cls.rwlock);
destroy_classifier(&cls);
tcls_destroy(&tcls);
}
}
static void
-test_many_rules_in_two_tables(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_many_rules_in_two_tables(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
test_many_rules_in_n_tables(2);
}
static void
-test_many_rules_in_five_tables(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_many_rules_in_five_tables(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
test_many_rules_in_n_tables(5);
}
}
}
+#define FLOW_U32S (FLOW_U64S * 2)
+
static bool
init_consecutive_values(int n_consecutive, struct flow *flow,
unsigned int *idxp)
}
}
}
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
/* 16 randomly chosen flows with N >= 3 nonzero values. */
}
static void
-test_miniflow(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_miniflow(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct flow flow;
unsigned int idx;
random_set_seed(0xb3faca38);
for (idx = 0; next_random_flow(&flow, idx); idx++) {
- const uint32_t *flow_u32 = (const uint32_t *) &flow;
+ const uint64_t *flow_u64 = (const uint64_t *) &flow;
struct miniflow miniflow, miniflow2, miniflow3;
struct flow flow2, flow3;
struct flow_wildcards mask;
/* 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]);
+ for (i = 0; i < FLOW_U64S; i++) {
+ assert(miniflow_get(&miniflow, i) == flow_u64[i]);
}
/* Check that the miniflow equals itself. */
}
static void
-test_minimask_has_extra(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_minimask_has_extra(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct flow_wildcards catchall;
struct minimask minicatchall;
}
static void
-test_minimask_combine(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+test_minimask_combine(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct flow_wildcards catchall;
struct minimask minicatchall;
for (idx = 0; next_random_flow(&flow, idx); idx++) {
struct minimask minimask, minimask2, minicombined;
struct flow_wildcards mask, mask2, combined, combined2;
- uint32_t storage[FLOW_U32S];
+ uint64_t storage[FLOW_U64S];
struct flow flow2;
mask.masks = flow;
minimask_destroy(&minicatchall);
}
\f
-static const struct command commands[] = {
+static const struct ovs_cmdl_command commands[] = {
/* Classifier tests. */
- {"empty", 0, 0, test_empty},
- {"destroy-null", 0, 0, test_destroy_null},
- {"single-rule", 0, 0, test_single_rule},
- {"rule-replacement", 0, 0, test_rule_replacement},
- {"many-rules-in-one-list", 0, 0, test_many_rules_in_one_list},
- {"many-rules-in-one-table", 0, 0, test_many_rules_in_one_table},
- {"many-rules-in-two-tables", 0, 0, test_many_rules_in_two_tables},
- {"many-rules-in-five-tables", 0, 0, test_many_rules_in_five_tables},
+ {"empty", NULL, 0, 0, test_empty},
+ {"destroy-null", NULL, 0, 0, test_destroy_null},
+ {"single-rule", NULL, 0, 0, test_single_rule},
+ {"rule-replacement", NULL, 0, 0, test_rule_replacement},
+ {"many-rules-in-one-list", NULL, 0, 0, test_many_rules_in_one_list},
+ {"many-rules-in-one-table", NULL, 0, 0, test_many_rules_in_one_table},
+ {"many-rules-in-two-tables", NULL, 0, 0, test_many_rules_in_two_tables},
+ {"many-rules-in-five-tables", NULL, 0, 0, test_many_rules_in_five_tables},
/* 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},
+ {"miniflow", NULL, 0, 0, test_miniflow},
+ {"minimask_has_extra", NULL, 0, 0, test_minimask_has_extra},
+ {"minimask_combine", NULL, 0, 0, test_minimask_combine},
- {NULL, 0, 0, NULL},
+ {NULL, NULL, 0, 0, NULL},
};
-int
-main(int argc, char *argv[])
+static void
+test_classifier_main(int argc, char *argv[])
{
+ struct ovs_cmdl_context ctx = {
+ .argc = argc - 1,
+ .argv = argv + 1,
+ };
set_program_name(argv[0]);
init_values();
- run_command(argc - 1, argv + 1, commands);
- return 0;
+ ovs_cmdl_run_command(&ctx, commands);
}
+
+OVSTEST_REGISTER("test-classifier", test_classifier_main);
projects / cascardo / ovs.git / blobdiff