X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fflow.c;h=ef1dd6d208c9e70eec0a6daea598f0c370b97254;hb=47284b1fc6fe84a9b5b43b49bef868e4eb230cd1;hp=3f0bea5549d880a7d55a2c21497d57599d989cd9;hpb=25cfd5cac3ef31c8969db2efb067140cf4e7f08f;p=sliver-openvswitch.git diff --git a/lib/flow.c b/lib/flow.c index 3f0bea554..ef1dd6d20 100644 --- a/lib/flow.c +++ b/lib/flow.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -203,11 +203,14 @@ parse_ipv6(struct ofpbuf *packet, struct flow *flow) } /* We only process the first fragment. */ - flow->nw_frag = FLOW_NW_FRAG_ANY; - if ((frag_hdr->ip6f_offlg & IP6F_OFF_MASK) != htons(0)) { - flow->nw_frag |= FLOW_NW_FRAG_LATER; - nexthdr = IPPROTO_FRAGMENT; - break; + if (frag_hdr->ip6f_offlg != htons(0)) { + if ((frag_hdr->ip6f_offlg & IP6F_OFF_MASK) == htons(0)) { + flow->nw_frag = FLOW_NW_FRAG_ANY; + } else { + flow->nw_frag |= FLOW_NW_FRAG_LATER; + nexthdr = IPPROTO_FRAGMENT; + break; + } } } } @@ -309,7 +312,9 @@ invalid: } -/* Initializes 'flow' members from 'packet', 'tun_id', and 'ofp_in_port'. +/* Initializes 'flow' members from 'packet', 'skb_priority', 'tun_id', and + * 'ofp_in_port'. + * * Initializes 'packet' header pointers as follows: * * - packet->l2 to the start of the Ethernet header. @@ -325,7 +330,7 @@ invalid: * present and has a correct length, and otherwise NULL. */ void -flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id, +flow_extract(struct ofpbuf *packet, uint32_t skb_priority, ovs_be64 tun_id, uint16_t ofp_in_port, struct flow *flow) { struct ofpbuf b = *packet; @@ -336,7 +341,7 @@ flow_extract(struct ofpbuf *packet, uint32_t priority, ovs_be64 tun_id, memset(flow, 0, sizeof *flow); flow->tun_id = tun_id; flow->in_port = ofp_in_port; - flow->priority = priority; + flow->skb_priority = skb_priority; packet->l2 = b.data; packet->l3 = NULL; @@ -439,7 +444,7 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) const flow_wildcards_t wc = wildcards->wildcards; int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); for (i = 0; i < FLOW_N_REGS; i++) { flow->regs[i] &= wildcards->reg_masks[i]; @@ -454,12 +459,8 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) if (wc & FWW_DL_TYPE) { flow->dl_type = htons(0); } - if (wc & FWW_TP_SRC) { - flow->tp_src = htons(0); - } - if (wc & FWW_TP_DST) { - flow->tp_dst = htons(0); - } + flow->tp_src &= wildcards->tp_src_mask; + flow->tp_dst &= wildcards->tp_dst_mask; if (wc & FWW_DL_SRC) { memset(flow->dl_src, 0, sizeof flow->dl_src); } @@ -496,10 +497,24 @@ flow_zero_wildcards(struct flow *flow, const struct flow_wildcards *wildcards) &wildcards->ipv6_src_mask); flow->ipv6_dst = ipv6_addr_bitand(&flow->ipv6_dst, &wildcards->ipv6_dst_mask); - if (wc & FWW_ND_TARGET) { - memset(&flow->nd_target, 0, sizeof flow->nd_target); - } - flow->priority = 0; + flow->nd_target = ipv6_addr_bitand(&flow->nd_target, + &wildcards->nd_target_mask); + flow->skb_priority = 0; +} + +/* Initializes 'fmd' with the metadata found in 'flow'. */ +void +flow_get_metadata(const struct flow *flow, struct flow_metadata *fmd) +{ + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); + + fmd->tun_id = flow->tun_id; + fmd->tun_id_mask = htonll(UINT64_MAX); + + memcpy(fmd->regs, flow->regs, sizeof fmd->regs); + memset(fmd->reg_masks, 0xff, sizeof fmd->reg_masks); + + fmd->in_port = flow->in_port; } char * @@ -513,41 +528,41 @@ flow_to_string(const struct flow *flow) void flow_format(struct ds *ds, const struct flow *flow) { - ds_put_format(ds, "priority%"PRIu32 - ":tunnel%#"PRIx64 - ":in_port%04"PRIx16, - flow->priority, + ds_put_format(ds, "priority:%"PRIu32 + ",tunnel:%#"PRIx64 + ",in_port:%04"PRIx16, + flow->skb_priority, ntohll(flow->tun_id), flow->in_port); - ds_put_format(ds, ":tci("); + ds_put_format(ds, ",tci("); if (flow->vlan_tci) { - ds_put_format(ds, "vlan%"PRIu16",pcp%d", + ds_put_format(ds, "vlan:%"PRIu16",pcp:%d", vlan_tci_to_vid(flow->vlan_tci), vlan_tci_to_pcp(flow->vlan_tci)); } else { ds_put_char(ds, '0'); } - ds_put_format(ds, ") mac"ETH_ADDR_FMT"->"ETH_ADDR_FMT - " type%04"PRIx16, + ds_put_format(ds, ") mac("ETH_ADDR_FMT"->"ETH_ADDR_FMT + ") type:%04"PRIx16, ETH_ADDR_ARGS(flow->dl_src), ETH_ADDR_ARGS(flow->dl_dst), ntohs(flow->dl_type)); if (flow->dl_type == htons(ETH_TYPE_IPV6)) { - ds_put_format(ds, " label%#"PRIx32" proto%"PRIu8" tos%#"PRIx8 - " ttl%"PRIu8" ipv6", + ds_put_format(ds, " label:%#"PRIx32" proto:%"PRIu8" tos:%#"PRIx8 + " ttl:%"PRIu8" ipv6(", ntohl(flow->ipv6_label), flow->nw_proto, flow->nw_tos, flow->nw_ttl); print_ipv6_addr(ds, &flow->ipv6_src); ds_put_cstr(ds, "->"); print_ipv6_addr(ds, &flow->ipv6_dst); - + ds_put_char(ds, ')'); } else { - ds_put_format(ds, " proto%"PRIu8" tos%#"PRIx8" ttl%"PRIu8 - " ip"IP_FMT"->"IP_FMT, - flow->nw_proto, flow->nw_tos, flow->nw_ttl, - IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst)); + ds_put_format(ds, " proto:%"PRIu8" tos:%#"PRIx8" ttl:%"PRIu8 + " ip("IP_FMT"->"IP_FMT")", + flow->nw_proto, flow->nw_tos, flow->nw_ttl, + IP_ARGS(&flow->nw_src), IP_ARGS(&flow->nw_dst)); } if (flow->nw_frag) { ds_put_format(ds, " frag(%s)", @@ -556,11 +571,11 @@ flow_format(struct ds *ds, const struct flow *flow) ? "later" : ""); } if (flow->tp_src || flow->tp_dst) { - ds_put_format(ds, " port%"PRIu16"->%"PRIu16, + ds_put_format(ds, " port(%"PRIu16"->%"PRIu16")", ntohs(flow->tp_src), ntohs(flow->tp_dst)); } if (!eth_addr_is_zero(flow->arp_sha) || !eth_addr_is_zero(flow->arp_tha)) { - ds_put_format(ds, " arp_ha"ETH_ADDR_FMT"->"ETH_ADDR_FMT, + ds_put_format(ds, " arp_ha("ETH_ADDR_FMT"->"ETH_ADDR_FMT")", ETH_ADDR_ARGS(flow->arp_sha), ETH_ADDR_ARGS(flow->arp_tha)); } @@ -580,7 +595,7 @@ flow_print(FILE *stream, const struct flow *flow) void flow_wildcards_init_catchall(struct flow_wildcards *wc) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); wc->wildcards = FWW_ALL; wc->tun_id_mask = htonll(0); @@ -588,9 +603,12 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc) wc->nw_dst_mask = htonl(0); wc->ipv6_src_mask = in6addr_any; wc->ipv6_dst_mask = in6addr_any; + wc->nd_target_mask = in6addr_any; memset(wc->reg_masks, 0, sizeof wc->reg_masks); wc->vlan_tci_mask = htons(0); wc->nw_frag_mask = 0; + wc->tp_src_mask = htons(0); + wc->tp_dst_mask = htons(0); memset(wc->zeros, 0, sizeof wc->zeros); } @@ -599,7 +617,7 @@ flow_wildcards_init_catchall(struct flow_wildcards *wc) void flow_wildcards_init_exact(struct flow_wildcards *wc) { - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); wc->wildcards = 0; wc->tun_id_mask = htonll(UINT64_MAX); @@ -607,9 +625,12 @@ flow_wildcards_init_exact(struct flow_wildcards *wc) wc->nw_dst_mask = htonl(UINT32_MAX); wc->ipv6_src_mask = in6addr_exact; wc->ipv6_dst_mask = in6addr_exact; + wc->nd_target_mask = in6addr_exact; memset(wc->reg_masks, 0xff, sizeof wc->reg_masks); wc->vlan_tci_mask = htons(UINT16_MAX); wc->nw_frag_mask = UINT8_MAX; + wc->tp_src_mask = htons(UINT16_MAX); + wc->tp_dst_mask = htons(UINT16_MAX); memset(wc->zeros, 0, sizeof wc->zeros); } @@ -620,15 +641,18 @@ flow_wildcards_is_exact(const struct flow_wildcards *wc) { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); if (wc->wildcards || wc->tun_id_mask != htonll(UINT64_MAX) || wc->nw_src_mask != htonl(UINT32_MAX) || wc->nw_dst_mask != htonl(UINT32_MAX) + || wc->tp_src_mask != htons(UINT16_MAX) + || wc->tp_dst_mask != htons(UINT16_MAX) || wc->vlan_tci_mask != htons(UINT16_MAX) || !ipv6_mask_is_exact(&wc->ipv6_src_mask) || !ipv6_mask_is_exact(&wc->ipv6_dst_mask) + || !ipv6_mask_is_exact(&wc->nd_target_mask) || wc->nw_frag_mask != UINT8_MAX) { return false; } @@ -649,15 +673,18 @@ flow_wildcards_is_catchall(const struct flow_wildcards *wc) { int i; - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 7); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); if (wc->wildcards != FWW_ALL || wc->tun_id_mask != htonll(0) || wc->nw_src_mask != htonl(0) || wc->nw_dst_mask != htonl(0) + || wc->tp_src_mask != htons(0) + || wc->tp_dst_mask != htons(0) || wc->vlan_tci_mask != htons(0) || !ipv6_mask_is_any(&wc->ipv6_src_mask) || !ipv6_mask_is_any(&wc->ipv6_dst_mask) + || !ipv6_mask_is_any(&wc->nd_target_mask) || wc->nw_frag_mask != 0) { return false; } @@ -681,6 +708,8 @@ flow_wildcards_combine(struct flow_wildcards *dst, { int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); + dst->wildcards = src1->wildcards | src2->wildcards; dst->tun_id_mask = src1->tun_id_mask & src2->tun_id_mask; dst->nw_src_mask = src1->nw_src_mask & src2->nw_src_mask; @@ -689,10 +718,14 @@ flow_wildcards_combine(struct flow_wildcards *dst, &src2->ipv6_src_mask); dst->ipv6_dst_mask = ipv6_addr_bitand(&src1->ipv6_dst_mask, &src2->ipv6_dst_mask); + dst->nd_target_mask = ipv6_addr_bitand(&src1->nd_target_mask, + &src2->nd_target_mask); for (i = 0; i < FLOW_N_REGS; i++) { dst->reg_masks[i] = src1->reg_masks[i] & src2->reg_masks[i]; } dst->vlan_tci_mask = src1->vlan_tci_mask & src2->vlan_tci_mask; + dst->tp_src_mask = src1->tp_src_mask & src2->tp_src_mask; + dst->tp_dst_mask = src1->tp_dst_mask & src2->tp_dst_mask; } /* Returns a hash of the wildcards in 'wc'. */ @@ -702,7 +735,7 @@ flow_wildcards_hash(const struct flow_wildcards *wc, uint32_t basis) /* If you change struct flow_wildcards and thereby trigger this * assertion, please check that the new struct flow_wildcards has no holes * in it before you update the assertion. */ - BUILD_ASSERT_DECL(sizeof *wc == 60 + FLOW_N_REGS * 4); + BUILD_ASSERT_DECL(sizeof *wc == 80 + FLOW_N_REGS * 4); return hash_bytes(wc, sizeof *wc, basis); } @@ -714,13 +747,18 @@ flow_wildcards_equal(const struct flow_wildcards *a, { int i; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); + if (a->wildcards != b->wildcards || a->tun_id_mask != b->tun_id_mask || a->nw_src_mask != b->nw_src_mask || a->nw_dst_mask != b->nw_dst_mask || a->vlan_tci_mask != b->vlan_tci_mask || !ipv6_addr_equals(&a->ipv6_src_mask, &b->ipv6_src_mask) - || !ipv6_addr_equals(&a->ipv6_dst_mask, &b->ipv6_dst_mask)) { + || !ipv6_addr_equals(&a->ipv6_dst_mask, &b->ipv6_dst_mask) + || !ipv6_addr_equals(&a->nd_target_mask, &b->nd_target_mask) + || a->tp_src_mask != b->tp_src_mask + || a->tp_dst_mask != b->tp_dst_mask) { return false; } @@ -742,6 +780,8 @@ flow_wildcards_has_extra(const struct flow_wildcards *a, int i; struct in6_addr ipv6_masked; + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 10); + for (i = 0; i < FLOW_N_REGS; i++) { if ((a->reg_masks[i] & b->reg_masks[i]) != b->reg_masks[i]) { return true; @@ -758,11 +798,18 @@ flow_wildcards_has_extra(const struct flow_wildcards *a, return true; } + ipv6_masked = ipv6_addr_bitand(&a->nd_target_mask, &b->nd_target_mask); + if (!ipv6_addr_equals(&ipv6_masked, &b->nd_target_mask)) { + return true; + } + return (a->wildcards & ~b->wildcards || (a->tun_id_mask & b->tun_id_mask) != b->tun_id_mask || (a->nw_src_mask & b->nw_src_mask) != b->nw_src_mask || (a->nw_dst_mask & b->nw_dst_mask) != b->nw_dst_mask - || (a->vlan_tci_mask & b->vlan_tci_mask) != b->vlan_tci_mask); + || (a->vlan_tci_mask & b->vlan_tci_mask) != b->vlan_tci_mask + || (a->tp_src_mask & b->tp_src_mask) != b->tp_src_mask + || (a->tp_dst_mask & b->tp_dst_mask) != b->tp_dst_mask); } /* Sets the wildcard mask for register 'idx' in 'wc' to 'mask'. @@ -861,7 +908,7 @@ flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis) }; ovs_be16 eth_type; ovs_be16 vlan_tci; - ovs_be16 tp_addr; + ovs_be16 tp_port; uint8_t eth_addr[ETH_ADDR_LEN]; uint8_t ip_proto; } fields; @@ -881,7 +928,7 @@ flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis) fields.ipv4_addr = flow->nw_src ^ flow->nw_dst; fields.ip_proto = flow->nw_proto; if (fields.ip_proto == IPPROTO_TCP) { - fields.tp_addr = flow->tp_src ^ flow->tp_dst; + fields.tp_port = flow->tp_src ^ flow->tp_dst; } } else if (fields.eth_type == htons(ETH_TYPE_IPV6)) { const uint8_t *a = &flow->ipv6_src.s6_addr[0]; @@ -893,7 +940,7 @@ flow_hash_symmetric_l4(const struct flow *flow, uint32_t basis) } fields.ip_proto = flow->nw_proto; if (fields.ip_proto == IPPROTO_TCP) { - fields.tp_addr = flow->tp_src ^ flow->tp_dst; + fields.tp_port = flow->tp_src ^ flow->tp_dst; } } return hash_bytes(&fields, sizeof fields, basis); @@ -935,6 +982,44 @@ flow_hash_fields_valid(enum nx_hash_fields fields) || fields == NX_HASH_FIELDS_SYMMETRIC_L4; } +/* Sets the VLAN VID that 'flow' matches to 'vid', which is interpreted as an + * OpenFlow 1.0 "dl_vlan" value: + * + * - If it is in the range 0...4095, 'flow->vlan_tci' is set to match + * that VLAN. Any existing PCP match is unchanged (it becomes 0 if + * 'flow' previously matched packets without a VLAN header). + * + * - If it is OFP_VLAN_NONE, 'flow->vlan_tci' is set to match a packet + * without a VLAN tag. + * + * - Other values of 'vid' should not be used. */ +void +flow_set_vlan_vid(struct flow *flow, ovs_be16 vid) +{ + if (vid == htons(OFP_VLAN_NONE)) { + flow->vlan_tci = htons(0); + } else { + vid &= htons(VLAN_VID_MASK); + flow->vlan_tci &= ~htons(VLAN_VID_MASK); + flow->vlan_tci |= htons(VLAN_CFI) | vid; + } +} + +/* Sets the VLAN PCP that 'flow' matches to 'pcp', which should be in the + * range 0...7. + * + * This function has no effect on the VLAN ID that 'flow' matches. + * + * After calling this function, 'flow' will not match packets without a VLAN + * header. */ +void +flow_set_vlan_pcp(struct flow *flow, uint8_t pcp) +{ + pcp &= 0x07; + flow->vlan_tci &= ~htons(VLAN_PCP_MASK); + flow->vlan_tci |= htons((pcp << VLAN_PCP_SHIFT) | VLAN_CFI); +} + /* Puts into 'b' a packet that flow_extract() would parse as having the given * 'flow'. * @@ -952,7 +1037,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) } if (flow->vlan_tci & htons(VLAN_CFI)) { - eth_push_vlan(b, flow->vlan_tci & ~htons(VLAN_CFI)); + eth_push_vlan(b, flow->vlan_tci); } if (flow->dl_type == htons(ETH_TYPE_IP)) { @@ -979,6 +1064,7 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) b->l4 = tcp = ofpbuf_put_zeros(b, sizeof *tcp); tcp->tcp_src = flow->tp_src; tcp->tcp_dst = flow->tp_dst; + tcp->tcp_ctl = TCP_CTL(0, 5); } else if (flow->nw_proto == IPPROTO_UDP) { struct udp_header *udp; @@ -993,6 +1079,9 @@ flow_compose(struct ofpbuf *b, const struct flow *flow) icmp->icmp_code = ntohs(flow->tp_dst); } } + + ip->ip_tot_len = htons((uint8_t *) b->data + b->size + - (uint8_t *) b->l3); } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { /* XXX */ } else if (flow->dl_type == htons(ETH_TYPE_ARP)) {