#include <config.h>
#undef NDEBUG
+#include "classifier.h"
#include <assert.h>
#include <errno.h>
#include <limits.h>
#include "byte-order.h"
-#include "classifier.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"
#include "util.h"
-#include "ovstest.h"
/* Fields in a rule. */
#define CLS_FIELDS \
}
}
-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) {
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_remove(cls, &rule->cls_rule);
- free_rule(rule);
+ classifier_defer(cls);
+ CLS_FOR_EACH (rule, cls_rule, cls) {
+ if (classifier_remove(cls, &rule->cls_rule)) {
+ ovsrcu_postpone(free_rule, rule);
+ }
}
classifier_destroy(cls);
}
pvector_verify(const struct pvector *pvec)
{
void *ptr OVS_UNUSED;
- unsigned int priority, prev_priority = UINT_MAX;
+ int prev_priority = INT_MAX;
PVECTOR_FOR_EACH (ptr, pvec) {
- priority = cursor__.vector[cursor__.entry_idx].priority;
+ 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);
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;
pvector_verify(&cls->subtables);
CMAP_FOR_EACH (table, cmap_node, &cls->subtables_map) {
const struct cls_match *head;
- unsigned int max_priority = 0;
+ int max_priority = INT_MIN;
unsigned int max_count = 0;
bool found = false;
const struct cls_subtable *iter;
}
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) {
- unsigned int prev_priority = UINT_MAX;
+ int prev_priority = INT_MAX;
const struct cls_match *rule;
if (head->priority > max_priority) {
}
found_rules++;
- ovs_mutex_lock(&cls->mutex);
- 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++;
- 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));
}
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;
}
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;
}
assert(tcls_is_empty(&tcls));
compare_classifiers(&cls, &tcls);
- free_rule(rule);
+ ovsrcu_postpone(free_rule, rule);
classifier_destroy(&cls);
tcls_destroy(&tcls);
}
assert(test_rule_from_cls_rule(
classifier_replace(&cls, &rule2->cls_rule)) == rule1);
- free_rule(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);
destroy_classifier(&cls);
check_tables(&cls, n > 0, n, n - 1);
}
+ classifier_defer(&cls);
for (i = 0; i < N_RULES; i++) {
- if (rules[i]->cls_rule.cls_match) {
- classifier_remove(&cls, &rules[i]->cls_rule);
+ if (classifier_remove(&cls, &rules[i]->cls_rule)) {
+ ovsrcu_postpone(free_rule, rules[i]);
}
- free_rule(rules[i]);
}
classifier_destroy(&cls);
tcls_destroy(&tcls);
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;
tcls_remove(&tcls, tcls_rules[i]);
classifier_remove(&cls, &rules[i]->cls_rule);
compare_classifiers(&cls, &tcls);
- free_rule(rules[i]);
+ ovsrcu_postpone(free_rule, rules[i]);
check_tables(&cls, i < N_RULES - 1, N_RULES - (i + 1), 0);
}
}
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));
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);
target = clone_rule(tcls.rules[random_range(tcls.n_rules)]);
- CLS_FOR_EACH_TARGET_SAFE (rule, cls_rule, &cls,
- &target->cls_rule) {
- 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);
projects / cascardo / ovs.git / blobdiff