X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=lib%2Fclassifier.c;h=dab8f620fbb6622422c8e6a37cdcf604462aec14;hb=2c8fcc9cd6a7bbb948f6c79879e89c7ed791c9b1;hp=9903ab70d38a34dd7ef432e72deac0940f0570c3;hpb=209c0b17d90b8062e5a3cbd80a083ea02e18d880;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index 9903ab70..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); } @@ -315,7 +302,7 @@ cls_rule_set_nw_dst_masked(struct cls_rule *rule, ovs_be32 ip, ovs_be32 mask) void cls_rule_set_nw_dscp(struct cls_rule *rule, uint8_t nw_dscp) { - rule->wc.nw_tos_mask |= 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; } @@ -323,7 +310,7 @@ cls_rule_set_nw_dscp(struct cls_rule *rule, uint8_t nw_dscp) void cls_rule_set_nw_ecn(struct cls_rule *rule, uint8_t nw_ecn) { - rule->wc.nw_tos_mask |= 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; } @@ -477,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); @@ -622,10 +609,10 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ETH_ADDR_ARGS(f->arp_tha)); } } - if (wc->nw_tos_mask & IP_DSCP_MASK) { + if (!(w & FWW_NW_DSCP)) { ds_put_format(s, "nw_tos=%"PRIu8",", f->nw_tos & IP_DSCP_MASK); } - if (wc->nw_tos_mask & 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)) { @@ -966,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; @@ -1001,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; @@ -1040,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) { @@ -1177,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]) { @@ -1205,7 +1177,8 @@ 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->nw_tos ^ b->nw_tos) & wildcards->nw_tos_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))