X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fclassifier.h;h=fdc3af7af02c1f024ddfff53e71bade7a9a580a4;hb=f80022d9df98d29ee41176a4bc6cb91025da84b8;hp=9c6c23962e85b5b2b269da11e68e5c1649f27d04;hpb=64420dfac5b1e350867da0949af5f193d9b6ca8c;p=sliver-openvswitch.git diff --git a/lib/classifier.h b/lib/classifier.h index 9c6c23962..fdc3af7af 100644 --- a/lib/classifier.h +++ b/lib/classifier.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -29,110 +29,115 @@ #include "flow.h" #include "hmap.h" #include "list.h" +#include "match.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" +#ifdef __cplusplus +extern "C" { +#endif + /* A flow classifier. */ struct classifier { int n_rules; /* Total number of rules. */ struct hmap tables; /* Contains "struct cls_table"s. */ + struct list tables_priority; /* Tables in descending priority order */ }; /* A set of rules that all have the same fields wildcarded. */ struct cls_table { - struct hmap_node hmap_node; /* Within struct classifier 'wctables'. */ + struct hmap_node hmap_node; /* Within struct classifier 'tables' hmap. */ + struct list list_node; /* Within classifier 'tables_priority_list' */ struct hmap rules; /* Contains "struct cls_rule"s. */ - struct flow_wildcards wc; /* Wildcards for fields. */ + struct minimask mask; /* Wildcards for fields. */ int n_table_rules; /* Number of rules, including duplicates. */ - int n_refs; /* Reference count used during iteration. */ + unsigned int max_priority; /* Max priority of any rule in the table. */ + unsigned int max_count; /* Count of max_priority rules. */ }; -/* A flow classification rule. - * - * Use one of the cls_rule_*() functions to initialize a cls_rule. - * - * The cls_rule_*() functions below maintain the following important - * invariant that the classifier depends on: - * - * - If a bit or a field is wildcarded in 'wc', then the corresponding bit or - * field in 'flow' is set to all-0-bits. (The - * cls_rule_zero_wildcarded_fields() function can be used to restore this - * invariant after adding wildcards.) - */ +/* Returns true if 'table' is a "catch-all" table that will match every + * packet (if there is no higher-priority match). */ +static inline bool +cls_table_is_catchall(const struct cls_table *table) +{ + return minimask_is_catchall(&table->mask); +} + +/* A rule in a "struct classifier". */ struct cls_rule { struct hmap_node hmap_node; /* Within struct cls_table 'rules'. */ struct list list; /* List of identical, lower-priority rules. */ - struct flow flow; /* All field values. */ - struct flow_wildcards wc; /* Wildcards for fields. */ + struct minimatch match; /* Matching rule. */ unsigned int priority; /* Larger numbers are higher priorities. */ }; -enum { - CLS_INC_EXACT = 1 << 0, /* Include exact-match flows? */ - CLS_INC_WILD = 1 << 1, /* Include flows with wildcards? */ - CLS_INC_ALL = CLS_INC_EXACT | CLS_INC_WILD -}; +void cls_rule_init(struct cls_rule *, const struct match *, + unsigned int priority); +void cls_rule_init_from_minimatch(struct cls_rule *, const struct minimatch *, + unsigned int priority); +void cls_rule_clone(struct cls_rule *, const struct cls_rule *); +void cls_rule_destroy(struct cls_rule *); -void cls_rule_from_flow(const struct flow *, uint32_t wildcards, - unsigned int priority, struct cls_rule *); -void cls_rule_from_match(const struct ofp_match *, unsigned int priority, - int flow_format, uint64_t cookie, struct cls_rule *); -void cls_rule_init_catchall(struct cls_rule *, unsigned int priority); +bool cls_rule_equal(const struct cls_rule *, const struct cls_rule *); +uint32_t cls_rule_hash(const struct cls_rule *, uint32_t basis); -void cls_rule_zero_wildcarded_fields(struct cls_rule *); +void cls_rule_format(const struct cls_rule *, struct ds *); -void cls_rule_set_in_port(struct cls_rule *, uint16_t odp_port); -void cls_rule_set_dl_type(struct cls_rule *, ovs_be16 dl_type); -void cls_rule_set_dl_src(struct cls_rule *, const uint8_t[6]); -void cls_rule_set_dl_dst(struct cls_rule *, const uint8_t[6]); -void cls_rule_set_tp_src(struct cls_rule *, ovs_be16); -void cls_rule_set_tp_dst(struct cls_rule *, ovs_be16); -void cls_rule_set_nw_proto(struct cls_rule *, uint8_t); -void cls_rule_set_nw_src(struct cls_rule *, ovs_be32); -void cls_rule_set_nw_dst(struct cls_rule *, ovs_be32); +bool cls_rule_is_catchall(const struct cls_rule *); -char *cls_rule_to_string(const struct cls_rule *); -void cls_rule_print(const struct cls_rule *); +bool cls_rule_is_loose_match(const struct cls_rule *rule, + const struct minimatch *criteria); void classifier_init(struct classifier *); void classifier_destroy(struct classifier *); bool classifier_is_empty(const struct classifier *); int classifier_count(const struct classifier *); -int classifier_count_exact(const struct classifier *); -struct cls_rule *classifier_insert(struct classifier *, struct cls_rule *); -void classifier_insert_exact(struct classifier *, struct cls_rule *); +void classifier_insert(struct classifier *, struct cls_rule *); +struct cls_rule *classifier_replace(struct classifier *, struct cls_rule *); void classifier_remove(struct classifier *, struct cls_rule *); struct cls_rule *classifier_lookup(const struct classifier *, - const struct flow *, int include); + const struct flow *, + struct flow_wildcards *); bool classifier_rule_overlaps(const struct classifier *, const struct cls_rule *); typedef void cls_cb_func(struct cls_rule *, void *aux); -void classifier_for_each(const struct classifier *, int include, - cls_cb_func *, void *aux); -void classifier_for_each_match(const struct classifier *, - const struct cls_rule *, - int include, cls_cb_func *, void *aux); struct cls_rule *classifier_find_rule_exactly(const struct classifier *, const struct cls_rule *); +struct cls_rule *classifier_find_match_exactly(const struct classifier *, + const struct match *, + unsigned int priority); + +/* Iteration. */ + +struct cls_cursor { + const struct classifier *cls; + const struct cls_table *table; + const struct cls_rule *target; +}; -/* Iteration shorthands. */ - -struct cls_table *classifier_exact_table(const struct classifier *); -struct cls_rule *cls_table_first_rule(const struct cls_table *); -struct cls_rule *cls_table_next_rule(const struct cls_table *, - const struct cls_rule *); +void cls_cursor_init(struct cls_cursor *, const struct classifier *, + const struct cls_rule *match); +struct cls_rule *cls_cursor_first(struct cls_cursor *); +struct cls_rule *cls_cursor_next(struct cls_cursor *, struct cls_rule *); -#define CLS_TABLE_FOR_EACH_RULE(RULE, MEMBER, TABLE) \ - for ((RULE) = OBJECT_CONTAINING(cls_table_first_rule(TABLE), \ - RULE, MEMBER); \ +#define CLS_CURSOR_FOR_EACH(RULE, MEMBER, CURSOR) \ + for (ASSIGN_CONTAINER(RULE, cls_cursor_first(CURSOR), MEMBER); \ &(RULE)->MEMBER != NULL; \ - (RULE) = OBJECT_CONTAINING(cls_table_next_rule(TABLE, \ - &(RULE)->MEMBER), \ - RULE, MEMBER)) - -#define CLASSIFIER_FOR_EACH_EXACT_RULE(RULE, MEMBER, CLS) \ - CLS_TABLE_FOR_EACH_RULE (RULE, MEMBER, classifier_exact_table(CLS)) + ASSIGN_CONTAINER(RULE, cls_cursor_next(CURSOR, &(RULE)->MEMBER), \ + MEMBER)) + +#define CLS_CURSOR_FOR_EACH_SAFE(RULE, NEXT, MEMBER, CURSOR) \ + for (ASSIGN_CONTAINER(RULE, cls_cursor_first(CURSOR), MEMBER); \ + (&(RULE)->MEMBER != NULL \ + ? ASSIGN_CONTAINER(NEXT, cls_cursor_next(CURSOR, &(RULE)->MEMBER), \ + MEMBER) \ + : 0); \ + (RULE) = (NEXT)) + +#ifdef __cplusplus +} +#endif #endif /* classifier.h */