mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-02 15:25:22 +00:00
Code Issues Releases Wiki Activity

Revert "lib/classifier: Minimize critical section."

Browse Source 
This reverts commit d2064437e2, which
fails clang thread satefy analysis.

A more complete patch will be introduced later.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
This commit is contained in:
Jarno Rajahalme
2014-10-15 10:56:32 -07:00
parent d2064437e2
commit 0722ee5c59
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lib/classifier.c
View File

@@ -114,7 +114,8 @@ cls_match_alloc(struct cls_rule *rule)
} }
static struct cls_subtable *find_subtable(const struct classifier *cls, static struct cls_subtable *find_subtable(const struct classifier *cls,
const struct minimask *); const struct minimask *)
OVS_REQUIRES(cls->mutex);
static struct cls_subtable *insert_subtable(struct classifier *cls, static struct cls_subtable *insert_subtable(struct classifier *cls,
const struct minimask *) const struct minimask *)
OVS_REQUIRES(cls->mutex); OVS_REQUIRES(cls->mutex);
@@ -1089,26 +1090,28 @@ classifier_find_rule_exactly(const struct classifier *cls,
struct cls_match *head, *rule; struct cls_match *head, *rule;
struct cls_subtable *subtable; struct cls_subtable *subtable;
ovs_mutex_lock(&cls->mutex);
subtable = find_subtable(cls, &target->match.mask); subtable = find_subtable(cls, &target->match.mask);
if (!subtable || target->priority > subtable->max_priority) { if (!subtable) {
return NULL; goto out;
}
/* Skip if there is no hope. */
if (target->priority > subtable->max_priority) {
goto out;
} }
head = find_equal(subtable, &target->match.flow, head = find_equal(subtable, &target->match.flow,
miniflow_hash_in_minimask(&target->match.flow, miniflow_hash_in_minimask(&target->match.flow,
&target->match.mask, 0)); &target->match.mask, 0));
/* Use RCU list instead of locking when one is available. */
ovs_mutex_lock(&cls->mutex);
FOR_EACH_RULE_IN_LIST (rule, head) { FOR_EACH_RULE_IN_LIST (rule, head) {
if (target->priority >= rule->priority) { if (target->priority >= rule->priority) {
ovs_mutex_unlock(&cls->mutex); ovs_mutex_unlock(&cls->mutex);
return target->priority == rule->priority ? rule->cls_rule : NULL; return target->priority == rule->priority ? rule->cls_rule : NULL;
} }
} }
out:
ovs_mutex_unlock(&cls->mutex); ovs_mutex_unlock(&cls->mutex);
return NULL; return NULL;
} }
@@ -1336,6 +1339,7 @@ cls_cursor_advance(struct cls_cursor *cursor)
static struct cls_subtable * static struct cls_subtable *
find_subtable(const struct classifier *cls, const struct minimask *mask) find_subtable(const struct classifier *cls, const struct minimask *mask)
OVS_REQUIRES(cls->mutex)
{ {
struct cls_subtable *subtable; struct cls_subtable *subtable;