X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=fed9830fe773c1244970a56cab232f4331364529;hb=823c5699d4de7bf726f988e1ca6197fb2400f388;hp=476786283e3d96065813abd765eacebfd46086bf;hpb=3c5f6de3856fa47aa184ca389dcb8d4fcc13d29a;p=openvswitch diff --git a/datapath/actions.c b/datapath/actions.c index 47678628..fed9830f 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -18,10 +18,11 @@ #include #include #include -#include "datapath.h" -#include "dp_dev.h" + #include "actions.h" +#include "datapath.h" #include "openvswitch/datapath-protocol.h" +#include "vport.h" static struct sk_buff * make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp) @@ -32,19 +33,7 @@ make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp) nskb = skb_copy_expand(skb, headroom, skb_tailroom(skb), gfp); if (nskb) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24) - /* Before 2.6.24 these fields were not copied when - * doing an skb_copy_expand. */ - nskb->ip_summed = skb->ip_summed; - nskb->csum = skb->csum; -#endif -#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID) - /* These fields are copied in skb_clone but not in - * skb_copy or related functions. We need to manually - * copy them over here. */ - nskb->proto_data_valid = skb->proto_data_valid; - nskb->proto_csum_blank = skb->proto_csum_blank; -#endif + set_skb_csum_bits(skb, nskb); kfree_skb(skb); return nskb; } @@ -58,6 +47,11 @@ make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp) return NULL; } +static void set_tunnel(struct sk_buff *skb, struct odp_flow_key *key, + __be32 tun_id) +{ + OVS_CB(skb)->tun_id = key->tun_id = tun_id; +} static struct sk_buff * vlan_pull_tag(struct sk_buff *skb) @@ -94,10 +88,11 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, if (a->type == ODPAT_SET_VLAN_VID) { tci = ntohs(a->vlan_vid.vlan_vid); mask = VLAN_VID_MASK; - key->dl_vlan = htons(tci & mask); + key->dl_vlan = a->vlan_vid.vlan_vid; } else { tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT; mask = VLAN_PCP_MASK; + key->dl_vlan_pcp = a->vlan_pcp.vlan_pcp; } skb = make_writable(skb, VLAN_HLEN, gfp); @@ -216,14 +211,20 @@ static struct sk_buff *strip_vlan(struct sk_buff *skb, } static struct sk_buff *set_dl_addr(struct sk_buff *skb, + struct odp_flow_key *key, const struct odp_action_dl_addr *a, gfp_t gfp) { skb = make_writable(skb, 0, gfp); if (skb) { struct ethhdr *eh = eth_hdr(skb); - memcpy(a->type == ODPAT_SET_DL_SRC ? eh->h_source : eh->h_dest, - a->dl_addr, ETH_ALEN); + if (a->type == ODPAT_SET_DL_SRC) { + memcpy(eh->h_source, a->dl_addr, ETH_ALEN); + memcpy(key->dl_src, a->dl_addr, ETH_ALEN); + } else { + memcpy(eh->h_dest, a->dl_addr, ETH_ALEN); + memcpy(key->dl_dst, a->dl_addr, ETH_ALEN); + } } return skb; } @@ -272,6 +273,11 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb, } update_csum(&nh->check, skb, old, new, 0); *f = new; + + if (a->type == ODPAT_SET_NW_SRC) + key->nw_src = a->nw_addr; + else + key->nw_dst = a->nw_addr; } return skb; } @@ -296,6 +302,7 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb, update_csum(&nh->check, skb, htons((uint16_t)old), htons((uint16_t)new), 0); *f = new; + key->nw_tos = a->nw_tos; } return skb; } @@ -326,6 +333,10 @@ set_tp_port(struct sk_buff *skb, struct odp_flow_key *key, update_csum((u16*)(skb_transport_header(skb) + check_ofs), skb, old, new, 0); *f = new; + if (a->type == ODPAT_SET_TP_SRC) + key->tp_src = a->tp_port; + else + key->tp_dst = a->tp_port; } return skb; } @@ -338,42 +349,27 @@ static inline unsigned packet_length(const struct sk_buff *skb) return length; } -int dp_xmit_skb(struct sk_buff *skb) -{ - struct datapath *dp = skb->dev->br_port->dp; - int len = skb->len; - - if (packet_length(skb) > skb->dev->mtu && !skb_is_gso(skb)) { - printk(KERN_WARNING "%s: dropped over-mtu packet: %d > %d\n", - dp_name(dp), packet_length(skb), skb->dev->mtu); - kfree_skb(skb); - return -E2BIG; - } - - forward_ip_summed(skb); - dev_queue_xmit(skb); - - return len; -} - static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port) { - struct net_bridge_port *p; - struct net_device *dev; + struct dp_port *p; + int mtu; if (!skb) goto error; - p = dp->ports[out_port]; + p = rcu_dereference(dp->ports[out_port]); if (!p) goto error; - dev = skb->dev = p->dev; - if (is_dp_dev(dev)) - dp_dev_recv(dev, skb); - else - dp_xmit_skb(skb); + mtu = vport_get_mtu(p->vport); + if (packet_length(skb) > mtu && !skb_is_gso(skb)) { + printk(KERN_WARNING "%s: dropped over-mtu packet: %d > %d\n", + dp_name(dp), packet_length(skb), mtu); + goto error; + } + + vport_send(p->vport, skb); return; error: @@ -392,8 +388,8 @@ static int output_group(struct datapath *dp, __u16 group, if (!g) return -1; for (i = 0; i < g->n_ports; i++) { - struct net_bridge_port *p = dp->ports[g->ports[i]]; - if (!p || skb->dev == p->dev) + struct dp_port *p = rcu_dereference(dp->ports[g->ports[i]]); + if (!p || OVS_CB(skb)->dp_port == p) continue; if (prev_port != -1) { struct sk_buff *clone = skb_clone(skb, gfp); @@ -419,7 +415,7 @@ output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, gfp_t gfp) * information about what happened to it. */ static void sflow_sample(struct datapath *dp, struct sk_buff *skb, const union odp_action *a, int n_actions, - gfp_t gfp, struct net_bridge_port *nbp) + gfp_t gfp, struct dp_port *dp_port) { struct odp_sflow_sample_header *hdr; unsigned int actlen = n_actions * sizeof(union odp_action); @@ -433,7 +429,7 @@ static void sflow_sample(struct datapath *dp, struct sk_buff *skb, memcpy(__skb_push(nskb, actlen), a, actlen); hdr = (struct odp_sflow_sample_header*)__skb_push(nskb, hdrlen); hdr->n_actions = n_actions; - hdr->sample_pool = atomic_read(&nbp->sflow_pool); + hdr->sample_pool = atomic_read(&dp_port->sflow_pool); dp_output_control(dp, nskb, _ODPL_SFLOW_NR, 0); } @@ -451,7 +447,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, int err; if (dp->sflow_probability) { - struct net_bridge_port *p = skb->dev->br_port; + struct dp_port *p = OVS_CB(skb)->dp_port; if (p) { atomic_inc(&p->sflow_pool); if (dp->sflow_probability == UINT_MAX || @@ -460,6 +456,8 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, } } + OVS_CB(skb)->tun_id = 0; + for (; n_actions > 0; a++, n_actions--) { WARN_ON_ONCE(skb_shared(skb)); if (prev_port != -1) { @@ -485,6 +483,10 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, } break; + case ODPAT_SET_TUNNEL: + set_tunnel(skb, key, a->tunnel.tun_id); + break; + case ODPAT_SET_VLAN_VID: case ODPAT_SET_VLAN_PCP: skb = modify_vlan_tci(dp, skb, key, a, n_actions, gfp); @@ -498,7 +500,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, case ODPAT_SET_DL_SRC: case ODPAT_SET_DL_DST: - skb = set_dl_addr(skb, &a->dl_addr, gfp); + skb = set_dl_addr(skb, key, &a->dl_addr, gfp); break; case ODPAT_SET_NW_SRC: