X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fclassifier.c;h=d1f9d5ddc0336a549786804226bbbe5b97237719;hb=a7844aaf5ebccf1a8762f68bcbb62e463fc3809b;hp=fcc965c873aa7679533b022ad1c67840ec9a42b2;hpb=685a51a5b89750cead1b2934c2079d2bb9c52a4a;p=openvswitch diff --git a/lib/classifier.c b/lib/classifier.c index fcc965c8..d1f9d5dd 100644 --- a/lib/classifier.c +++ b/lib/classifier.c @@ -142,10 +142,10 @@ cls_rule_set_tun_id_masked(struct cls_rule *rule, } void -cls_rule_set_in_port(struct cls_rule *rule, uint16_t odp_port) +cls_rule_set_in_port(struct cls_rule *rule, uint16_t ofp_port) { rule->wc.wildcards &= ~FWW_IN_PORT; - rule->flow.in_port = odp_port; + rule->flow.in_port = ofp_port; } void @@ -162,6 +162,7 @@ cls_rule_set_dl_src(struct cls_rule *rule, const uint8_t dl_src[ETH_ADDR_LEN]) memcpy(rule->flow.dl_src, dl_src, ETH_ADDR_LEN); } +/* Modifies 'rule' so that the Ethernet address must match 'dl_dst' exactly. */ void cls_rule_set_dl_dst(struct cls_rule *rule, const uint8_t dl_dst[ETH_ADDR_LEN]) { @@ -169,6 +170,25 @@ cls_rule_set_dl_dst(struct cls_rule *rule, const uint8_t dl_dst[ETH_ADDR_LEN]) memcpy(rule->flow.dl_dst, dl_dst, ETH_ADDR_LEN); } +/* Modifies 'rule' so that the Ethernet address must match 'dl_dst' after each + * byte is ANDed with the appropriate byte in 'mask'. + * + * This function will assert-fail if 'mask' is invalid. Only 'mask' values + * accepted by flow_wildcards_is_dl_dst_mask_valid() are allowed. */ +void +cls_rule_set_dl_dst_masked(struct cls_rule *rule, + const uint8_t dl_dst[ETH_ADDR_LEN], + const uint8_t mask[ETH_ADDR_LEN]) +{ + flow_wildcards_t *wc = &rule->wc.wildcards; + size_t i; + + *wc = flow_wildcards_set_dl_dst_mask(*wc, mask); + for (i = 0; i < ETH_ADDR_LEN; i++) { + rule->flow.dl_dst[i] = dl_dst[i] & mask[i]; + } +} + void cls_rule_set_dl_tci(struct cls_rule *rule, ovs_be16 tci) { @@ -386,6 +406,16 @@ cls_rule_equal(const struct cls_rule *a, const struct cls_rule *b) && flow_equal(&a->flow, &b->flow)); } +/* Returns a hash value for the flow, wildcards, and priority in 'rule', + * starting from 'basis'. */ +uint32_t +cls_rule_hash(const struct cls_rule *rule, uint32_t basis) +{ + uint32_t h0 = flow_hash(&rule->flow, basis); + uint32_t h1 = flow_wildcards_hash(&rule->wc, h0); + return hash_int(rule->priority, h1); +} + static void format_ip_netmask(struct ds *s, const char *name, ovs_be32 ip, ovs_be32 netmask) @@ -437,6 +467,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); + if (rule->priority != OFP_DEFAULT_PRIORITY) { ds_put_format(s, "priority=%d,", rule->priority); } @@ -506,8 +538,7 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) break; } if (!(w & FWW_IN_PORT)) { - ds_put_format(s, "in_port=%"PRIu16",", - odp_port_to_ofp_port(f->in_port)); + ds_put_format(s, "in_port=%"PRIu16",", f->in_port); } if (wc->vlan_tci_mask) { ovs_be16 vid_mask = wc->vlan_tci_mask & htons(VLAN_VID_MASK); @@ -526,6 +557,8 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ds_put_format(s, "dl_vlan_pcp=%d,", vlan_tci_to_pcp(f->vlan_tci)); } + } else if (wc->vlan_tci_mask == htons(0xffff)) { + ds_put_format(s, "vlan_tci=0x%04"PRIx16",", ntohs(f->vlan_tci)); } else { ds_put_format(s, "vlan_tci=0x%04"PRIx16"/0x%04"PRIx16",", ntohs(f->vlan_tci), ntohs(wc->vlan_tci_mask)); @@ -561,7 +594,7 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) } if (!skip_proto && !(w & FWW_NW_PROTO)) { if (f->dl_type == htons(ETH_TYPE_ARP)) { - ds_put_format(s, "opcode=%"PRIu8",", f->nw_proto); + ds_put_format(s, "arp_op=%"PRIu8",", f->nw_proto); } else { ds_put_format(s, "nw_proto=%"PRIu8",", f->nw_proto); } @@ -599,11 +632,11 @@ cls_rule_format(const struct cls_rule *rule, struct ds *s) ds_put_char(s, ','); } if (!(w & FWW_ARP_SHA)) { - ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", + ds_put_format(s, "nd_sll="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->arp_sha)); } if (!(w & FWW_ARP_THA)) { - ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", + ds_put_format(s, "nd_tll="ETH_ADDR_FMT",", ETH_ADDR_ARGS(f->arp_tha)); } } else { @@ -691,7 +724,7 @@ classifier_count(const struct classifier *cls) * rule, even rules that cannot have any effect because the new rule matches a * superset of their flows and has higher priority. */ struct cls_rule * -classifier_insert(struct classifier *cls, struct cls_rule *rule) +classifier_replace(struct classifier *cls, struct cls_rule *rule) { struct cls_rule *old_rule; struct cls_table *table; @@ -709,6 +742,19 @@ classifier_insert(struct classifier *cls, struct cls_rule *rule) return old_rule; } +/* Inserts 'rule' into 'cls'. Until 'rule' is removed from 'cls', the caller + * must not modify or free it. + * + * 'cls' must not contain an identical rule (including wildcards, values of + * fixed fields, and priority). Use classifier_find_rule_exactly() to find + * such a rule. */ +void +classifier_insert(struct classifier *cls, struct cls_rule *rule) +{ + struct cls_rule *displaced_rule = classifier_replace(cls, rule); + assert(!displaced_rule); +} + /* Removes 'rule' from 'cls'. It is the caller's responsibility to free * 'rule', if this is desirable. */ void @@ -759,10 +805,7 @@ classifier_lookup(const struct classifier *cls, const struct flow *flow) /* Finds and returns a rule in 'cls' with exactly the same priority and * matching criteria as 'target'. Returns a null pointer if 'cls' doesn't - * contain an exact match. - * - * Priority is ignored for exact-match rules (because OpenFlow 1.0 always - * treats exact-match rules as highest priority). */ + * contain an exact match. */ struct cls_rule * classifier_find_rule_exactly(const struct classifier *cls, const struct cls_rule *target) @@ -776,9 +819,6 @@ classifier_find_rule_exactly(const struct classifier *cls, } head = find_equal(table, &target->flow, flow_hash(&target->flow, 0)); - if (flow_wildcards_is_exact(&target->wc)) { - return head; - } FOR_EACH_RULE_IN_LIST (rule, head) { if (target->priority >= rule->priority) { return target->priority == rule->priority ? rule : NULL; @@ -941,7 +981,7 @@ find_table(const struct classifier *cls, const struct flow_wildcards *wc) { struct cls_table *table; - HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, flow_wildcards_hash(wc), + HMAP_FOR_EACH_IN_BUCKET (table, hmap_node, flow_wildcards_hash(wc, 0), &cls->tables) { if (flow_wildcards_equal(wc, &table->wc)) { return table; @@ -958,7 +998,7 @@ insert_table(struct classifier *cls, const struct flow_wildcards *wc) table = xzalloc(sizeof *table); hmap_init(&table->rules); table->wc = *wc; - hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc)); + hmap_insert(&cls->tables, &table->hmap_node, flow_wildcards_hash(wc, 0)); return table; } @@ -1100,7 +1140,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_SIG_SIZE == 100 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); for (i = 0; i < FLOW_N_REGS; i++) { if ((a->regs[i] ^ b->regs[i]) & wildcards->reg_masks[i]) { @@ -1134,7 +1174,7 @@ flow_equal_except(const struct flow *a, const struct flow *b, &wildcards->ipv6_src_mask) && ipv6_equal_except(&a->ipv6_dst, &b->ipv6_dst, &wildcards->ipv6_dst_mask) - && (wc & FWW_ND_TARGET + && (wc & FWW_ND_TARGET || ipv6_addr_equals(&a->nd_target, &b->nd_target))); } @@ -1144,7 +1184,7 @@ zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_SIG_SIZE == 100 + 4 * FLOW_N_REGS); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 1); for (i = 0; i < FLOW_N_REGS; i++) { flow->regs[i] &= wildcards->reg_masks[i];