#include <config.h>
#include "classifier.h"
-#include <assert.h>
#include <errno.h>
#include <netinet/in.h>
#include "byte-order.h"
#include "packets.h"
static struct cls_table *find_table(const struct classifier *,
- const struct flow_wildcards *);
+ const struct minimask *);
static struct cls_table *insert_table(struct classifier *,
- const struct flow_wildcards *);
+ const struct minimask *);
static void destroy_table(struct classifier *, struct cls_table *);
static struct cls_rule *find_match(const struct cls_table *,
const struct flow *);
-static struct cls_rule *find_equal(struct cls_table *, const struct flow *,
- uint32_t hash);
+static struct cls_rule *find_equal(struct cls_table *,
+ const struct miniflow *, uint32_t hash);
static struct cls_rule *insert_rule(struct cls_table *, struct cls_rule *);
/* Iterates RULE over HEAD and all of the cls_rules on HEAD->list. */
/* cls_rule. */
/* Initializes 'rule' to match packets specified by 'match' at the given
- * 'priority'.
+ * 'priority'. 'match' must satisfy the invariant described in the comment at
+ * the definition of struct match.
*
* The caller must eventually destroy 'rule' with cls_rule_destroy().
*
- * 'match' must satisfy the invariant described in the comment at the
- * definition of struct match.
- *
* (OpenFlow uses priorities between 0 and UINT16_MAX, inclusive, but
* internally Open vSwitch supports a wider range.) */
void
cls_rule_init(struct cls_rule *rule,
const struct match *match, unsigned int priority)
{
- rule->match = *match;
+ minimatch_init(&rule->match, match);
+ rule->priority = priority;
+}
+
+/* Same as cls_rule_init() for initialization from a "struct minimatch". */
+void
+cls_rule_init_from_minimatch(struct cls_rule *rule,
+ const struct minimatch *match,
+ unsigned int priority)
+{
+ minimatch_clone(&rule->match, match);
rule->priority = priority;
}
void
cls_rule_clone(struct cls_rule *dst, const struct cls_rule *src)
{
- *dst = *src;
+ minimatch_clone(&dst->match, &src->match);
+ dst->priority = src->priority;
}
/* Frees memory referenced by 'rule'. Doesn't free 'rule' itself (it's
*
* ('rule' must not currently be in a classifier.) */
void
-cls_rule_destroy(struct cls_rule *rule OVS_UNUSED)
+cls_rule_destroy(struct cls_rule *rule)
{
- /* Nothing to do yet. */
+ minimatch_destroy(&rule->match);
}
/* Returns true if 'a' and 'b' match the same packets at the same priority,
bool
cls_rule_equal(const struct cls_rule *a, const struct cls_rule *b)
{
- return a->priority == b->priority && match_equal(&a->match, &b->match);
+ return a->priority == b->priority && minimatch_equal(&a->match, &b->match);
}
/* Returns a hash value for 'rule', folding in 'basis'. */
uint32_t
cls_rule_hash(const struct cls_rule *rule, uint32_t basis)
{
- return match_hash(&rule->match, hash_int(rule->priority, basis));
+ return minimatch_hash(&rule->match, hash_int(rule->priority, basis));
}
/* Appends a string describing 'rule' to 's'. */
void
cls_rule_format(const struct cls_rule *rule, struct ds *s)
{
- match_format(&rule->match, s, rule->priority);
+ minimatch_format(&rule->match, s, rule->priority);
+}
+
+/* Returns true if 'rule' matches every packet, false otherwise. */
+bool
+cls_rule_is_catchall(const struct cls_rule *rule)
+{
+ return minimask_is_catchall(&rule->match.mask);
}
\f
/* Initializes 'cls' as a classifier that initially contains no classification
struct cls_table *table, *next_table;
HMAP_FOR_EACH_SAFE (table, next_table, hmap_node, &cls->tables) {
- hmap_destroy(&table->rules);
- hmap_remove(&cls->tables, &table->hmap_node);
- free(table);
+ destroy_table(cls, table);
}
hmap_destroy(&cls->tables);
}
struct cls_rule *old_rule;
struct cls_table *table;
- table = find_table(cls, &rule->match.wc);
+ table = find_table(cls, &rule->match.mask);
if (!table) {
- table = insert_table(cls, &rule->match.wc);
+ table = insert_table(cls, &rule->match.mask);
}
old_rule = insert_rule(table, rule);
classifier_insert(struct classifier *cls, struct cls_rule *rule)
{
struct cls_rule *displaced_rule = classifier_replace(cls, rule);
- assert(!displaced_rule);
+ ovs_assert(!displaced_rule);
}
/* Removes 'rule' from 'cls'. It is the caller's responsibility to destroy
struct cls_rule *head;
struct cls_table *table;
- table = find_table(cls, &rule->match.wc);
+ table = find_table(cls, &rule->match.mask);
head = find_equal(table, &rule->match.flow, rule->hmap_node.hash);
if (head != rule) {
list_remove(&rule->list);
struct cls_rule *head, *rule;
struct cls_table *table;
- table = find_table(cls, &target->match.wc);
+ table = find_table(cls, &target->match.mask);
if (!table) {
return NULL;
}
head = find_equal(table, &target->match.flow,
- flow_hash(&target->match.flow, 0));
+ miniflow_hash_in_minimask(&target->match.flow,
+ &target->match.mask, 0));
FOR_EACH_RULE_IN_LIST (rule, head) {
if (target->priority >= rule->priority) {
return target->priority == rule->priority ? rule : NULL;
struct cls_table *table;
HMAP_FOR_EACH (table, hmap_node, &cls->tables) {
- struct flow_wildcards wc;
+ uint32_t storage[FLOW_U32S];
+ struct minimask mask;
struct cls_rule *head;
- flow_wildcards_combine(&wc, &target->match.wc, &table->wc);
+ minimask_combine(&mask, &target->match.mask, &table->mask, storage);
HMAP_FOR_EACH (head, hmap_node, &table->rules) {
struct cls_rule *rule;
FOR_EACH_RULE_IN_LIST (rule, head) {
if (rule->priority == target->priority
- && flow_equal_except(&target->match.flow,
- &rule->match.flow, &wc)) {
+ && miniflow_equal_in_minimask(&target->match.flow,
+ &rule->match.flow, &mask)) {
return true;
}
}
* Ignores rule->priority. */
bool
cls_rule_is_loose_match(const struct cls_rule *rule,
- const struct match *criteria)
+ const struct minimatch *criteria)
{
- return (!flow_wildcards_has_extra(&rule->match.wc, &criteria->wc)
- && flow_equal_except(&rule->match.flow, &criteria->flow,
- &criteria->wc));
+ return (!minimask_has_extra(&rule->match.mask, &criteria->mask)
+ && miniflow_equal_in_minimask(&rule->match.flow, &criteria->flow,
+ &criteria->mask));
}
\f
/* Iteration. */
rule_matches(const struct cls_rule *rule, const struct cls_rule *target)
{
return (!target
- || flow_equal_except(&rule->match.flow, &target->match.flow,
- &target->match.wc));
+ || miniflow_equal_in_minimask(&rule->match.flow,
+ &target->match.flow,
+ &target->match.mask));
}
static struct cls_rule *
search_table(const struct cls_table *table, const struct cls_rule *target)
{
- if (!target || !flow_wildcards_has_extra(&table->wc, &target->match.wc)) {
+ if (!target || !minimask_has_extra(&table->mask, &target->match.mask)) {
struct cls_rule *rule;
HMAP_FOR_EACH (rule, hmap_node, &table->rules) {
const struct cls_rule *target)
{
cursor->cls = cls;
- cursor->target = target;
+ cursor->target = target && !cls_rule_is_catchall(target) ? target : NULL;
}
/* Returns the first matching cls_rule in 'cursor''s iteration, or a null
}
\f
static struct cls_table *
-find_table(const struct classifier *cls, const struct flow_wildcards *wc)
+find_table(const struct classifier *cls, const struct minimask *mask)
{
struct cls_table *table;
- HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, flow_wildcards_hash(wc, 0),
+ HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, minimask_hash(mask, 0),
&cls->tables) {
- if (flow_wildcards_equal(wc, &table->wc)) {
+ if (minimask_equal(mask, &table->mask)) {
return table;
}
}
}
static struct cls_table *
-insert_table(struct classifier *cls, const struct flow_wildcards *wc)
+insert_table(struct classifier *cls, const struct minimask *mask)
{
struct cls_table *table;
table = xzalloc(sizeof *table);
hmap_init(&table->rules);
- table->wc = *wc;
- table->is_catchall = flow_wildcards_is_catchall(&table->wc);
- hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc, 0));
+ minimask_clone(&table->mask, mask);
+ hmap_insert(&cls->tables, &table->hmap_node, minimask_hash(mask, 0));
return table;
}
static void
destroy_table(struct classifier *cls, struct cls_table *table)
{
+ minimask_destroy(&table->mask);
hmap_remove(&cls->tables, &table->hmap_node);
hmap_destroy(&table->rules);
free(table);
static struct cls_rule *
find_match(const struct cls_table *table, const struct flow *flow)
{
+ uint32_t hash = flow_hash_in_minimask(flow, &table->mask, 0);
struct cls_rule *rule;
- if (table->is_catchall) {
- HMAP_FOR_EACH (rule, hmap_node, &table->rules) {
+ HMAP_FOR_EACH_WITH_HASH (rule, hmap_node, hash, &table->rules) {
+ if (miniflow_equal_flow_in_minimask(&rule->match.flow, flow,
+ &table->mask)) {
return rule;
}
- } else {
- struct flow f;
-
- f = *flow;
- flow_zero_wildcards(&f, &table->wc);
- HMAP_FOR_EACH_WITH_HASH (rule, hmap_node, flow_hash(&f, 0),
- &table->rules) {
- if (flow_equal(&f, &rule->match.flow)) {
- return rule;
- }
- }
}
return NULL;
}
static struct cls_rule *
-find_equal(struct cls_table *table, const struct flow *flow, uint32_t hash)
+find_equal(struct cls_table *table, const struct miniflow *flow, uint32_t hash)
{
struct cls_rule *head;
HMAP_FOR_EACH_WITH_HASH (head, hmap_node, hash, &table->rules) {
- if (flow_equal(&head->match.flow, flow)) {
+ if (miniflow_equal(&head->match.flow, flow)) {
return head;
}
}
{
struct cls_rule *head;
- new->hmap_node.hash = flow_hash(&new->match.flow, 0);
+ new->hmap_node.hash = miniflow_hash_in_minimask(&new->match.flow,
+ &new->match.mask, 0);
head = find_equal(table, &new->match.flow, new->hmap_node.hash);
if (!head) {
git://git.onelab.eu / sliver-openvswitch.git / blobdiff