X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Factions.c;h=a6771b6c58c4d97c49725dde8dd2a82244259fad;hb=d9fce1ca2313d608ff7c92b69b3ec54661ab16b0;hp=b6d5488ce8a67f89e6dca193b38d556a9937b3fd;hpb=635c9298b91d0942aca39ba1f0d7ea5805ab618e;p=openvswitch diff --git a/datapath/actions.c b/datapath/actions.c index b6d5488c..a6771b6c 100644 --- a/datapath/actions.c +++ b/datapath/actions.c @@ -18,33 +18,21 @@ #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) +static struct sk_buff *make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp) { - if (skb_shared(skb) || skb_cloned(skb)) { + if (skb_cloned(skb)) { struct sk_buff *nskb; unsigned headroom = max(min_headroom, skb_headroom(skb)); 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,9 +46,7 @@ make_writable(struct sk_buff *skb, unsigned min_headroom, gfp_t gfp) return NULL; } - -static struct sk_buff * -vlan_pull_tag(struct sk_buff *skb) +static struct sk_buff *vlan_pull_tag(struct sk_buff *skb) { struct vlan_ethhdr *vh = vlan_eth_hdr(skb); struct ethhdr *eh; @@ -83,18 +69,16 @@ vlan_pull_tag(struct sk_buff *skb) return skb; } - -static struct sk_buff * -modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, - struct odp_flow_key *key, const union odp_action *a, - int n_actions, gfp_t gfp) +static struct sk_buff *modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, + const struct odp_flow_key *key, + const union odp_action *a, int n_actions, + gfp_t gfp) { u16 tci, mask; if (a->type == ODPAT_SET_VLAN_VID) { tci = ntohs(a->vlan_vid.vlan_vid); mask = VLAN_VID_MASK; - key->dl_vlan = htons(tci & mask); } else { tci = a->vlan_pcp.vlan_pcp << VLAN_PCP_SHIFT; mask = VLAN_PCP_MASK; @@ -118,6 +102,8 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, ~skb->csum); } } else { + int err; + /* Add vlan header */ /* Set up checksumming pointers for checksum-deferred packets @@ -125,7 +111,11 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, * when we send the packet out on the wire, and it will fail at * that point because skb_checksum_setup() will not look inside * an 802.1Q header. */ - vswitch_skb_checksum_setup(skb); + err = vswitch_skb_checksum_setup(skb); + if (unlikely(err)) { + kfree_skb(skb); + return ERR_PTR(err); + } /* GSO is not implemented for packets with an 802.1Q header, so * we have to do segmentation before we add that header. @@ -162,9 +152,8 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, segs = __vlan_put_tag(segs, tci); err = -ENOMEM; if (segs) { - struct odp_flow_key segkey = *key; err = execute_actions(dp, segs, - &segkey, a + 1, + key, a + 1, n_actions - 1, gfp); } @@ -204,14 +193,12 @@ modify_vlan_tci(struct datapath *dp, struct sk_buff *skb, return skb; } -static struct sk_buff *strip_vlan(struct sk_buff *skb, - struct odp_flow_key *key, gfp_t gfp) +static struct sk_buff *strip_vlan(struct sk_buff *skb, gfp_t gfp) { skb = make_writable(skb, 0, gfp); - if (skb) { + if (skb) vlan_pull_tag(skb); - key->dl_vlan = htons(ODP_VLAN_NONE); - } + return skb; } @@ -222,8 +209,10 @@ static struct sk_buff *set_dl_addr(struct sk_buff *skb, 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); + else + memcpy(eh->h_dest, a->dl_addr, ETH_ALEN); } return skb; } @@ -249,7 +238,7 @@ static void update_csum(__sum16 *sum, struct sk_buff *skb, } static struct sk_buff *set_nw_addr(struct sk_buff *skb, - struct odp_flow_key *key, + const struct odp_flow_key *key, const struct odp_action_nw_addr *a, gfp_t gfp) { @@ -277,7 +266,7 @@ static struct sk_buff *set_nw_addr(struct sk_buff *skb, } static struct sk_buff *set_nw_tos(struct sk_buff *skb, - struct odp_flow_key *key, + const struct odp_flow_key *key, const struct odp_action_nw_tos *a, gfp_t gfp) { @@ -292,7 +281,7 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb, u8 new; /* Set the DSCP bits and preserve the ECN bits. */ - new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK); + new = a->nw_tos | (nh->tos & INET_ECN_MASK); update_csum(&nh->check, skb, htons((uint16_t)old), htons((uint16_t)new), 0); *f = new; @@ -300,10 +289,9 @@ static struct sk_buff *set_nw_tos(struct sk_buff *skb, return skb; } -static struct sk_buff * -set_tp_port(struct sk_buff *skb, struct odp_flow_key *key, - const struct odp_action_tp_port *a, - gfp_t gfp) +static struct sk_buff *set_tp_port(struct sk_buff *skb, + const struct odp_flow_key *key, + const struct odp_action_tp_port *a, gfp_t gfp) { int check_ofs; @@ -330,50 +318,18 @@ set_tp_port(struct sk_buff *skb, struct odp_flow_key *key, return skb; } -static inline unsigned packet_length(const struct sk_buff *skb) +static void do_output(struct datapath *dp, struct sk_buff *skb, int out_port) { - unsigned length = skb->len - ETH_HLEN; - if (skb->protocol == htons(ETH_P_8021Q)) - length -= VLAN_HLEN; - 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; 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); + vport_send(p->vport, skb); return; error: @@ -392,8 +348,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); @@ -406,8 +362,8 @@ static int output_group(struct datapath *dp, __u16 group, return prev_port; } -static int -output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, gfp_t gfp) +static int output_control(struct datapath *dp, struct sk_buff *skb, u32 arg, + gfp_t gfp) { skb = skb_clone(skb, gfp); if (!skb) @@ -419,7 +375,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,13 +389,13 @@ 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); } /* Execute a list of actions against 'skb'. */ int execute_actions(struct datapath *dp, struct sk_buff *skb, - struct odp_flow_key *key, + const struct odp_flow_key *key, const union odp_action *a, int n_actions, gfp_t gfp) { @@ -448,10 +404,11 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, * then freeing the original skbuff is wasteful. So the following code * is slightly obscure just to avoid that. */ int prev_port = -1; + u32 priority = skb->priority; 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,8 +417,9 @@ 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) { do_output(dp, skb_clone(skb, gfp), prev_port); prev_port = -1; @@ -485,6 +443,10 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, } break; + case ODPAT_SET_TUNNEL: + OVS_CB(skb)->tun_id = 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); @@ -493,7 +455,7 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, break; case ODPAT_STRIP_VLAN: - skb = strip_vlan(skb, key, gfp); + skb = strip_vlan(skb, gfp); break; case ODPAT_SET_DL_SRC: @@ -514,6 +476,14 @@ int execute_actions(struct datapath *dp, struct sk_buff *skb, case ODPAT_SET_TP_DST: skb = set_tp_port(skb, key, &a->tp_port, gfp); break; + + case ODPAT_SET_PRIORITY: + skb->priority = a->priority.priority; + break; + + case ODPAT_POP_PRIORITY: + skb->priority = priority; + break; } if (!skb) return -ENOMEM;