X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.h;h=c555efe825ae3d8e75ecd2d5ce9cae4a26d43f83;hb=65d042a1b4e3169c44bbb0fca5f0746e04ae6a4e;hp=8b095e911872b8f0c13ff5d2ba2e25e42040e8d2;hpb=a14bc59fb8f27db193d74662dc9c5cb8237177ef;p=openvswitch diff --git a/lib/classifier.h b/lib/classifier.h index 8b095e91..c555efe8 100644 --- a/lib/classifier.h +++ b/lib/classifier.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 2009, 2010 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,15 +25,30 @@ * fields after F tend to be wildcarded as well. If this assumption is * violated, then the classifier will still classify flows correctly, but its * performance will suffer. + * + * The classifier uses a collection of CLS_N_FIELDS hash tables for wildcarded + * flows. Each of these tables contains the flows that wildcard a given field + * and do not wildcard any of the fields that precede F in the ordering. The + * key for each hash table is the value of the fields preceding F that are not + * wildcarded. All the flows that fall within a table and have the same key + * are kept as a linked list ordered from highest to lowest priority. + * + * The classifier also maintains a separate hash table of exact-match flows. + * + * To search the classifier we first search the table of exact-match flows, + * since exact-match flows always have highest priority. If there is a match, + * we're done. Otherwise, we search each of the CLS_N_FIELDS hash tables in + * turn, looking for the highest-priority match, and return it (if any). */ #include "flow.h" #include "hmap.h" #include "list.h" +#include "openflow/nicira-ext.h" #include "openflow/openflow.h" /* Number of bytes of fields in a rule. */ -#define CLS_N_BYTES 31 +#define CLS_N_BYTES 37 /* Fields in a rule. * @@ -41,17 +56,20 @@ * performance (see above). To adjust the ordering, change the order of the * lines. */ #define CLS_FIELDS \ - /* flow_t all-caps */ \ + /* struct flow all-caps */ \ /* wildcard bit(s) member name name */ \ /* ----------------- ----------- -------- */ \ CLS_FIELD(OFPFW_IN_PORT, in_port, IN_PORT) \ + CLS_FIELD(NXFW_TUN_ID, tun_id, TUN_ID) \ CLS_FIELD(OFPFW_DL_VLAN, dl_vlan, DL_VLAN) \ + CLS_FIELD(OFPFW_DL_VLAN_PCP, dl_vlan_pcp, DL_VLAN_PCP) \ CLS_FIELD(OFPFW_DL_SRC, dl_src, DL_SRC) \ CLS_FIELD(OFPFW_DL_DST, dl_dst, DL_DST) \ CLS_FIELD(OFPFW_DL_TYPE, dl_type, DL_TYPE) \ CLS_FIELD(OFPFW_NW_SRC_MASK, nw_src, NW_SRC) \ CLS_FIELD(OFPFW_NW_DST_MASK, nw_dst, NW_DST) \ CLS_FIELD(OFPFW_NW_PROTO, nw_proto, NW_PROTO) \ + CLS_FIELD(OFPFW_NW_TOS, nw_tos, NW_TOS) \ CLS_FIELD(OFPFW_TP_SRC, tp_src, TP_SRC) \ CLS_FIELD(OFPFW_TP_DST, tp_dst, TP_DST) @@ -68,7 +86,7 @@ enum { /* Field information. */ struct cls_field { - int ofs; /* Offset in flow_t. */ + int ofs; /* Offset in struct flow. */ int len; /* Length in bytes. */ uint32_t wildcards; /* OFPFW_* bit or bits for this field. */ const char *name; /* Name (for debugging). */ @@ -86,7 +104,7 @@ struct classifier { struct cls_bucket { struct hmap_node hmap_node; /* Within struct classifier 'tables'. */ struct list rules; /* In order from highest to lowest priority. */ - flow_t fixed; /* Values for fixed fields. */ + struct flow fixed; /* Values for fixed fields. */ }; /* A flow classification rule. @@ -99,16 +117,18 @@ struct cls_rule { struct list list; /* Within struct cls_bucket 'rules'. */ struct hmap_node hmap; /* Within struct classifier 'exact_table'. */ } node; - flow_t flow; /* All field values. */ + struct flow flow; /* All field values. */ struct flow_wildcards wc; /* Wildcards for fields. */ unsigned int priority; /* Larger numbers are higher priorities. */ unsigned int table_idx; /* Index into struct classifier 'tables'. */ }; -void cls_rule_from_flow(struct cls_rule *, const flow_t *, uint32_t wildcards, - unsigned int priority); -void cls_rule_from_match(struct cls_rule *, const struct ofp_match *, - unsigned int priority); +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, + bool tun_id_from_cookie, uint64_t cookie, + struct cls_rule *); +char *cls_rule_to_string(const struct cls_rule *); void cls_rule_print(const struct cls_rule *); void cls_rule_moved(struct classifier *, struct cls_rule *old, struct cls_rule *new); @@ -123,11 +143,14 @@ 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_remove(struct classifier *, struct cls_rule *); -struct cls_rule *classifier_lookup(const struct classifier *, const flow_t *); +struct cls_rule *classifier_lookup(const struct classifier *, + const struct flow *); struct cls_rule *classifier_lookup_wild(const struct classifier *, - const flow_t *); + const struct flow *); struct cls_rule *classifier_lookup_exact(const struct classifier *, - const flow_t *); + const struct flow *); +bool classifier_rule_overlaps(const struct classifier *, const struct flow *, + uint32_t wildcards, unsigned int priority); typedef void cls_cb_func(struct cls_rule *, void *aux); @@ -142,8 +165,14 @@ 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 flow_t *target, + const struct flow *target, uint32_t wildcards, unsigned int priority); +#define CLASSIFIER_FOR_EACH_EXACT_RULE(RULE, MEMBER, CLS) \ + HMAP_FOR_EACH (RULE, MEMBER.node.hmap, &(CLS)->exact_table) + +#define CLASSIFIER_FOR_EACH_EXACT_RULE_SAFE(RULE, NEXT, MEMBER, CLS) \ + HMAP_FOR_EACH_SAFE (RULE, NEXT, MEMBER.node.hmap, &(CLS)->exact_table) + #endif /* classifier.h */