X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=dab8f620fbb6622422c8e6a37cdcf604462aec14;hb=2c8fcc9cd6a7bbb948f6c79879e89c7ed791c9b1;hp=842166cd438061ee3465ab683b1261a37498d250;hpb=a61680c6d15fa1f1ae3072a83c0e3d7ed08f6048;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 842166cd..dab8f620 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -32,9 +32,6 @@ static struct cls_table *find_table(const struct classifier *, static struct cls_table *insert_table(struct classifier *, const struct flow_wildcards *); -static struct cls_table *classifier_first_table(const struct classifier *); -static struct cls_table *classifier_next_table(const struct classifier *, - const struct cls_table *); static void destroy_table(struct classifier *, struct cls_table *); static struct cls_rule *find_match(const struct cls_table *, @@ -57,12 +54,6 @@ static bool flow_equal_except(const struct flow *, const struct flow *, static struct cls_rule *next_rule_in_list__(struct cls_rule *); static struct cls_rule *next_rule_in_list(struct cls_rule *); -static struct cls_table * -cls_table_from_hmap_node(const struct hmap_node *node) -{ - return node ? CONTAINER_OF(node, struct cls_table, hmap_node) : NULL; -} - /* Converts the flow in 'flow' into a cls_rule in 'rule', with the given * 'wildcards' and 'priority'. */ void @@ -227,12 +218,10 @@ cls_rule_set_any_vid(struct cls_rule *rule) void cls_rule_set_dl_vlan(struct cls_rule *rule, ovs_be16 dl_vlan) { + flow_set_vlan_vid(&rule->flow, dl_vlan); if (dl_vlan == htons(OFP_VLAN_NONE)) { - cls_rule_set_dl_tci(rule, htons(0)); + rule->wc.vlan_tci_mask = htons(UINT16_MAX); } else { - dl_vlan &= htons(VLAN_VID_MASK); - rule->flow.vlan_tci &= ~htons(VLAN_VID_MASK); - rule->flow.vlan_tci |= htons(VLAN_CFI) | dl_vlan; rule->wc.vlan_tci_mask |= htons(VLAN_VID_MASK | VLAN_CFI); } } @@ -256,9 +245,7 @@ cls_rule_set_any_pcp(struct cls_rule *rule) void cls_rule_set_dl_vlan_pcp(struct cls_rule *rule, uint8_t dl_vlan_pcp) { - dl_vlan_pcp &= 0x07; - rule->flow.vlan_tci &= ~htons(VLAN_PCP_MASK); - rule->flow.vlan_tci |= htons((dl_vlan_pcp << VLAN_PCP_SHIFT) | VLAN_CFI); + flow_set_vlan_pcp(&rule->flow, dl_vlan_pcp); rule->wc.vlan_tci_mask |= htons(VLAN_CFI | VLAN_PCP_MASK); } @@ -286,51 +273,46 @@ cls_rule_set_nw_proto(struct cls_rule *rule, uint8_t nw_proto) void cls_rule_set_nw_src(struct cls_rule *rule, ovs_be32 nw_src) { - cls_rule_set_nw_src_masked(rule, nw_src, htonl(UINT32_MAX)); + rule->flow.nw_src = nw_src; + rule->wc.nw_src_mask = htonl(UINT32_MAX); } -bool -cls_rule_set_nw_src_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) +void +cls_rule_set_nw_src_masked(struct cls_rule *rule, + ovs_be32 nw_src, ovs_be32 mask) { - if (flow_wildcards_set_nw_src_mask(&rule->wc, mask)) { - rule->flow.nw_src = ip & mask; - return true; - } else { - return false; - } + rule->flow.nw_src = nw_src & mask; + rule->wc.nw_src_mask = mask; } void cls_rule_set_nw_dst(struct cls_rule *rule, ovs_be32 nw_dst) { - cls_rule_set_nw_dst_masked(rule, nw_dst, htonl(UINT32_MAX)); + rule->flow.nw_dst = nw_dst; + rule->wc.nw_dst_mask = htonl(UINT32_MAX); } -bool +void cls_rule_set_nw_dst_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) { - if (flow_wildcards_set_nw_dst_mask(&rule->wc, mask)) { - rule->flow.nw_dst = ip & mask; - return true; - } else { - return false; - } + rule->flow.nw_dst = ip & mask; + rule->wc.nw_dst_mask = mask; } void cls_rule_set_nw_dscp(struct cls_rule *rule, uint8_t nw_dscp) { - rule->wc.tos_mask |= IP_DSCP_MASK; - rule->flow.tos &= ~IP_DSCP_MASK; - rule->flow.tos |= nw_dscp & IP_DSCP_MASK; + rule->wc.wildcards &= ~FWW_NW_DSCP; + rule->flow.nw_tos &= ~IP_DSCP_MASK; + rule->flow.nw_tos |= nw_dscp & IP_DSCP_MASK; } void cls_rule_set_nw_ecn(struct cls_rule *rule, uint8_t nw_ecn) { - rule->wc.tos_mask |= IP_ECN_MASK; - rule->flow.tos &= ~IP_ECN_MASK; - rule->flow.tos |= nw_ecn & IP_ECN_MASK; + rule->wc.wildcards &= ~FWW_NW_ECN; + rule->flow.nw_tos &= ~IP_ECN_MASK; + rule->flow.nw_tos |= nw_ecn & IP_ECN_MASK; } void @@ -341,17 +323,18 @@ cls_rule_set_nw_ttl(struct cls_rule *rule, uint8_t nw_ttl) } void -cls_rule_set_frag(struct cls_rule *rule, uint8_t frag) +cls_rule_set_nw_frag(struct cls_rule *rule, uint8_t nw_frag) { - rule->wc.frag_mask |= FLOW_FRAG_MASK; - rule->flow.frag = frag; + rule->wc.nw_frag_mask |= FLOW_NW_FRAG_MASK; + rule->flow.nw_frag = nw_frag; } void -cls_rule_set_frag_masked(struct cls_rule *rule, uint8_t frag, uint8_t mask) +cls_rule_set_nw_frag_masked(struct cls_rule *rule, + uint8_t nw_frag, uint8_t mask) { - rule->flow.frag = frag & mask; - rule->wc.frag_mask = mask; + rule->flow.nw_frag = nw_frag & mask; + rule->wc.nw_frag_mask = mask; } void @@ -385,37 +368,31 @@ cls_rule_set_arp_tha(struct cls_rule *rule, const uint8_t tha[ETH_ADDR_LEN]) void cls_rule_set_ipv6_src(struct cls_rule *rule, const struct in6_addr *src) { - cls_rule_set_ipv6_src_masked(rule, src, &in6addr_exact); + rule->flow.ipv6_src = *src; + rule->wc.ipv6_src_mask = in6addr_exact; } -bool +void cls_rule_set_ipv6_src_masked(struct cls_rule *rule, const struct in6_addr *src, const struct in6_addr *mask) { - if (flow_wildcards_set_ipv6_src_mask(&rule->wc, mask)) { - rule->flow.ipv6_src = ipv6_addr_bitand(src, mask); - return true; - } else { - return false; - } + rule->flow.ipv6_src = ipv6_addr_bitand(src, mask); + rule->wc.ipv6_src_mask = *mask; } void cls_rule_set_ipv6_dst(struct cls_rule *rule, const struct in6_addr *dst) { - cls_rule_set_ipv6_dst_masked(rule, dst, &in6addr_exact); + rule->flow.ipv6_dst = *dst; + rule->wc.ipv6_dst_mask = in6addr_exact; } -bool +void cls_rule_set_ipv6_dst_masked(struct cls_rule *rule, const struct in6_addr *dst, const struct in6_addr *mask) { - if (flow_wildcards_set_ipv6_dst_mask(&rule->wc, mask)) { - rule->flow.ipv6_dst = ipv6_addr_bitand(dst, mask); - return true; - } else { - return false; - } + rule->flow.ipv6_dst = ipv6_addr_bitand(dst, mask); + rule->wc.ipv6_dst_mask = *mask; } void @@ -487,7 +464,7 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 6); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); if (rule->priority != OFP_DEFAULT_PRIORITY) { ds_put_format(s, "priority=%d,", rule->priority); @@ -632,31 +609,31 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ETH_ADDR_ARGS(f->arp_tha)); } } - if (wc->tos_mask & IP_DSCP_MASK) { - ds_put_format(s, "nw_tos=%"PRIu8",", f->tos & IP_DSCP_MASK); + if (!(w & FWW_NW_DSCP)) { + ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK); } - if (wc->tos_mask & IP_ECN_MASK) { - ds_put_format(s, "nw_ecn=%"PRIu8",", f->tos & IP_ECN_MASK); + if (!(w & FWW_NW_ECN)) { + ds_put_format(s, "nw_ecn=%"PRIu8",", f->nw_tos & IP_ECN_MASK); } if (!(w & FWW_NW_TTL)) { ds_put_format(s, "nw_ttl=%"PRIu8",", f->nw_ttl); } - switch (wc->frag_mask) { - case FLOW_FRAG_ANY | FLOW_FRAG_LATER: - ds_put_format(s, "frag=%s,", - f->frag & FLOW_FRAG_ANY - ? (f->frag & FLOW_FRAG_LATER ? "later" : "first") - : (f->frag & FLOW_FRAG_LATER ? "" : "no")); + switch (wc->nw_frag_mask) { + case FLOW_NW_FRAG_ANY | FLOW_NW_FRAG_LATER: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_ANY + ? (f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "first") + : (f->nw_frag & FLOW_NW_FRAG_LATER ? "" : "no")); break; - case FLOW_FRAG_ANY: - ds_put_format(s, "frag=%s,", - f->frag & FLOW_FRAG_ANY ? "yes" : "no"); + case FLOW_NW_FRAG_ANY: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_ANY ? "yes" : "no"); break; - case FLOW_FRAG_LATER: - ds_put_format(s, "frag=%s,", - f->frag & FLOW_FRAG_LATER ? "later" : "not_later"); + case FLOW_NW_FRAG_LATER: + ds_put_format(s, "nw_frag=%s,", + f->nw_frag & FLOW_NW_FRAG_LATER ? "later" : "not_later"); break; } if (f->nw_proto == IPPROTO_ICMP) { @@ -976,8 +953,7 @@ cls_cursor_first(struct cls_cursor *cursor) { struct cls_table *table; - for (table = classifier_first_table(cursor->cls); table; - table = classifier_next_table(cursor->cls, table)) { + HMAP_FOR_EACH (table, hmap_node, &cursor->cls->tables) { struct cls_rule *rule = search_table(table, cursor->target); if (rule) { cursor->table = table; @@ -1011,8 +987,8 @@ cls_cursor_next(struct cls_cursor *cursor, struct cls_rule *rule) } } - for (table = classifier_next_table(cursor->cls, cursor->table); table; - table = classifier_next_table(cursor->cls, table)) { + table = cursor->table; + HMAP_FOR_EACH_CONTINUE (table, hmap_node, &cursor->cls->tables) { rule = search_table(table, cursor->target); if (rule) { cursor->table = table; @@ -1050,20 +1026,6 @@ insert_table(struct classifier *cls, const struct flow_wildcards *wc) return table; } -static struct cls_table * -classifier_first_table(const struct classifier *cls) -{ - return cls_table_from_hmap_node(hmap_first(&cls->tables)); -} - -static struct cls_table * -classifier_next_table(const struct classifier *cls, - const struct cls_table *table) -{ - return cls_table_from_hmap_node(hmap_next(&cls->tables, - &table->hmap_node)); -} - static void destroy_table(struct classifier *cls, struct cls_table *table) { @@ -1187,7 +1149,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 6); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -1215,8 +1177,9 @@ flow_equal_except(const struct flow *a, const struct flow *b, || !((a->dl_dst[0] ^ b->dl_dst[0]) & 0x01)) && (wc & FWW_NW_PROTO || a->nw_proto == b->nw_proto) && (wc & FWW_NW_TTL || a->nw_ttl == b->nw_ttl) - && !((a->tos ^ b->tos) & wildcards->tos_mask) - && !((a->frag ^ b->frag) & wildcards->frag_mask) + && (wc & FWW_NW_DSCP || !((a->nw_tos ^ b->nw_tos) & IP_DSCP_MASK)) + && (wc & FWW_NW_ECN || !((a->nw_tos ^ b->nw_tos) & IP_ECN_MASK)) + && !((a->nw_frag ^ b->nw_frag) & wildcards->nw_frag_mask) && (wc & FWW_ARP_SHA || eth_addr_equals(a->arp_sha, b->arp_sha)) && (wc & FWW_ARP_THA || eth_addr_equals(a->arp_tha, b->arp_tha)) && (wc & FWW_IPV6_LABEL || a->ipv6_label == b->ipv6_label)