/*
- * Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 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.
assert(classifier_count(cls) == tcls->n_rules);
for (i = 0; i < confidence; i++) {
- struct cls_rule *cr0, *cr1, *cr2;
+ const struct cls_rule *cr0, *cr1, *cr2;
struct flow flow;
struct flow_wildcards wc;
unsigned int x;
{
struct test_rule *rule;
- CLS_FOR_EACH_SAFE (rule, cls_rule, cls) {
+ classifier_defer(cls);
+ CLS_FOR_EACH (rule, cls_rule, cls) {
if (classifier_remove(cls, &rule->cls_rule)) {
ovsrcu_postpone(free_rule, rule);
}
static void
verify_tries(struct classifier *cls)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
unsigned int n_rules = 0;
int i;
n_rules += trie_verify(&cls->tries[i].root, 0,
cls->tries[i].field->n_bits);
}
- ovs_mutex_lock(&cls->mutex);
assert(n_rules <= cls->n_rules);
- ovs_mutex_unlock(&cls->mutex);
}
static void
check_tables(const struct classifier *cls, int n_tables, int n_rules,
int n_dups)
+ OVS_NO_THREAD_SAFETY_ANALYSIS
{
const struct cls_subtable *table;
struct test_rule *test_rule;
}
assert(!cmap_is_empty(&table->rules));
-
- ovs_mutex_lock(&cls->mutex);
assert(trie_verify(&table->ports_trie, 0, table->ports_mask_len)
- == (table->ports_mask_len ? table->n_rules : 0));
- ovs_mutex_unlock(&cls->mutex);
+ == (table->ports_mask_len ? cmap_count(&table->rules) : 0));
found_tables++;
CMAP_FOR_EACH (head, cmap_node, &table->rules) {
}
found_rules++;
- ovs_mutex_lock(&cls->mutex);
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++;
- ovs_mutex_unlock(&cls->mutex);
assert(classifier_find_rule_exactly(cls, rule->cls_rule)
== rule->cls_rule);
- ovs_mutex_lock(&cls->mutex);
}
- ovs_mutex_unlock(&cls->mutex);
}
- ovs_mutex_lock(&cls->mutex);
assert(table->max_priority == max_priority);
assert(table->max_count == max_count);
- ovs_mutex_unlock(&cls->mutex);
}
assert(found_tables == cmap_count(&cls->subtables_map));
/* 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, flow_segment_u32s);
+ classifier_init(&cls, flow_segment_u64s);
set_prefix_fields(&cls);
tcls_init(&tcls);
assert(classifier_is_empty(&cls));
/* 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, flow_segment_u32s);
+ 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);
+ classifier_insert(&cls, &rule->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, 1, 1, 0);
/* 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, flow_segment_u32s);
+ classifier_init(&cls, flow_segment_u64s);
set_prefix_fields(&cls);
tcls_init(&tcls);
tcls_insert(&tcls, rule1);
- classifier_insert(&cls, &rule1->cls_rule);
+ classifier_insert(&cls, &rule1->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, 1, 1, 0);
tcls_destroy(&tcls);
tcls_insert(&tcls, rule2);
assert(test_rule_from_cls_rule(
- classifier_replace(&cls, &rule2->cls_rule)) == rule1);
+ 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);
/* 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, flow_segment_u32s);
+ classifier_init(&cls, flow_segment_u64s);
set_prefix_fields(&cls);
tcls_init(&tcls);
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);
check_tables(&cls, n > 0, n, n - 1);
}
+ classifier_defer(&cls);
for (i = 0; i < N_RULES; i++) {
if (classifier_remove(&cls, &rules[i]->cls_rule)) {
ovsrcu_postpone(free_rule, rules[i]);
/* 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, flow_segment_u32s);
+ classifier_init(&cls, flow_segment_u64s);
set_prefix_fields(&cls);
tcls_init(&tcls);
rules[i] = make_rule(wcf, priority, value_pats[i]);
tcls_rules[i] = tcls_insert(&tcls, rules[i]);
- classifier_insert(&cls, &rules[i]->cls_rule);
+ classifier_insert(&cls, &rules[i]->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, 1, i + 1, 0);
}
shuffle(priorities, ARRAY_SIZE(priorities));
- classifier_init(&cls, flow_segment_u32s);
+ classifier_init(&cls, flow_segment_u64s);
set_prefix_fields(&cls);
tcls_init(&tcls);
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);
+ classifier_insert(&cls, &rule->cls_rule, NULL, 0);
compare_classifiers(&cls, &tcls);
check_tables(&cls, -1, i + 1, -1);
}
target = clone_rule(tcls.rules[random_range(tcls.n_rules)]);
- CLS_FOR_EACH_TARGET_SAFE (rule, cls_rule, &cls,
- &target->cls_rule) {
+ CLS_FOR_EACH_TARGET (rule, cls_rule, &cls, &target->cls_rule) {
if (classifier_remove(&cls, &rule->cls_rule)) {
ovsrcu_postpone(free_rule, rule);
}
}
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)
}
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_TYPE(&miniflow, uint32_t, i * 4)
- == 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", NULL, 0, 0, test_empty},
{"destroy-null", NULL, 0, 0, test_destroy_null},
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);
+ ovs_cmdl_run_command(&ctx, commands);
}
OVSTEST_REGISTER("test-classifier", test_classifier_main);
projects / cascardo / ovs.git / blobdiff