X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Fflow.c;h=670b6f8f29b1e5ab6551f464eece8b7c9fcd74c9;hb=6455100f38e9312346f4d58511595f695d813537;hp=9823b9feb31ef5fadc321d1e2e91d4b2d4a745ae;hpb=685a51a5b89750cead1b2934c2079d2bb9c52a4a;p=sliver-openvswitch.git diff --git a/datapath/flow.c b/datapath/flow.c index 9823b9feb..670b6f8f2 100644 --- a/datapath/flow.c +++ b/datapath/flow.c @@ -8,7 +8,7 @@ #include "flow.h" #include "datapath.h" -#include +#include #include #include #include @@ -29,61 +29,77 @@ #include #include #include +#include #include #include #include #include +#include "vlan.h" + static struct kmem_cache *flow_cache; static unsigned int hash_seed __read_mostly; -static inline bool arphdr_ok(struct sk_buff *skb) +static int check_header(struct sk_buff *skb, int len) +{ + if (unlikely(skb->len < len)) + return -EINVAL; + if (unlikely(!pskb_may_pull(skb, len))) + return -ENOMEM; + return 0; +} + +static bool arphdr_ok(struct sk_buff *skb) { - return skb->len >= skb_network_offset(skb) + sizeof(struct arp_eth_header); + return pskb_may_pull(skb, skb_network_offset(skb) + + sizeof(struct arp_eth_header)); } -static inline int check_iphdr(struct sk_buff *skb) +static int check_iphdr(struct sk_buff *skb) { unsigned int nh_ofs = skb_network_offset(skb); unsigned int ip_len; + int err; - if (skb->len < nh_ofs + sizeof(struct iphdr)) - return -EINVAL; + err = check_header(skb, nh_ofs + sizeof(struct iphdr)); + if (unlikely(err)) + return err; ip_len = ip_hdrlen(skb); - if (ip_len < sizeof(struct iphdr) || skb->len < nh_ofs + ip_len) + if (unlikely(ip_len < sizeof(struct iphdr) || + skb->len < nh_ofs + ip_len)) return -EINVAL; - /* - * Pull enough header bytes to account for the IP header plus the - * longest transport header that we parse, currently 20 bytes for TCP. - */ - if (!pskb_may_pull(skb, min(nh_ofs + ip_len + 20, skb->len))) - return -ENOMEM; - skb_set_transport_header(skb, nh_ofs + ip_len); return 0; } -static inline bool tcphdr_ok(struct sk_buff *skb) +static bool tcphdr_ok(struct sk_buff *skb) { int th_ofs = skb_transport_offset(skb); - if (skb->len >= th_ofs + sizeof(struct tcphdr)) { - int tcp_len = tcp_hdrlen(skb); - return (tcp_len >= sizeof(struct tcphdr) - && skb->len >= th_ofs + tcp_len); - } - return false; + int tcp_len; + + if (unlikely(!pskb_may_pull(skb, th_ofs + sizeof(struct tcphdr)))) + return false; + + tcp_len = tcp_hdrlen(skb); + if (unlikely(tcp_len < sizeof(struct tcphdr) || + skb->len < th_ofs + tcp_len)) + return false; + + return true; } -static inline bool udphdr_ok(struct sk_buff *skb) +static bool udphdr_ok(struct sk_buff *skb) { - return skb->len >= skb_transport_offset(skb) + sizeof(struct udphdr); + return pskb_may_pull(skb, skb_transport_offset(skb) + + sizeof(struct udphdr)); } -static inline bool icmphdr_ok(struct sk_buff *skb) +static bool icmphdr_ok(struct sk_buff *skb) { - return skb->len >= skb_transport_offset(skb) + sizeof(struct icmphdr); + return pskb_may_pull(skb, skb_transport_offset(skb) + + sizeof(struct icmphdr)); } u64 flow_used_time(unsigned long flow_jiffies) @@ -99,62 +115,111 @@ u64 flow_used_time(unsigned long flow_jiffies) return cur_ms - idle_ms; } -static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key) +#define SW_FLOW_KEY_OFFSET(field) \ + (offsetof(struct sw_flow_key, field) + \ + FIELD_SIZEOF(struct sw_flow_key, field)) + +/** + * skip_exthdr - skip any IPv6 extension headers + * @skb: skbuff to parse + * @start: offset of first extension header + * @nexthdrp: Initially, points to the type of the extension header at @start. + * This function updates it to point to the extension header at the final + * offset. + * @tos_frag: Points to the @tos_frag member in a &struct sw_flow_key. This + * function sets an appropriate %OVS_FRAG_TYPE_* value. + * + * This is based on ipv6_skip_exthdr() but adds the updates to *@tos_frag. + * + * When there is more than one fragment header, this version reports whether + * the final fragment header that it examines is a first fragment. + * + * Returns the final payload offset, or -1 on error. + */ +static int skip_exthdr(const struct sk_buff *skb, int start, u8 *nexthdrp, + u8 *tos_frag) +{ + u8 nexthdr = *nexthdrp; + + while (ipv6_ext_hdr(nexthdr)) { + struct ipv6_opt_hdr _hdr, *hp; + int hdrlen; + + if (nexthdr == NEXTHDR_NONE) + return -1; + hp = skb_header_pointer(skb, start, sizeof(_hdr), &_hdr); + if (hp == NULL) + return -1; + if (nexthdr == NEXTHDR_FRAGMENT) { + __be16 _frag_off, *fp; + fp = skb_header_pointer(skb, + start+offsetof(struct frag_hdr, + frag_off), + sizeof(_frag_off), + &_frag_off); + if (fp == NULL) + return -1; + + *tos_frag &= ~OVS_FRAG_TYPE_MASK; + if (ntohs(*fp) & ~0x7) { + *tos_frag |= OVS_FRAG_TYPE_LATER; + break; + } + *tos_frag |= OVS_FRAG_TYPE_FIRST; + hdrlen = 8; + } else if (nexthdr == NEXTHDR_AUTH) + hdrlen = (hp->hdrlen+2)<<2; + else + hdrlen = ipv6_optlen(hp); + + nexthdr = hp->nexthdr; + start += hdrlen; + } + + *nexthdrp = nexthdr; + return start; +} + +static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key, + int *key_lenp) { unsigned int nh_ofs = skb_network_offset(skb); unsigned int nh_len; int payload_ofs; - int payload_len; struct ipv6hdr *nh; uint8_t nexthdr; + int err; - if (unlikely(skb->len < nh_ofs + sizeof(*nh))) - return -EINVAL; + *key_lenp = SW_FLOW_KEY_OFFSET(ipv6.addr); + + err = check_header(skb, nh_ofs + sizeof(*nh)); + if (unlikely(err)) + return err; nh = ipv6_hdr(skb); nexthdr = nh->nexthdr; payload_ofs = (u8 *)(nh + 1) - skb->data; - payload_len = ntohs(nh->payload_len); - - memcpy(key->ipv6_src, nh->saddr.in6_u.u6_addr8, sizeof(key->ipv6_src)); - memcpy(key->ipv6_dst, nh->daddr.in6_u.u6_addr8, sizeof(key->ipv6_dst)); - key->nw_tos = ipv6_get_dsfield(nh) & ~INET_ECN_MASK; - key->nw_proto = NEXTHDR_NONE; - /* We don't process jumbograms. */ - if (!payload_len) - return -EINVAL; + key->ip.proto = NEXTHDR_NONE; + key->ip.tos_frag = ipv6_get_dsfield(nh) & ~INET_ECN_MASK; + ipv6_addr_copy(&key->ipv6.addr.src, &nh->saddr); + ipv6_addr_copy(&key->ipv6.addr.dst, &nh->daddr); - if (unlikely(skb->len < nh_ofs + sizeof(*nh) + payload_len)) + payload_ofs = skip_exthdr(skb, payload_ofs, + &nexthdr, &key->ip.tos_frag); + if (unlikely(payload_ofs < 0)) return -EINVAL; - payload_ofs = ipv6_skip_exthdr(skb, payload_ofs, &nexthdr); - if (payload_ofs < 0) { - return -EINVAL; - } nh_len = payload_ofs - nh_ofs; - - /* Ensure that the payload length claimed is at least large enough - * for the headers we've already processed. */ - if (payload_len < nh_len - sizeof(*nh)) - return -EINVAL; - - /* Pull enough header bytes to account for the IP header plus the - * longest transport header that we parse, currently 20 bytes for TCP. - * To dig deeper than the transport header, transport parsers may need - * to pull more header bytes. - */ - if (unlikely(!pskb_may_pull(skb, min(nh_ofs + nh_len + 20, skb->len)))) - return -ENOMEM; - skb_set_transport_header(skb, nh_ofs + nh_len); - key->nw_proto = nexthdr; + key->ip.proto = nexthdr; return nh_len; } static bool icmp6hdr_ok(struct sk_buff *skb) { - return skb->len >= skb_transport_offset(skb) + sizeof(struct icmp6hdr); + return pskb_may_pull(skb, skb_transport_offset(skb) + + sizeof(struct icmp6hdr)); } #define TCP_FLAGS_OFFSET 13 @@ -164,18 +229,18 @@ void flow_used(struct sw_flow *flow, struct sk_buff *skb) { u8 tcp_flags = 0; - if (flow->key.dl_type == htons(ETH_P_IP) && - flow->key.nw_proto == IPPROTO_TCP) { + if (flow->key.eth.type == htons(ETH_P_IP) && + flow->key.ip.proto == IPPROTO_TCP) { u8 *tcp = (u8 *)tcp_hdr(skb); tcp_flags = *(tcp + TCP_FLAGS_OFFSET) & TCP_FLAG_MASK; } - spin_lock_bh(&flow->lock); + spin_lock(&flow->lock); flow->used = jiffies; flow->packet_count++; flow->byte_count += skb->len; flow->tcp_flags |= tcp_flags; - spin_unlock_bh(&flow->lock); + spin_unlock(&flow->lock); } struct sw_flow_actions *flow_actions_alloc(const struct nlattr *actions) @@ -208,19 +273,159 @@ struct sw_flow *flow_alloc(void) spin_lock_init(&flow->lock); atomic_set(&flow->refcnt, 1); + flow->sf_acts = NULL; flow->dead = false; return flow; } -void flow_free_tbl(struct tbl_node *node) +static struct hlist_head __rcu *find_bucket(struct flow_table * table, u32 hash) +{ + return flex_array_get(table->buckets, + (hash & (table->n_buckets - 1))); +} + +static struct flex_array __rcu *alloc_buckets(unsigned int n_buckets) { - struct sw_flow *flow = flow_cast(node); + struct flex_array __rcu *buckets; + int i, err; + + buckets = flex_array_alloc(sizeof(struct hlist_head *), + n_buckets, GFP_KERNEL); + if (!buckets) + return NULL; + + err = flex_array_prealloc(buckets, 0, n_buckets, GFP_KERNEL); + if (err) { + flex_array_free(buckets); + return NULL; + } + + for (i = 0; i < n_buckets; i++) + INIT_HLIST_HEAD((struct hlist_head *) + flex_array_get(buckets, i)); + return buckets; +} + +static void free_buckets(struct flex_array *buckets) +{ + flex_array_free(buckets); +} + +struct flow_table *flow_tbl_alloc(int new_size) +{ + struct flow_table *table = kmalloc(sizeof(*table), GFP_KERNEL); + + if (!table) + return NULL; + + table->buckets = alloc_buckets(new_size); + + if (!table->buckets) { + kfree(table); + return NULL; + } + table->n_buckets = new_size; + table->count = 0; + + return table; +} + +static void flow_free(struct sw_flow *flow) +{ flow->dead = true; flow_put(flow); } +void flow_tbl_destroy(struct flow_table *table) +{ + int i; + + if (!table) + return; + + for (i = 0; i < table->n_buckets; i++) { + struct sw_flow *flow; + struct hlist_head *head = flex_array_get(table->buckets, i); + struct hlist_node *node, *n; + + hlist_for_each_entry_safe(flow, node, n, head, hash_node) { + hlist_del_init_rcu(&flow->hash_node); + flow_free(flow); + } + } + + free_buckets(table->buckets); + kfree(table); +} + +static void flow_tbl_destroy_rcu_cb(struct rcu_head *rcu) +{ + struct flow_table *table = container_of(rcu, struct flow_table, rcu); + + flow_tbl_destroy(table); +} + +void flow_tbl_deferred_destroy(struct flow_table *table) +{ + if (!table) + return; + + call_rcu(&table->rcu, flow_tbl_destroy_rcu_cb); +} + +struct sw_flow *flow_tbl_next(struct flow_table *table, u32 *bucket, u32 *last) +{ + struct sw_flow *flow; + struct hlist_head *head; + struct hlist_node *n; + int i; + + while (*bucket < table->n_buckets) { + i = 0; + head = flex_array_get(table->buckets, *bucket); + hlist_for_each_entry_rcu(flow, n, head, hash_node) { + if (i < *last) { + i++; + continue; + } + *last = i + 1; + return flow; + } + (*bucket)++; + *last = 0; + } + + return NULL; +} + +struct flow_table *flow_tbl_expand(struct flow_table *table) +{ + struct flow_table *new_table; + int n_buckets = table->n_buckets * 2; + int i; + + new_table = flow_tbl_alloc(n_buckets); + if (!new_table) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < table->n_buckets; i++) { + struct sw_flow *flow; + struct hlist_head *head; + struct hlist_node *n, *pos; + + head = flex_array_get(table->buckets, i); + + hlist_for_each_entry_safe(flow, n, pos, head, hash_node) { + hlist_del_init_rcu(&flow->hash_node); + flow_tbl_insert(new_table, flow); + } + } + + return new_table; +} + /* RCU callback used by flow_deferred_free. */ static void rcu_free_flow_callback(struct rcu_head *rcu) { @@ -268,7 +473,7 @@ void flow_deferred_free_acts(struct sw_flow_actions *sf_acts) call_rcu(&sf_acts->rcu, rcu_free_acts_callback); } -static void parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) +static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) { struct qtag_prefix { __be16 eth_type; /* ETH_P_8021Q */ @@ -276,12 +481,15 @@ static void parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) }; struct qtag_prefix *qp; - if (skb->len < sizeof(struct qtag_prefix) + sizeof(__be16)) - return; + if (unlikely(!pskb_may_pull(skb, sizeof(struct qtag_prefix) + + sizeof(__be16)))) + return -ENOMEM; qp = (struct qtag_prefix *) skb->data; - key->dl_tci = qp->tci | htons(VLAN_TAG_PRESENT); + key->eth.tci = qp->tci | htons(VLAN_TAG_PRESENT); __skb_pull(skb, sizeof(struct qtag_prefix)); + + return 0; } static __be16 parse_ethertype(struct sk_buff *skb) @@ -302,9 +510,12 @@ static __be16 parse_ethertype(struct sk_buff *skb) if (ntohs(proto) >= 1536) return proto; - if (unlikely(skb->len < sizeof(struct llc_snap_hdr))) + if (skb->len < sizeof(struct llc_snap_hdr)) return htons(ETH_P_802_2); + if (unlikely(!pskb_may_pull(skb, sizeof(struct llc_snap_hdr)))) + return htons(0); + llc = (struct llc_snap_hdr *) skb->data; if (llc->dsap != LLC_SAP_SNAP || llc->ssap != LLC_SAP_SNAP || @@ -316,57 +527,68 @@ static __be16 parse_ethertype(struct sk_buff *skb) } static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, - int nh_len) + int *key_lenp, int nh_len) { - struct ipv6hdr *nh = ipv6_hdr(skb); - int icmp_len = ntohs(nh->payload_len) + sizeof(*nh) - nh_len; struct icmp6hdr *icmp = icmp6_hdr(skb); + int error = 0; + int key_len; /* The ICMPv6 type and code fields use the 16-bit transport port - * fields, so we need to store them in 16-bit network byte order. */ - key->tp_src = htons(icmp->icmp6_type); - key->tp_dst = htons(icmp->icmp6_code); - - if (!icmp->icmp6_code - && ((icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION) - || (icmp->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT))) { + * fields, so we need to store them in 16-bit network byte order. + */ + key->ipv6.tp.src = htons(icmp->icmp6_type); + key->ipv6.tp.dst = htons(icmp->icmp6_code); + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); + + if (icmp->icmp6_code == 0 && + (icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION || + icmp->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT)) { + int icmp_len = skb->len - skb_transport_offset(skb); struct nd_msg *nd; int offset; + key_len = SW_FLOW_KEY_OFFSET(ipv6.nd); + /* In order to process neighbor discovery options, we need the - * entire packet. */ - if (icmp_len < sizeof(*nd)) - goto invalid; - if (!pskb_may_pull(skb, skb_transport_offset(skb) + icmp_len)) - return -ENOMEM; + * entire packet. + */ + if (unlikely(icmp_len < sizeof(*nd))) + goto out; + if (unlikely(skb_linearize(skb))) { + error = -ENOMEM; + goto out; + } nd = (struct nd_msg *)skb_transport_header(skb); - memcpy(key->nd_target, &nd->target, sizeof(key->nd_target)); + ipv6_addr_copy(&key->ipv6.nd.target, &nd->target); + key_len = SW_FLOW_KEY_OFFSET(ipv6.nd); icmp_len -= sizeof(*nd); offset = 0; while (icmp_len >= 8) { - struct nd_opt_hdr *nd_opt = (struct nd_opt_hdr *)(nd->opt + offset); + struct nd_opt_hdr *nd_opt = + (struct nd_opt_hdr *)(nd->opt + offset); int opt_len = nd_opt->nd_opt_len * 8; - if (!opt_len || (opt_len > icmp_len)) + if (unlikely(!opt_len || opt_len > icmp_len)) goto invalid; - /* Store the link layer address if the appropriate option is - * provided. It is considered an error if the same link - * layer option is specified twice. */ + /* Store the link layer address if the appropriate + * option is provided. It is considered an error if + * the same link layer option is specified twice. + */ if (nd_opt->nd_opt_type == ND_OPT_SOURCE_LL_ADDR - && opt_len == 8) { - if (!is_zero_ether_addr(key->arp_sha)) + && opt_len == 8) { + if (unlikely(!is_zero_ether_addr(key->ipv6.nd.sll))) goto invalid; - memcpy(key->arp_sha, - &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN); + memcpy(key->ipv6.nd.sll, + &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN); } else if (nd_opt->nd_opt_type == ND_OPT_TARGET_LL_ADDR - && opt_len == 8) { - if (!is_zero_ether_addr(key->arp_tha)) + && opt_len == 8) { + if (unlikely(!is_zero_ether_addr(key->ipv6.nd.tll))) goto invalid; - memcpy(key->arp_tha, - &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN); + memcpy(key->ipv6.nd.tll, + &nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN); } icmp_len -= opt_len; @@ -374,14 +596,16 @@ static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key, } } - return 0; + goto out; invalid: - memset(key->nd_target, 0, sizeof(key->nd_target)); - memset(key->arp_sha, 0, sizeof(key->arp_sha)); - memset(key->arp_tha, 0, sizeof(key->arp_tha)); + memset(&key->ipv6.nd.target, 0, sizeof(key->ipv6.nd.target)); + memset(key->ipv6.nd.sll, 0, sizeof(key->ipv6.nd.sll)); + memset(key->ipv6.nd.tll, 0, sizeof(key->ipv6.nd.tll)); - return 0; +out: + *key_lenp = key_len; + return error; } /** @@ -390,8 +614,7 @@ invalid: * Ethernet header * @in_port: port number on which @skb was received. * @key: output flow key - * @is_frag: set to 1 if @skb contains an IPv4 fragment, or to 0 if @skb does - * not contain an IPv4 packet or if it is not a fragment. + * @key_lenp: length of output flow key * * The caller must ensure that skb->len >= ETH_HLEN. * @@ -410,100 +633,102 @@ invalid: * For other key->dl_type values it is left untouched. */ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key, - bool *is_frag) + int *key_lenp) { + int error = 0; + int key_len = SW_FLOW_KEY_OFFSET(eth); struct ethhdr *eth; memset(key, 0, sizeof(*key)); - key->tun_id = OVS_CB(skb)->tun_id; - key->in_port = in_port; - *is_frag = false; - - /* - * We would really like to pull as many bytes as we could possibly - * want to parse into the linear data area. Currently, for IPv4, - * that is: - * - * 14 Ethernet header - * 4 VLAN header - * 60 max IP header with options - * 20 max TCP/UDP/ICMP header (don't care about options) - * -- - * 98 - * - * But Xen only allocates 64 or 72 bytes for the linear data area in - * netback, which means that we would reallocate and copy the skb's - * linear data on every packet if we did that. So instead just pull 64 - * bytes, which is always sufficient without IP options, and then check - * whether we need to pull more later when we look at the IP header. - */ - if (!pskb_may_pull(skb, min(skb->len, 64u))) - return -ENOMEM; + + key->phy.priority = skb->priority; + key->phy.tun_id = OVS_CB(skb)->tun_id; + key->phy.in_port = in_port; skb_reset_mac_header(skb); - /* Link layer. */ + /* Link layer. We are guaranteed to have at least the 14 byte Ethernet + * header in the linear data area. + */ eth = eth_hdr(skb); - memcpy(key->dl_src, eth->h_source, ETH_ALEN); - memcpy(key->dl_dst, eth->h_dest, ETH_ALEN); + memcpy(key->eth.src, eth->h_source, ETH_ALEN); + memcpy(key->eth.dst, eth->h_dest, ETH_ALEN); - /* dl_type, dl_vlan, dl_vlan_pcp. */ __skb_pull(skb, 2 * ETH_ALEN); - if (eth->h_proto == htons(ETH_P_8021Q)) - parse_vlan(skb, key); - key->dl_type = parse_ethertype(skb); + + if (vlan_tx_tag_present(skb)) + key->eth.tci = htons(vlan_get_tci(skb)); + else if (eth->h_proto == htons(ETH_P_8021Q)) + if (unlikely(parse_vlan(skb, key))) + return -ENOMEM; + + key->eth.type = parse_ethertype(skb); + if (unlikely(key->eth.type == htons(0))) + return -ENOMEM; + skb_reset_network_header(skb); - __skb_push(skb, skb->data - (unsigned char *)eth); + __skb_push(skb, skb->data - skb_mac_header(skb)); /* Network layer. */ - if (key->dl_type == htons(ETH_P_IP)) { + if (key->eth.type == htons(ETH_P_IP)) { struct iphdr *nh; - int error; + __be16 offset; + + key_len = SW_FLOW_KEY_OFFSET(ipv4.addr); error = check_iphdr(skb); if (unlikely(error)) { if (error == -EINVAL) { skb->transport_header = skb->network_header; - return 0; + error = 0; } - return error; + goto out; } nh = ip_hdr(skb); - key->ipv4_src = nh->saddr; - key->ipv4_dst = nh->daddr; - key->nw_tos = nh->tos & ~INET_ECN_MASK; - key->nw_proto = nh->protocol; + key->ipv4.addr.src = nh->saddr; + key->ipv4.addr.dst = nh->daddr; + + key->ip.proto = nh->protocol; + key->ip.tos_frag = nh->tos & ~INET_ECN_MASK; + + offset = nh->frag_off & htons(IP_OFFSET); + if (offset) { + key->ip.tos_frag |= OVS_FRAG_TYPE_LATER; + goto out; + } + if (nh->frag_off & htons(IP_MF) || + skb_shinfo(skb)->gso_type & SKB_GSO_UDP) + key->ip.tos_frag |= OVS_FRAG_TYPE_FIRST; /* Transport layer. */ - if (!(nh->frag_off & htons(IP_MF | IP_OFFSET)) && - !(skb_shinfo(skb)->gso_type & SKB_GSO_UDP)) { - if (key->nw_proto == IPPROTO_TCP) { - if (tcphdr_ok(skb)) { - struct tcphdr *tcp = tcp_hdr(skb); - key->tp_src = tcp->source; - key->tp_dst = tcp->dest; - } - } else if (key->nw_proto == IPPROTO_UDP) { - if (udphdr_ok(skb)) { - struct udphdr *udp = udp_hdr(skb); - key->tp_src = udp->source; - key->tp_dst = udp->dest; - } - } else if (key->nw_proto == IPPROTO_ICMP) { - if (icmphdr_ok(skb)) { - struct icmphdr *icmp = icmp_hdr(skb); - /* The ICMP type and code fields use the 16-bit - * transport port fields, so we need to store them - * in 16-bit network byte order. */ - key->tp_src = htons(icmp->type); - key->tp_dst = htons(icmp->code); - } + if (key->ip.proto == IPPROTO_TCP) { + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (tcphdr_ok(skb)) { + struct tcphdr *tcp = tcp_hdr(skb); + key->ipv4.tp.src = tcp->source; + key->ipv4.tp.dst = tcp->dest; + } + } else if (key->ip.proto == IPPROTO_UDP) { + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (udphdr_ok(skb)) { + struct udphdr *udp = udp_hdr(skb); + key->ipv4.tp.src = udp->source; + key->ipv4.tp.dst = udp->dest; + } + } else if (key->ip.proto == IPPROTO_ICMP) { + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (icmphdr_ok(skb)) { + struct icmphdr *icmp = icmp_hdr(skb); + /* The ICMP type and code fields use the 16-bit + * transport port fields, so we need to store + * them in 16-bit network byte order. */ + key->ipv4.tp.src = htons(icmp->type); + key->ipv4.tp.dst = htons(icmp->code); } - } else - *is_frag = true; + } - } else if (key->dl_type == htons(ETH_P_ARP) && arphdr_ok(skb)) { + } else if (key->eth.type == htons(ETH_P_ARP) && arphdr_ok(skb)) { struct arp_eth_header *arp; arp = (struct arp_eth_header *)skb_network_header(skb); @@ -515,421 +740,623 @@ int flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key, /* We only match on the lower 8 bits of the opcode. */ if (ntohs(arp->ar_op) <= 0xff) - key->nw_proto = ntohs(arp->ar_op); - - if (key->nw_proto == ARPOP_REQUEST - || key->nw_proto == ARPOP_REPLY) { - memcpy(&key->ipv4_src, arp->ar_sip, sizeof(key->ipv4_src)); - memcpy(&key->ipv4_dst, arp->ar_tip, sizeof(key->ipv4_dst)); - memcpy(key->arp_sha, arp->ar_sha, ETH_ALEN); - memcpy(key->arp_tha, arp->ar_tha, ETH_ALEN); + key->ip.proto = ntohs(arp->ar_op); + + if (key->ip.proto == ARPOP_REQUEST + || key->ip.proto == ARPOP_REPLY) { + memcpy(&key->ipv4.addr.src, arp->ar_sip, sizeof(key->ipv4.addr.src)); + memcpy(&key->ipv4.addr.dst, arp->ar_tip, sizeof(key->ipv4.addr.dst)); + memcpy(key->ipv4.arp.sha, arp->ar_sha, ETH_ALEN); + memcpy(key->ipv4.arp.tha, arp->ar_tha, ETH_ALEN); + key_len = SW_FLOW_KEY_OFFSET(ipv4.arp); } } - } else if (key->dl_type == htons(ETH_P_IPV6)) { + } else if (key->eth.type == htons(ETH_P_IPV6)) { int nh_len; /* IPv6 Header + Extensions */ - nh_len = parse_ipv6hdr(skb, key); + nh_len = parse_ipv6hdr(skb, key, &key_len); if (unlikely(nh_len < 0)) { - if (nh_len == -EINVAL) { + if (nh_len == -EINVAL) skb->transport_header = skb->network_header; - return 0; - } - return nh_len; + else + error = nh_len; + goto out; } + if ((key->ip.tos_frag & OVS_FRAG_TYPE_MASK) == OVS_FRAG_TYPE_LATER) + goto out; + if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP) + key->ip.tos_frag |= OVS_FRAG_TYPE_FIRST; + /* Transport layer. */ - if (key->nw_proto == NEXTHDR_TCP) { + if (key->ip.proto == NEXTHDR_TCP) { + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); if (tcphdr_ok(skb)) { struct tcphdr *tcp = tcp_hdr(skb); - key->tp_src = tcp->source; - key->tp_dst = tcp->dest; + key->ipv6.tp.src = tcp->source; + key->ipv6.tp.dst = tcp->dest; } - } else if (key->nw_proto == NEXTHDR_UDP) { + } else if (key->ip.proto == NEXTHDR_UDP) { + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); if (udphdr_ok(skb)) { struct udphdr *udp = udp_hdr(skb); - key->tp_src = udp->source; - key->tp_dst = udp->dest; + key->ipv6.tp.src = udp->source; + key->ipv6.tp.dst = udp->dest; } - } else if (key->nw_proto == NEXTHDR_ICMP) { + } else if (key->ip.proto == NEXTHDR_ICMP) { + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); if (icmp6hdr_ok(skb)) { - int error = parse_icmpv6(skb, key, nh_len); + error = parse_icmpv6(skb, key, &key_len, nh_len); if (error < 0) - return error; + goto out; } } } - return 0; + +out: + *key_lenp = key_len; + return error; +} + +u32 flow_hash(const struct sw_flow_key *key, int key_len) +{ + return jhash2((u32 *)key, DIV_ROUND_UP(key_len, sizeof(u32)), hash_seed); +} + +struct sw_flow *flow_tbl_lookup(struct flow_table *table, + struct sw_flow_key *key, int key_len) +{ + struct sw_flow *flow; + struct hlist_node *n; + struct hlist_head *head; + u32 hash; + + hash = flow_hash(key, key_len); + + head = find_bucket(table, hash); + hlist_for_each_entry_rcu(flow, n, head, hash_node) { + + if (flow->hash == hash && + !memcmp(&flow->key, key, key_len)) { + return flow; + } + } + return NULL; +} + +void flow_tbl_insert(struct flow_table *table, struct sw_flow *flow) +{ + struct hlist_head *head; + + head = find_bucket(table, flow->hash); + hlist_add_head_rcu(&flow->hash_node, head); + table->count++; } -u32 flow_hash(const struct sw_flow_key *key) +void flow_tbl_remove(struct flow_table *table, struct sw_flow *flow) { - return jhash2((u32*)key, sizeof(*key) / sizeof(u32), hash_seed); + if (!hlist_unhashed(&flow->hash_node)) { + hlist_del_init_rcu(&flow->hash_node); + table->count--; + BUG_ON(table->count < 0); + } } -int flow_cmp(const struct tbl_node *node, void *key2_) +static int parse_tos_frag(struct sw_flow_key *swkey, u8 tos, u8 frag) { - const struct sw_flow_key *key1 = &flow_cast(node)->key; - const struct sw_flow_key *key2 = key2_; + if (tos & INET_ECN_MASK || frag > OVS_FRAG_TYPE_MAX) + return -EINVAL; - return !memcmp(key1, key2, sizeof(struct sw_flow_key)); + swkey->ip.tos_frag = tos | frag; + return 0; } +/* The size of the argument for each %OVS_KEY_ATTR_* Netlink attribute. */ +const u32 ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = { + [OVS_KEY_ATTR_PRIORITY] = 4, + [OVS_KEY_ATTR_TUN_ID] = 8, + [OVS_KEY_ATTR_IN_PORT] = 4, + [OVS_KEY_ATTR_ETHERNET] = sizeof(struct ovs_key_ethernet), + [OVS_KEY_ATTR_8021Q] = sizeof(struct ovs_key_8021q), + [OVS_KEY_ATTR_ETHERTYPE] = 2, + [OVS_KEY_ATTR_IPV4] = sizeof(struct ovs_key_ipv4), + [OVS_KEY_ATTR_IPV6] = sizeof(struct ovs_key_ipv6), + [OVS_KEY_ATTR_TCP] = sizeof(struct ovs_key_tcp), + [OVS_KEY_ATTR_UDP] = sizeof(struct ovs_key_udp), + [OVS_KEY_ATTR_ICMP] = sizeof(struct ovs_key_icmp), + [OVS_KEY_ATTR_ICMPV6] = sizeof(struct ovs_key_icmpv6), + [OVS_KEY_ATTR_ARP] = sizeof(struct ovs_key_arp), + [OVS_KEY_ATTR_ND] = sizeof(struct ovs_key_nd), +}; + /** * flow_from_nlattrs - parses Netlink attributes into a flow key. * @swkey: receives the extracted flow key. - * @key: Netlink attribute holding nested %ODP_KEY_ATTR_* Netlink attribute + * @key_lenp: number of bytes used in @swkey. + * @attr: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute * sequence. * * This state machine accepts the following forms, with [] for optional * elements and | for alternatives: * - * [tun_id] in_port ethernet [8021q] [ethertype \ + * [priority] [tun_id] [in_port] ethernet [8021q] [ethertype \ * [IPv4 [TCP|UDP|ICMP] | IPv6 [TCP|UDP|ICMPv6 [ND]] | ARP]] + * + * except that IPv4 or IPv6 terminates the sequence if its @ipv4_frag or + * @ipv6_frag member, respectively, equals %OVS_FRAG_TYPE_LATER. */ -int flow_from_nlattrs(struct sw_flow_key *swkey, const struct nlattr *attr) +int flow_from_nlattrs(struct sw_flow_key *swkey, int *key_lenp, + const struct nlattr *attr) { + int error = 0; + enum ovs_frag_type frag_type; const struct nlattr *nla; u16 prev_type; int rem; + int key_len; memset(swkey, 0, sizeof(*swkey)); - swkey->dl_type = htons(ETH_P_802_2); + swkey->phy.in_port = USHRT_MAX; + swkey->eth.type = htons(ETH_P_802_2); + key_len = SW_FLOW_KEY_OFFSET(eth); - prev_type = ODP_KEY_ATTR_UNSPEC; + prev_type = OVS_KEY_ATTR_UNSPEC; nla_for_each_nested(nla, attr, rem) { - static const u32 key_lens[ODP_KEY_ATTR_MAX + 1] = { - [ODP_KEY_ATTR_TUN_ID] = 8, - [ODP_KEY_ATTR_IN_PORT] = 4, - [ODP_KEY_ATTR_ETHERNET] = sizeof(struct odp_key_ethernet), - [ODP_KEY_ATTR_8021Q] = sizeof(struct odp_key_8021q), - [ODP_KEY_ATTR_ETHERTYPE] = 2, - [ODP_KEY_ATTR_IPV4] = sizeof(struct odp_key_ipv4), - [ODP_KEY_ATTR_IPV6] = sizeof(struct odp_key_ipv6), - [ODP_KEY_ATTR_TCP] = sizeof(struct odp_key_tcp), - [ODP_KEY_ATTR_UDP] = sizeof(struct odp_key_udp), - [ODP_KEY_ATTR_ICMP] = sizeof(struct odp_key_icmp), - [ODP_KEY_ATTR_ICMPV6] = sizeof(struct odp_key_icmpv6), - [ODP_KEY_ATTR_ARP] = sizeof(struct odp_key_arp), - [ODP_KEY_ATTR_ND] = sizeof(struct odp_key_nd), - }; - - const struct odp_key_ethernet *eth_key; - const struct odp_key_8021q *q_key; - const struct odp_key_ipv4 *ipv4_key; - const struct odp_key_ipv6 *ipv6_key; - const struct odp_key_tcp *tcp_key; - const struct odp_key_udp *udp_key; - const struct odp_key_icmp *icmp_key; - const struct odp_key_icmpv6 *icmpv6_key; - const struct odp_key_arp *arp_key; - const struct odp_key_nd *nd_key; - - int type = nla_type(nla); - - if (type > ODP_KEY_ATTR_MAX || nla_len(nla) != key_lens[type]) - return -EINVAL; + const struct ovs_key_ethernet *eth_key; + const struct ovs_key_8021q *q_key; + const struct ovs_key_ipv4 *ipv4_key; + const struct ovs_key_ipv6 *ipv6_key; + const struct ovs_key_tcp *tcp_key; + const struct ovs_key_udp *udp_key; + const struct ovs_key_icmp *icmp_key; + const struct ovs_key_icmpv6 *icmpv6_key; + const struct ovs_key_arp *arp_key; + const struct ovs_key_nd *nd_key; + + int type = nla_type(nla); + + if (type > OVS_KEY_ATTR_MAX || + nla_len(nla) != ovs_key_lens[type]) + goto invalid; #define TRANSITION(PREV_TYPE, TYPE) (((PREV_TYPE) << 16) | (TYPE)) switch (TRANSITION(prev_type, type)) { - case TRANSITION(ODP_KEY_ATTR_UNSPEC, ODP_KEY_ATTR_TUN_ID): - swkey->tun_id = nla_get_be64(nla); + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_PRIORITY): + swkey->phy.priority = nla_get_u32(nla); + break; + + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_TUN_ID): + case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_TUN_ID): + swkey->phy.tun_id = nla_get_be64(nla); break; - case TRANSITION(ODP_KEY_ATTR_UNSPEC, ODP_KEY_ATTR_IN_PORT): - case TRANSITION(ODP_KEY_ATTR_TUN_ID, ODP_KEY_ATTR_IN_PORT): + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_IN_PORT): + case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_IN_PORT): + case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_IN_PORT): if (nla_get_u32(nla) >= DP_MAX_PORTS) - return -EINVAL; - swkey->in_port = nla_get_u32(nla); + goto invalid; + swkey->phy.in_port = nla_get_u32(nla); break; - case TRANSITION(ODP_KEY_ATTR_IN_PORT, ODP_KEY_ATTR_ETHERNET): + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_ETHERNET): + case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_ETHERNET): + case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_ETHERNET): + case TRANSITION(OVS_KEY_ATTR_IN_PORT, OVS_KEY_ATTR_ETHERNET): eth_key = nla_data(nla); - memcpy(swkey->dl_src, eth_key->eth_src, ETH_ALEN); - memcpy(swkey->dl_dst, eth_key->eth_dst, ETH_ALEN); + memcpy(swkey->eth.src, eth_key->eth_src, ETH_ALEN); + memcpy(swkey->eth.dst, eth_key->eth_dst, ETH_ALEN); break; - case TRANSITION(ODP_KEY_ATTR_ETHERNET, ODP_KEY_ATTR_8021Q): + case TRANSITION(OVS_KEY_ATTR_ETHERNET, OVS_KEY_ATTR_8021Q): q_key = nla_data(nla); /* Only standard 0x8100 VLANs currently supported. */ if (q_key->q_tpid != htons(ETH_P_8021Q)) - return -EINVAL; + goto invalid; if (q_key->q_tci & htons(VLAN_TAG_PRESENT)) - return -EINVAL; - swkey->dl_tci = q_key->q_tci | htons(VLAN_TAG_PRESENT); + goto invalid; + swkey->eth.tci = q_key->q_tci | htons(VLAN_TAG_PRESENT); break; - case TRANSITION(ODP_KEY_ATTR_8021Q, ODP_KEY_ATTR_ETHERTYPE): - case TRANSITION(ODP_KEY_ATTR_ETHERNET, ODP_KEY_ATTR_ETHERTYPE): - swkey->dl_type = nla_get_be16(nla); - if (ntohs(swkey->dl_type) < 1536) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_8021Q, OVS_KEY_ATTR_ETHERTYPE): + case TRANSITION(OVS_KEY_ATTR_ETHERNET, OVS_KEY_ATTR_ETHERTYPE): + swkey->eth.type = nla_get_be16(nla); + if (ntohs(swkey->eth.type) < 1536) + goto invalid; break; - case TRANSITION(ODP_KEY_ATTR_ETHERTYPE, ODP_KEY_ATTR_IPV4): - if (swkey->dl_type != htons(ETH_P_IP)) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_IPV4): + key_len = SW_FLOW_KEY_OFFSET(ipv4.addr); + if (swkey->eth.type != htons(ETH_P_IP)) + goto invalid; ipv4_key = nla_data(nla); - swkey->ipv4_src = ipv4_key->ipv4_src; - swkey->ipv4_dst = ipv4_key->ipv4_dst; - swkey->nw_proto = ipv4_key->ipv4_proto; - swkey->nw_tos = ipv4_key->ipv4_tos; - if (swkey->nw_tos & INET_ECN_MASK) - return -EINVAL; + swkey->ip.proto = ipv4_key->ipv4_proto; + if (parse_tos_frag(swkey, ipv4_key->ipv4_tos, + ipv4_key->ipv4_frag)) + goto invalid; + swkey->ipv4.addr.src = ipv4_key->ipv4_src; + swkey->ipv4.addr.dst = ipv4_key->ipv4_dst; break; - case TRANSITION(ODP_KEY_ATTR_ETHERTYPE, ODP_KEY_ATTR_IPV6): - if (swkey->dl_type != htons(ETH_P_IPV6)) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_IPV6): + key_len = SW_FLOW_KEY_OFFSET(ipv6.addr); + if (swkey->eth.type != htons(ETH_P_IPV6)) + goto invalid; ipv6_key = nla_data(nla); - memcpy(swkey->ipv6_src, ipv6_key->ipv6_src, - sizeof(swkey->ipv6_src)); - memcpy(swkey->ipv6_dst, ipv6_key->ipv6_dst, - sizeof(swkey->ipv6_dst)); - swkey->nw_proto = ipv6_key->ipv6_proto; - swkey->nw_tos = ipv6_key->ipv6_tos; - if (swkey->nw_tos & INET_ECN_MASK) - return -EINVAL; + swkey->ip.proto = ipv6_key->ipv6_proto; + if (parse_tos_frag(swkey, ipv6_key->ipv6_tos, + ipv6_key->ipv6_frag)) + goto invalid; + memcpy(&swkey->ipv6.addr.src, ipv6_key->ipv6_src, + sizeof(swkey->ipv6.addr.src)); + memcpy(&swkey->ipv6.addr.dst, ipv6_key->ipv6_dst, + sizeof(swkey->ipv6.addr.dst)); break; - case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_TCP): - case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_TCP): - if (swkey->nw_proto != IPPROTO_TCP) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_TCP): + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (swkey->ip.proto != IPPROTO_TCP) + goto invalid; tcp_key = nla_data(nla); - swkey->tp_src = tcp_key->tcp_src; - swkey->tp_dst = tcp_key->tcp_dst; + swkey->ipv4.tp.src = tcp_key->tcp_src; + swkey->ipv4.tp.dst = tcp_key->tcp_dst; break; - case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_UDP): - case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_UDP): - if (swkey->nw_proto != IPPROTO_UDP) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_TCP): + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); + if (swkey->ip.proto != IPPROTO_TCP) + goto invalid; + tcp_key = nla_data(nla); + swkey->ipv6.tp.src = tcp_key->tcp_src; + swkey->ipv6.tp.dst = tcp_key->tcp_dst; + break; + + case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_UDP): + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (swkey->ip.proto != IPPROTO_UDP) + goto invalid; udp_key = nla_data(nla); - swkey->tp_src = udp_key->udp_src; - swkey->tp_dst = udp_key->udp_dst; + swkey->ipv4.tp.src = udp_key->udp_src; + swkey->ipv4.tp.dst = udp_key->udp_dst; break; - case TRANSITION(ODP_KEY_ATTR_IPV4, ODP_KEY_ATTR_ICMP): - if (swkey->nw_proto != IPPROTO_ICMP) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_UDP): + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); + if (swkey->ip.proto != IPPROTO_UDP) + goto invalid; + udp_key = nla_data(nla); + swkey->ipv6.tp.src = udp_key->udp_src; + swkey->ipv6.tp.dst = udp_key->udp_dst; + break; + + case TRANSITION(OVS_KEY_ATTR_IPV4, OVS_KEY_ATTR_ICMP): + key_len = SW_FLOW_KEY_OFFSET(ipv4.tp); + if (swkey->ip.proto != IPPROTO_ICMP) + goto invalid; icmp_key = nla_data(nla); - swkey->tp_src = htons(icmp_key->icmp_type); - swkey->tp_dst = htons(icmp_key->icmp_code); + swkey->ipv4.tp.src = htons(icmp_key->icmp_type); + swkey->ipv4.tp.dst = htons(icmp_key->icmp_code); break; - case TRANSITION(ODP_KEY_ATTR_IPV6, ODP_KEY_ATTR_ICMPV6): - if (swkey->nw_proto != IPPROTO_ICMPV6) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_IPV6, OVS_KEY_ATTR_ICMPV6): + key_len = SW_FLOW_KEY_OFFSET(ipv6.tp); + if (swkey->ip.proto != IPPROTO_ICMPV6) + goto invalid; icmpv6_key = nla_data(nla); - swkey->tp_src = htons(icmpv6_key->icmpv6_type); - swkey->tp_dst = htons(icmpv6_key->icmpv6_code); + swkey->ipv6.tp.src = htons(icmpv6_key->icmpv6_type); + swkey->ipv6.tp.dst = htons(icmpv6_key->icmpv6_code); break; - case TRANSITION(ODP_KEY_ATTR_ETHERTYPE, ODP_KEY_ATTR_ARP): - if (swkey->dl_type != htons(ETH_P_ARP)) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_ETHERTYPE, OVS_KEY_ATTR_ARP): + key_len = SW_FLOW_KEY_OFFSET(ipv4.arp); + if (swkey->eth.type != htons(ETH_P_ARP)) + goto invalid; arp_key = nla_data(nla); - swkey->ipv4_src = arp_key->arp_sip; - swkey->ipv4_dst = arp_key->arp_tip; + swkey->ipv4.addr.src = arp_key->arp_sip; + swkey->ipv4.addr.dst = arp_key->arp_tip; if (arp_key->arp_op & htons(0xff00)) - return -EINVAL; - swkey->nw_proto = ntohs(arp_key->arp_op); - memcpy(swkey->arp_sha, arp_key->arp_sha, ETH_ALEN); - memcpy(swkey->arp_tha, arp_key->arp_tha, ETH_ALEN); + goto invalid; + swkey->ip.proto = ntohs(arp_key->arp_op); + memcpy(swkey->ipv4.arp.sha, arp_key->arp_sha, ETH_ALEN); + memcpy(swkey->ipv4.arp.tha, arp_key->arp_tha, ETH_ALEN); break; - case TRANSITION(ODP_KEY_ATTR_ICMPV6, ODP_KEY_ATTR_ND): - if (swkey->tp_src != htons(NDISC_NEIGHBOUR_SOLICITATION) - && swkey->tp_src != htons(NDISC_NEIGHBOUR_ADVERTISEMENT)) - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_ICMPV6, OVS_KEY_ATTR_ND): + key_len = SW_FLOW_KEY_OFFSET(ipv6.nd); + if (swkey->ipv6.tp.src != htons(NDISC_NEIGHBOUR_SOLICITATION) + && swkey->ipv6.tp.src != htons(NDISC_NEIGHBOUR_ADVERTISEMENT)) + goto invalid; nd_key = nla_data(nla); - memcpy(swkey->nd_target, nd_key->nd_target, - sizeof(swkey->nd_target)); - memcpy(swkey->arp_sha, nd_key->nd_sll, ETH_ALEN); - memcpy(swkey->arp_tha, nd_key->nd_tll, ETH_ALEN); + memcpy(&swkey->ipv6.nd.target, nd_key->nd_target, + sizeof(swkey->ipv6.nd.target)); + memcpy(swkey->ipv6.nd.sll, nd_key->nd_sll, ETH_ALEN); + memcpy(swkey->ipv6.nd.tll, nd_key->nd_tll, ETH_ALEN); break; default: - return -EINVAL; + goto invalid; } prev_type = type; } if (rem) - return -EINVAL; + goto invalid; + frag_type = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK; switch (prev_type) { - case ODP_KEY_ATTR_UNSPEC: - return -EINVAL; + case OVS_KEY_ATTR_UNSPEC: + goto invalid; + + case OVS_KEY_ATTR_PRIORITY: + case OVS_KEY_ATTR_TUN_ID: + case OVS_KEY_ATTR_IN_PORT: + goto invalid; + + case OVS_KEY_ATTR_ETHERNET: + case OVS_KEY_ATTR_8021Q: + goto ok; + + case OVS_KEY_ATTR_ETHERTYPE: + if (swkey->eth.type == htons(ETH_P_IP) || + swkey->eth.type == htons(ETH_P_IPV6) || + swkey->eth.type == htons(ETH_P_ARP)) + goto invalid; + goto ok; + + case OVS_KEY_ATTR_IPV4: + if (frag_type == OVS_FRAG_TYPE_LATER) + goto ok; + if (swkey->ip.proto == IPPROTO_TCP || + swkey->ip.proto == IPPROTO_UDP || + swkey->ip.proto == IPPROTO_ICMP) + goto invalid; + goto ok; + + case OVS_KEY_ATTR_IPV6: + if (frag_type == OVS_FRAG_TYPE_LATER) + goto ok; + if (swkey->ip.proto == IPPROTO_TCP || + swkey->ip.proto == IPPROTO_UDP || + swkey->ip.proto == IPPROTO_ICMPV6) + goto invalid; + goto ok; - case ODP_KEY_ATTR_TUN_ID: - case ODP_KEY_ATTR_IN_PORT: - return -EINVAL; + case OVS_KEY_ATTR_ICMPV6: + if (swkey->ipv6.tp.src == htons(NDISC_NEIGHBOUR_SOLICITATION) || + swkey->ipv6.tp.src == htons(NDISC_NEIGHBOUR_ADVERTISEMENT) || + frag_type == OVS_FRAG_TYPE_LATER) + goto invalid; + goto ok; - case ODP_KEY_ATTR_ETHERNET: - case ODP_KEY_ATTR_8021Q: - return 0; + case OVS_KEY_ATTR_TCP: + case OVS_KEY_ATTR_UDP: + case OVS_KEY_ATTR_ICMP: + case OVS_KEY_ATTR_ND: + if (frag_type == OVS_FRAG_TYPE_LATER) + goto invalid; + goto ok; - case ODP_KEY_ATTR_ETHERTYPE: - if (swkey->dl_type == htons(ETH_P_IP) || - swkey->dl_type == htons(ETH_P_ARP)) - return -EINVAL; - return 0; + case OVS_KEY_ATTR_ARP: + goto ok; - case ODP_KEY_ATTR_IPV4: - if (swkey->nw_proto == IPPROTO_TCP || - swkey->nw_proto == IPPROTO_UDP || - swkey->nw_proto == IPPROTO_ICMP) - return -EINVAL; - return 0; + default: + WARN_ON_ONCE(1); + } - case ODP_KEY_ATTR_IPV6: - if (swkey->nw_proto == IPPROTO_TCP || - swkey->nw_proto == IPPROTO_UDP || - swkey->nw_proto == IPPROTO_ICMPV6) - return -EINVAL; - return 0; +invalid: + error = -EINVAL; + +ok: + *key_lenp = key_len; + return error; +} - case ODP_KEY_ATTR_ICMPV6: - if (swkey->tp_src == htons(NDISC_NEIGHBOUR_SOLICITATION) || - swkey->tp_src == htons(NDISC_NEIGHBOUR_ADVERTISEMENT)) +/** + * flow_metadata_from_nlattrs - parses Netlink attributes into a flow key. + * @in_port: receives the extracted input port. + * @tun_id: receives the extracted tunnel ID. + * @key: Netlink attribute holding nested %OVS_KEY_ATTR_* Netlink attribute + * sequence. + * + * This parses a series of Netlink attributes that form a flow key, which must + * take the same form accepted by flow_from_nlattrs(), but only enough of it to + * get the metadata, that is, the parts of the flow key that cannot be + * extracted from the packet itself. + */ +int flow_metadata_from_nlattrs(u32 *priority, u16 *in_port, __be64 *tun_id, + const struct nlattr *attr) +{ + const struct nlattr *nla; + u16 prev_type; + int rem; + + *in_port = USHRT_MAX; + *tun_id = 0; + *priority = 0; + + prev_type = OVS_KEY_ATTR_UNSPEC; + nla_for_each_nested(nla, attr, rem) { + int type = nla_type(nla); + + if (type > OVS_KEY_ATTR_MAX || nla_len(nla) != ovs_key_lens[type]) return -EINVAL; - return 0; - case ODP_KEY_ATTR_TCP: - case ODP_KEY_ATTR_UDP: - case ODP_KEY_ATTR_ICMP: - case ODP_KEY_ATTR_ARP: - case ODP_KEY_ATTR_ND: - return 0; - } + switch (TRANSITION(prev_type, type)) { + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_PRIORITY): + *priority = nla_get_u32(nla); + break; - WARN_ON_ONCE(1); - return -EINVAL; + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_TUN_ID): + case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_TUN_ID): + *tun_id = nla_get_be64(nla); + break; + + case TRANSITION(OVS_KEY_ATTR_UNSPEC, OVS_KEY_ATTR_IN_PORT): + case TRANSITION(OVS_KEY_ATTR_PRIORITY, OVS_KEY_ATTR_IN_PORT): + case TRANSITION(OVS_KEY_ATTR_TUN_ID, OVS_KEY_ATTR_IN_PORT): + if (nla_get_u32(nla) >= DP_MAX_PORTS) + return -EINVAL; + *in_port = nla_get_u32(nla); + break; + + default: + return 0; + } + + prev_type = type; + } + if (rem) + return -EINVAL; + return 0; } int flow_to_nlattrs(const struct sw_flow_key *swkey, struct sk_buff *skb) { - struct odp_key_ethernet *eth_key; + struct ovs_key_ethernet *eth_key; struct nlattr *nla; - if (swkey->tun_id != cpu_to_be64(0)) - NLA_PUT_BE64(skb, ODP_KEY_ATTR_TUN_ID, swkey->tun_id); + /* This is an imperfect sanity-check that FLOW_BUFSIZE doesn't need + * to be updated, but will at least raise awareness when new + * datapath key types are added. */ + BUILD_BUG_ON(__OVS_KEY_ATTR_MAX != 15); + + if (swkey->phy.priority) + NLA_PUT_U32(skb, OVS_KEY_ATTR_PRIORITY, swkey->phy.priority); + + if (swkey->phy.tun_id != cpu_to_be64(0)) + NLA_PUT_BE64(skb, OVS_KEY_ATTR_TUN_ID, swkey->phy.tun_id); - NLA_PUT_U32(skb, ODP_KEY_ATTR_IN_PORT, swkey->in_port); + if (swkey->phy.in_port != USHRT_MAX) + NLA_PUT_U32(skb, OVS_KEY_ATTR_IN_PORT, swkey->phy.in_port); - nla = nla_reserve(skb, ODP_KEY_ATTR_ETHERNET, sizeof(*eth_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_ETHERNET, sizeof(*eth_key)); if (!nla) goto nla_put_failure; eth_key = nla_data(nla); - memcpy(eth_key->eth_src, swkey->dl_src, ETH_ALEN); - memcpy(eth_key->eth_dst, swkey->dl_dst, ETH_ALEN); + memcpy(eth_key->eth_src, swkey->eth.src, ETH_ALEN); + memcpy(eth_key->eth_dst, swkey->eth.dst, ETH_ALEN); - if (swkey->dl_tci != htons(0)) { - struct odp_key_8021q q_key; + if (swkey->eth.tci != htons(0)) { + struct ovs_key_8021q q_key; q_key.q_tpid = htons(ETH_P_8021Q); - q_key.q_tci = swkey->dl_tci & ~htons(VLAN_TAG_PRESENT); - NLA_PUT(skb, ODP_KEY_ATTR_8021Q, sizeof(q_key), &q_key); + q_key.q_tci = swkey->eth.tci & ~htons(VLAN_TAG_PRESENT); + NLA_PUT(skb, OVS_KEY_ATTR_8021Q, sizeof(q_key), &q_key); } - if (swkey->dl_type == htons(ETH_P_802_2)) + if (swkey->eth.type == htons(ETH_P_802_2)) return 0; - NLA_PUT_BE16(skb, ODP_KEY_ATTR_ETHERTYPE, swkey->dl_type); + NLA_PUT_BE16(skb, OVS_KEY_ATTR_ETHERTYPE, swkey->eth.type); - if (swkey->dl_type == htons(ETH_P_IP)) { - struct odp_key_ipv4 *ipv4_key; + if (swkey->eth.type == htons(ETH_P_IP)) { + struct ovs_key_ipv4 *ipv4_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_IPV4, sizeof(*ipv4_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_IPV4, sizeof(*ipv4_key)); if (!nla) goto nla_put_failure; ipv4_key = nla_data(nla); - ipv4_key->ipv4_src = swkey->ipv4_src; - ipv4_key->ipv4_dst = swkey->ipv4_dst; - ipv4_key->ipv4_proto = swkey->nw_proto; - ipv4_key->ipv4_tos = swkey->nw_tos; - } else if (swkey->dl_type == htons(ETH_P_IPV6)) { - struct odp_key_ipv6 *ipv6_key; - - nla = nla_reserve(skb, ODP_KEY_ATTR_IPV6, sizeof(*ipv6_key)); + memset(ipv4_key, 0, sizeof(struct ovs_key_ipv4)); + ipv4_key->ipv4_src = swkey->ipv4.addr.src; + ipv4_key->ipv4_dst = swkey->ipv4.addr.dst; + ipv4_key->ipv4_proto = swkey->ip.proto; + ipv4_key->ipv4_tos = swkey->ip.tos_frag & ~INET_ECN_MASK; + ipv4_key->ipv4_frag = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK; + } else if (swkey->eth.type == htons(ETH_P_IPV6)) { + struct ovs_key_ipv6 *ipv6_key; + + nla = nla_reserve(skb, OVS_KEY_ATTR_IPV6, sizeof(*ipv6_key)); if (!nla) goto nla_put_failure; ipv6_key = nla_data(nla); - memcpy(ipv6_key->ipv6_src, swkey->ipv6_src, + memset(ipv6_key, 0, sizeof(struct ovs_key_ipv6)); + memcpy(ipv6_key->ipv6_src, &swkey->ipv6.addr.src, sizeof(ipv6_key->ipv6_src)); - memcpy(ipv6_key->ipv6_dst, swkey->ipv6_dst, + memcpy(ipv6_key->ipv6_dst, &swkey->ipv6.addr.dst, sizeof(ipv6_key->ipv6_dst)); - ipv6_key->ipv6_proto = swkey->nw_proto; - ipv6_key->ipv6_tos = swkey->nw_tos; - } else if (swkey->dl_type == htons(ETH_P_ARP)) { - struct odp_key_arp *arp_key; + ipv6_key->ipv6_proto = swkey->ip.proto; + ipv6_key->ipv6_tos = swkey->ip.tos_frag & ~INET_ECN_MASK; + ipv6_key->ipv6_frag = swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK; + } else if (swkey->eth.type == htons(ETH_P_ARP)) { + struct ovs_key_arp *arp_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_ARP, sizeof(*arp_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_ARP, sizeof(*arp_key)); if (!nla) goto nla_put_failure; arp_key = nla_data(nla); - arp_key->arp_sip = swkey->ipv4_src; - arp_key->arp_tip = swkey->ipv4_dst; - arp_key->arp_op = htons(swkey->nw_proto); - memcpy(arp_key->arp_sha, swkey->arp_sha, ETH_ALEN); - memcpy(arp_key->arp_tha, swkey->arp_tha, ETH_ALEN); + memset(arp_key, 0, sizeof(struct ovs_key_arp)); + arp_key->arp_sip = swkey->ipv4.addr.src; + arp_key->arp_tip = swkey->ipv4.addr.dst; + arp_key->arp_op = htons(swkey->ip.proto); + memcpy(arp_key->arp_sha, swkey->ipv4.arp.sha, ETH_ALEN); + memcpy(arp_key->arp_tha, swkey->ipv4.arp.tha, ETH_ALEN); } - if (swkey->dl_type == htons(ETH_P_IP) - || swkey->dl_type == htons(ETH_P_IPV6)) { + if ((swkey->eth.type == htons(ETH_P_IP) || + swkey->eth.type == htons(ETH_P_IPV6)) && + (swkey->ip.tos_frag & OVS_FRAG_TYPE_MASK) != OVS_FRAG_TYPE_LATER) { - if (swkey->nw_proto == IPPROTO_TCP) { - struct odp_key_tcp *tcp_key; + if (swkey->ip.proto == IPPROTO_TCP) { + struct ovs_key_tcp *tcp_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_TCP, sizeof(*tcp_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_TCP, sizeof(*tcp_key)); if (!nla) goto nla_put_failure; tcp_key = nla_data(nla); - tcp_key->tcp_src = swkey->tp_src; - tcp_key->tcp_dst = swkey->tp_dst; - } else if (swkey->nw_proto == IPPROTO_UDP) { - struct odp_key_udp *udp_key; + if (swkey->eth.type == htons(ETH_P_IP)) { + tcp_key->tcp_src = swkey->ipv4.tp.src; + tcp_key->tcp_dst = swkey->ipv4.tp.dst; + } else if (swkey->eth.type == htons(ETH_P_IPV6)) { + tcp_key->tcp_src = swkey->ipv6.tp.src; + tcp_key->tcp_dst = swkey->ipv6.tp.dst; + } + } else if (swkey->ip.proto == IPPROTO_UDP) { + struct ovs_key_udp *udp_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_UDP, sizeof(*udp_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_UDP, sizeof(*udp_key)); if (!nla) goto nla_put_failure; udp_key = nla_data(nla); - udp_key->udp_src = swkey->tp_src; - udp_key->udp_dst = swkey->tp_dst; - } else if (swkey->dl_type == htons(ETH_P_IP) - && swkey->nw_proto == IPPROTO_ICMP) { - struct odp_key_icmp *icmp_key; + if (swkey->eth.type == htons(ETH_P_IP)) { + udp_key->udp_src = swkey->ipv4.tp.src; + udp_key->udp_dst = swkey->ipv4.tp.dst; + } else if (swkey->eth.type == htons(ETH_P_IPV6)) { + udp_key->udp_src = swkey->ipv6.tp.src; + udp_key->udp_dst = swkey->ipv6.tp.dst; + } + } else if (swkey->eth.type == htons(ETH_P_IP) && + swkey->ip.proto == IPPROTO_ICMP) { + struct ovs_key_icmp *icmp_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_ICMP, sizeof(*icmp_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_ICMP, sizeof(*icmp_key)); if (!nla) goto nla_put_failure; icmp_key = nla_data(nla); - icmp_key->icmp_type = ntohs(swkey->tp_src); - icmp_key->icmp_code = ntohs(swkey->tp_dst); - } else if (swkey->dl_type == htons(ETH_P_IPV6) - && swkey->nw_proto == IPPROTO_ICMPV6) { - struct odp_key_icmpv6 *icmpv6_key; - - nla = nla_reserve(skb, ODP_KEY_ATTR_ICMPV6, sizeof(*icmpv6_key)); + icmp_key->icmp_type = ntohs(swkey->ipv4.tp.src); + icmp_key->icmp_code = ntohs(swkey->ipv4.tp.dst); + } else if (swkey->eth.type == htons(ETH_P_IPV6) && + swkey->ip.proto == IPPROTO_ICMPV6) { + struct ovs_key_icmpv6 *icmpv6_key; + + nla = nla_reserve(skb, OVS_KEY_ATTR_ICMPV6, + sizeof(*icmpv6_key)); if (!nla) goto nla_put_failure; icmpv6_key = nla_data(nla); - icmpv6_key->icmpv6_type = ntohs(swkey->tp_src); - icmpv6_key->icmpv6_code = ntohs(swkey->tp_dst); + icmpv6_key->icmpv6_type = ntohs(swkey->ipv6.tp.src); + icmpv6_key->icmpv6_code = ntohs(swkey->ipv6.tp.dst); - if (icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_SOLICITATION - || icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) { - struct odp_key_nd *nd_key; + if (icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_SOLICITATION || + icmpv6_key->icmpv6_type == NDISC_NEIGHBOUR_ADVERTISEMENT) { + struct ovs_key_nd *nd_key; - nla = nla_reserve(skb, ODP_KEY_ATTR_ND, sizeof(*nd_key)); + nla = nla_reserve(skb, OVS_KEY_ATTR_ND, sizeof(*nd_key)); if (!nla) goto nla_put_failure; nd_key = nla_data(nla); - memcpy(nd_key->nd_target, swkey->nd_target, + memcpy(nd_key->nd_target, &swkey->ipv6.nd.target, sizeof(nd_key->nd_target)); - memcpy(nd_key->nd_sll, swkey->arp_sha, ETH_ALEN); - memcpy(nd_key->nd_tll, swkey->arp_tha, ETH_ALEN); + memcpy(nd_key->nd_sll, swkey->ipv6.nd.sll, ETH_ALEN); + memcpy(nd_key->nd_tll, swkey->ipv6.nd.tll, ETH_ALEN); } } }