mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

lib/classifier: Use internal mutex.

Browse Source 
Add an internal mutex to struct cls_classifier, and reorganize
classifier internal structures according to the user of each field,
marking the fields that need to be protected by the mutex.  This makes
locking requirements easier to track, and may make lookup more memory
efficient.

After this patch there is some double locking, as callers are taking
the fat-rwlock, and we take the mutex internally.  A following patch
will remove the classifier fat-rwlock, removing the (double) locking
overhead.

Signed-off-by: Jarno Rajahalme <jrajahalme@nicira.com>
Acked-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
This commit is contained in:
Jarno Rajahalme
2014-07-11 02:29:08 -07:00
parent c30cfa6b8b
commit e65413ab8d
3 changed files with 118 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/classifier.h
View File

@@ -295,17 +295,16 @@ bool classifier_rule_overlaps(const struct classifier *cls,
OVS_REQ_RDLOCK(cls->rwlock);
struct cls_rule *classifier_find_rule_exactly(const struct classifier *cls,
const struct cls_rule *)
OVS_REQ_RDLOCK(cls->rwlock);
const struct cls_rule *);
struct cls_rule *classifier_find_match_exactly(const struct classifier *cls,
const struct match *,
unsigned int priority)
OVS_REQ_RDLOCK(cls->rwlock);
unsigned int priority);
/* Iteration. */
struct cls_cursor {
const struct classifier *cls;
const struct cls_classifier *cls;
const struct cls_subtable *subtable;
const struct cls_rule *target;
struct cmap_cursor subtables;
@@ -313,9 +312,10 @@ struct cls_cursor {
bool safe;
};
/* Iteration requires mutual exclusion of the writers. We do this by taking
* the classifier read lock for the duration of the iteration, except for the
* 'SAFE' variant, where we release the lock for the body of the loop. */
/* Iteration requires mutual exclusion of writers. We do this by taking
* a mutex for the duration of the iteration, except for the
* 'SAFE' variant, where we release the mutex for the body of the loop. */
struct cls_cursor cls_cursor_init(const struct classifier *cls,
const struct cls_rule *target,
void **pnode, const void *offset, bool safe);