X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fclassifier.h;h=d318864e1d9c7c200888ea01a1e9dd96b20a54a8;hb=67680b012be30d9c26eab999b83b08c6eb32dbd2;hp=581ee832ea092c32e67dac3dd3e14814a6404056;hpb=530180fd5a99e2c55107831f99fee84d6780f38c;p=sliver-openvswitch.git diff --git a/lib/classifier.h b/lib/classifier.h index 581ee832e..d318864e1 100644 --- a/lib/classifier.h +++ b/lib/classifier.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 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,6 +29,7 @@ #include "flow.h" #include "hmap.h" #include "list.h" +#include "match.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" @@ -40,14 +41,18 @@ extern "C" { 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 '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. */ + unsigned int max_priority; /* Max priority of any rule in the table. */ + unsigned int max_count; /* Count of max_priority rules. */ }; /* Returns true if 'table' is a "catch-all" table that will match every @@ -55,90 +60,33 @@ struct cls_table { static inline bool cls_table_is_catchall(const struct cls_table *table) { - /* A catch-all table can only have one rule, so use hmap_count() as a cheap - * check to rule out other kinds of match before doing the full check with - * flow_wildcards_is_catchall(). */ - return (hmap_count(&table->rules) == 1 - && flow_wildcards_is_catchall(&table->wc)); + return minimask_is_catchall(&table->mask); } -/* 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.) - */ +/* 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. */ }; -void cls_rule_init(const struct flow *, const struct flow_wildcards *, - unsigned int priority, struct cls_rule *); -void cls_rule_init_exact(const struct flow *, unsigned int priority, - struct cls_rule *); -void cls_rule_init_catchall(struct cls_rule *, unsigned int priority); - -void cls_rule_zero_wildcarded_fields(struct cls_rule *); - -void cls_rule_set_reg(struct cls_rule *, unsigned int reg_idx, uint32_t value); -void cls_rule_set_reg_masked(struct cls_rule *, unsigned int reg_idx, - uint32_t value, uint32_t mask); -void cls_rule_set_tun_id(struct cls_rule *, ovs_be64 tun_id); -void cls_rule_set_tun_id_masked(struct cls_rule *, - ovs_be64 tun_id, ovs_be64 mask); -void cls_rule_set_in_port(struct cls_rule *, uint16_t odp_port); -void cls_rule_set_dl_type(struct cls_rule *, ovs_be16); -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_dl_dst_masked(struct cls_rule *, const uint8_t dl_dst[6], - const uint8_t mask[6]); -void cls_rule_set_dl_tci(struct cls_rule *, ovs_be16 tci); -void cls_rule_set_dl_tci_masked(struct cls_rule *, - ovs_be16 tci, ovs_be16 mask); -void cls_rule_set_any_vid(struct cls_rule *); -void cls_rule_set_dl_vlan(struct cls_rule *, ovs_be16); -void cls_rule_set_any_pcp(struct cls_rule *); -void cls_rule_set_dl_vlan_pcp(struct cls_rule *, uint8_t); -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); -bool cls_rule_set_nw_src_masked(struct cls_rule *, ovs_be32 ip, ovs_be32 mask); -void cls_rule_set_nw_dst(struct cls_rule *, ovs_be32); -bool cls_rule_set_nw_dst_masked(struct cls_rule *, ovs_be32 ip, ovs_be32 mask); -void cls_rule_set_nw_dscp(struct cls_rule *, uint8_t); -void cls_rule_set_nw_ecn(struct cls_rule *, uint8_t); -void cls_rule_set_frag(struct cls_rule *, uint8_t frag); -void cls_rule_set_frag_masked(struct cls_rule *, uint8_t frag, uint8_t mask); -void cls_rule_set_icmp_type(struct cls_rule *, uint8_t); -void cls_rule_set_icmp_code(struct cls_rule *, uint8_t); -void cls_rule_set_arp_sha(struct cls_rule *, const uint8_t[6]); -void cls_rule_set_arp_tha(struct cls_rule *, const uint8_t[6]); -void cls_rule_set_ipv6_src(struct cls_rule *, const struct in6_addr *); -bool cls_rule_set_ipv6_src_masked(struct cls_rule *, const struct in6_addr *, - const struct in6_addr *); -void cls_rule_set_ipv6_dst(struct cls_rule *, const struct in6_addr *); -bool cls_rule_set_ipv6_dst_masked(struct cls_rule *, const struct in6_addr *, - const struct in6_addr *); -void cls_rule_set_ipv6_label(struct cls_rule *, ovs_be32); -void cls_rule_set_nd_target(struct cls_rule *, const struct in6_addr *); +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 *); 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_format(const struct cls_rule *, struct ds *); -char *cls_rule_to_string(const struct cls_rule *); -void cls_rule_print(const struct cls_rule *); + +bool cls_rule_is_catchall(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 *); @@ -156,6 +104,9 @@ typedef void cls_cb_func(struct cls_rule *, 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. */