X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=83b531adfff3143fc29e59f2515527aea804c732;hb=0ff2282245a87f253843bf357988d7230139888f;hp=78712c6a9603e524423c8137514f263287ca196a;hpb=b85d8d61a6c3b9c2fa578fa62c795a93544764af;p=openvswitch diff --git a/datapath/actions.c b/datapath/actions.c index 78712c6a..83b531ad 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -39,20 +39,13 @@ static int make_writable(struct sk_buff *skb, int write_len) return pskb_expand_head(skb, 0, 0, GFP_ATOMIC); } -static int strip_vlan(struct sk_buff *skb) +/* remove VLAN header from packet and update csum accrodingly. */ +static int __pop_vlan_tci(struct sk_buff *skb, __be16 *current_tci) { struct ethhdr *eh; + struct vlan_ethhdr *veth; int err; - if (vlan_tx_tag_present(skb)) { - vlan_set_tci(skb, 0); - return 0; - } - - if (unlikely(skb->protocol != htons(ETH_P_8021Q) || - skb->len < VLAN_ETH_HLEN)) - return 0; - err = make_writable(skb, VLAN_ETH_HLEN); if (unlikely(err)) return err; @@ -61,9 +54,12 @@ static int strip_vlan(struct sk_buff *skb) skb->csum = csum_sub(skb->csum, csum_partial(skb->data + ETH_HLEN, VLAN_HLEN, 0)); + veth = (struct vlan_ethhdr *) skb->data; + *current_tci = veth->h_vlan_TCI; + memmove(skb->data + VLAN_HLEN, skb->data, 2 * ETH_ALEN); - eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN); + eh = (struct ethhdr *)__skb_pull(skb, VLAN_HLEN); skb->protocol = eh->h_proto; skb->mac_header += VLAN_HLEN; @@ -71,21 +67,52 @@ static int strip_vlan(struct sk_buff *skb) return 0; } -static int modify_vlan_tci(struct sk_buff *skb, __be16 tci) +static int pop_vlan(struct sk_buff *skb) { - if (!vlan_tx_tag_present(skb) && skb->protocol == htons(ETH_P_8021Q)) { - int err; + __be16 tci; + int err; - if (unlikely(skb->len < VLAN_ETH_HLEN)) + if (likely(vlan_tx_tag_present(skb))) { + vlan_set_tci(skb, 0); + } else { + if (unlikely(skb->protocol != htons(ETH_P_8021Q) || + skb->len < VLAN_ETH_HLEN)) return 0; - err = strip_vlan(skb); - if (unlikely(err)) + err = __pop_vlan_tci(skb, &tci); + if (err) return err; } + /* move next vlan tag to hw accel tag */ + if (likely(skb->protocol != htons(ETH_P_8021Q) || + skb->len < VLAN_ETH_HLEN)) + return 0; + + err = __pop_vlan_tci(skb, &tci); + if (unlikely(err)) + return err; __vlan_hwaccel_put_tag(skb, ntohs(tci)); + return 0; +} + +static int push_vlan(struct sk_buff *skb, __be16 new_tci) +{ + if (unlikely(vlan_tx_tag_present(skb))) { + u16 current_tag; + + /* push down current VLAN tag */ + current_tag = vlan_tx_tag_get(skb); + + if (!__vlan_put_tag(skb, current_tag)) + return -ENOMEM; + if (get_ip_summed(skb) == OVS_CSUM_COMPLETE) + skb->csum = csum_add(skb->csum, csum_partial(skb->data + + ETH_HLEN, VLAN_HLEN, 0)); + + } + __vlan_hwaccel_put_tag(skb, ntohs(new_tci)); return 0; } @@ -126,7 +153,7 @@ static int set_nw_addr(struct sk_buff *skb, const struct nlattr *a) return err; nh = ip_hdr(skb); - nwaddr = nla_type(a) == ODP_ACTION_ATTR_SET_NW_SRC ? &nh->saddr : &nh->daddr; + nwaddr = nla_type(a) == OVS_ACTION_ATTR_SET_NW_SRC ? &nh->saddr : &nh->daddr; check = get_l4_checksum(skb); if (likely(check)) @@ -192,7 +219,7 @@ static int set_tp_port(struct sk_buff *skb, const struct nlattr *a) * supports those protocols. */ th = udp_hdr(skb); - port = nla_type(a) == ODP_ACTION_ATTR_SET_TP_SRC ? &th->source : &th->dest; + port = nla_type(a) == OVS_ACTION_ATTR_SET_TP_SRC ? &th->source : &th->dest; inet_proto_csum_replace2(check, skb, *port, nla_get_be16(a), 0); *port = nla_get_be16(a); skb_clear_rxhash(skb); @@ -226,7 +253,7 @@ static int output_userspace(struct datapath *dp, struct sk_buff *skb, u64 arg) if (!skb) return -ENOMEM; - upcall.cmd = ODP_PACKET_CMD_ACTION; + upcall.cmd = OVS_PACKET_CMD_ACTION; upcall.key = &OVS_CB(skb)->flow->key; upcall.userdata = arg; upcall.sample_pool = 0; @@ -258,57 +285,59 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb, } switch (nla_type(a)) { - case ODP_ACTION_ATTR_OUTPUT: + case OVS_ACTION_ATTR_OUTPUT: prev_port = nla_get_u32(a); break; - case ODP_ACTION_ATTR_USERSPACE: + case OVS_ACTION_ATTR_USERSPACE: err = output_userspace(dp, skb, nla_get_u64(a)); break; - case ODP_ACTION_ATTR_SET_TUNNEL: + case OVS_ACTION_ATTR_SET_TUNNEL: OVS_CB(skb)->tun_id = nla_get_be64(a); break; - case ODP_ACTION_ATTR_SET_DL_TCI: - err = modify_vlan_tci(skb, nla_get_be16(a)); + case OVS_ACTION_ATTR_PUSH_VLAN: + err = push_vlan(skb, nla_get_be16(a)); + if (unlikely(err)) /* skb already freed */ + return err; break; - case ODP_ACTION_ATTR_STRIP_VLAN: - err = strip_vlan(skb); + case OVS_ACTION_ATTR_POP_VLAN: + err = pop_vlan(skb); break; - case ODP_ACTION_ATTR_SET_DL_SRC: + case OVS_ACTION_ATTR_SET_DL_SRC: err = make_writable(skb, ETH_HLEN); if (likely(!err)) memcpy(eth_hdr(skb)->h_source, nla_data(a), ETH_ALEN); break; - case ODP_ACTION_ATTR_SET_DL_DST: + case OVS_ACTION_ATTR_SET_DL_DST: err = make_writable(skb, ETH_HLEN); if (likely(!err)) memcpy(eth_hdr(skb)->h_dest, nla_data(a), ETH_ALEN); break; - case ODP_ACTION_ATTR_SET_NW_SRC: - case ODP_ACTION_ATTR_SET_NW_DST: + case OVS_ACTION_ATTR_SET_NW_SRC: + case OVS_ACTION_ATTR_SET_NW_DST: err = set_nw_addr(skb, a); break; - case ODP_ACTION_ATTR_SET_NW_TOS: + case OVS_ACTION_ATTR_SET_NW_TOS: err = set_nw_tos(skb, nla_get_u8(a)); break; - case ODP_ACTION_ATTR_SET_TP_SRC: - case ODP_ACTION_ATTR_SET_TP_DST: + case OVS_ACTION_ATTR_SET_TP_SRC: + case OVS_ACTION_ATTR_SET_TP_DST: err = set_tp_port(skb, a); break; - case ODP_ACTION_ATTR_SET_PRIORITY: + case OVS_ACTION_ATTR_SET_PRIORITY: skb->priority = nla_get_u32(a); break; - case ODP_ACTION_ATTR_POP_PRIORITY: + case OVS_ACTION_ATTR_POP_PRIORITY: skb->priority = priority; break; } @@ -345,7 +374,7 @@ static void sflow_sample(struct datapath *dp, struct sk_buff *skb, if (unlikely(!nskb)) return; - upcall.cmd = ODP_PACKET_CMD_SAMPLE; + upcall.cmd = OVS_PACKET_CMD_SAMPLE; upcall.key = &OVS_CB(skb)->flow->key; upcall.userdata = 0; upcall.sample_pool = atomic_read(&p->sflow_pool);