#include <linux/tcp.h>
#include <linux/udp.h>
#include <linux/in6.h>
+#include <linux/if_arp.h>
#include <linux/if_vlan.h>
#include <net/inet_ecn.h>
#include <net/ip.h>
#include <net/checksum.h>
-#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)
{
- 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);
+ nskb = skb_copy_expand(skb, headroom, skb_tailroom(skb), GFP_ATOMIC);
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;
}
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;
-
/* Verify we were given a vlan packet */
- if (vh->h_vlan_proto != htons(ETH_P_8021Q))
+ if (vh->h_vlan_proto != htons(ETH_P_8021Q) || skb->len < VLAN_ETH_HLEN)
return skb;
+ if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE)
+ skb->csum = csum_sub(skb->csum, csum_partial(skb->data
+ + ETH_HLEN, VLAN_HLEN, 0));
+
memmove(skb->data + VLAN_HLEN, skb->data, 2 * VLAN_ETH_ALEN);
eh = (struct ethhdr *)skb_pull(skb, VLAN_HLEN);
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)
{
- 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 << 13;
- mask = VLAN_PCP_MASK;
- }
+ __be16 tci = a->dl_tci.tci;
- skb = make_writable(skb, VLAN_HLEN, gfp);
+ skb = make_writable(skb, VLAN_HLEN);
if (!skb)
return ERR_PTR(-ENOMEM);
if (skb->protocol == htons(ETH_P_8021Q)) {
/* Modify vlan id, but maintain other TCI values */
- struct vlan_ethhdr *vh = vlan_eth_hdr(skb);
- vh->h_vlan_TCI = htons((ntohs(vh->h_vlan_TCI) & ~mask) | tci);
+ struct vlan_ethhdr *vh;
+ __be16 old_tci;
+
+ if (skb->len < VLAN_ETH_HLEN)
+ return skb;
+
+ vh = vlan_eth_hdr(skb);
+ old_tci = vh->h_vlan_TCI;
+
+ vh->h_vlan_TCI = tci;
+
+ if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE) {
+ __be16 diff[] = { ~old_tci, vh->h_vlan_TCI };
+
+ skb->csum = ~csum_partial((char *)diff, sizeof(diff),
+ ~skb->csum);
+ }
} else {
+ int err;
+
/* Add vlan header */
/* Set up checksumming pointers for checksum-deferred packets
* 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.
segs->next = NULL;
- segs = __vlan_put_tag(segs, tci);
+ /* GSO can change the checksum type so update.*/
+ compute_ip_summed(segs, true);
+
+ segs = __vlan_put_tag(segs, ntohs(tci));
err = -ENOMEM;
if (segs) {
- struct odp_flow_key segkey = *key;
err = execute_actions(dp, segs,
- &segkey, a + 1,
- n_actions - 1,
- gfp);
+ key, a + 1,
+ n_actions - 1);
}
if (unlikely(err)) {
} while (segs->next);
skb = segs;
+ compute_ip_summed(skb, true);
}
/* The hardware-accelerated version of vlan_put_tag() works
* e.g. vconfig(8)), so call the software-only version
* __vlan_put_tag() directly instead.
*/
- skb = __vlan_put_tag(skb, tci);
+ skb = __vlan_put_tag(skb, ntohs(tci));
if (!skb)
return ERR_PTR(-ENOMEM);
+
+ /* GSO doesn't fix up the hardware computed checksum so this
+ * will only be hit in the non-GSO case. */
+ if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE)
+ skb->csum = csum_add(skb->csum, csum_partial(skb->data
+ + ETH_HLEN, VLAN_HLEN, 0));
}
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)
{
- skb = make_writable(skb, 0, gfp);
- if (skb) {
+ skb = make_writable(skb, 0);
+ if (skb)
vlan_pull_tag(skb);
- key->dl_vlan = htons(ODP_VLAN_NONE);
- }
return skb;
}
static struct sk_buff *set_dl_addr(struct sk_buff *skb,
- const struct odp_action_dl_addr *a,
- gfp_t gfp)
+ const struct odp_action_dl_addr *a)
{
- skb = make_writable(skb, 0, gfp);
+ skb = make_writable(skb, 0);
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;
}
{
__be32 diff[] = { ~from, to };
-/* On older kernels, CHECKSUM_PARTIAL and CHECKSUM_COMPLETE are both defined
- * as CHECKSUM_HW. However, we can make some inferences so that we can update
- * the checksums appropriately. */
- enum {
- CSUM_PARTIAL, /* Partial checksum, skb->csum undefined. */
- CSUM_PACKET, /* In-packet checksum, skb->csum undefined. */
- CSUM_COMPLETE, /* In-packet checksum, skb->csum valid. */
- } csum_type;
-
- csum_type = CSUM_PACKET;
-#ifndef CHECKSUM_HW
- /* Newer kernel, just map between kernel types and ours. */
- if (skb->ip_summed == CHECKSUM_PARTIAL)
- csum_type = CSUM_PARTIAL;
- else if (skb->ip_summed == CHECKSUM_COMPLETE)
- csum_type = CSUM_COMPLETE;
-#else
- /* In theory this could be either CHECKSUM_PARTIAL or CHECKSUM_COMPLETE.
- * However, we should only get CHECKSUM_PARTIAL packets from Xen, which
- * uses some special fields to represent this (see below). Since we
- * can only make one type work, pick the one that actually happens in
- * practice. */
- if (skb->ip_summed == CHECKSUM_HW)
- csum_type = CSUM_COMPLETE;
-#endif
-#if defined(CONFIG_XEN) && defined(HAVE_PROTO_DATA_VALID)
- /* Xen has a special way of representing CHECKSUM_PARTIAL on older
- * kernels. */
- if (skb->proto_csum_blank)
- csum_type = CSUM_PARTIAL;
-#endif
-
- if (csum_type != CSUM_PARTIAL) {
+ if (OVS_CB(skb)->ip_summed != OVS_CSUM_PARTIAL) {
*sum = csum_fold(csum_partial((char *)diff, sizeof(diff),
~csum_unfold(*sum)));
- if (csum_type == CSUM_COMPLETE && pseudohdr)
+ if (OVS_CB(skb)->ip_summed == OVS_CSUM_COMPLETE && pseudohdr)
skb->csum = ~csum_partial((char *)diff, sizeof(diff),
~skb->csum);
} else if (pseudohdr)
csum_unfold(*sum)));
}
+static bool is_ip(struct sk_buff *skb, const struct odp_flow_key *key)
+{
+ return (key->dl_type == htons(ETH_P_IP) &&
+ skb->transport_header > skb->network_header);
+}
+
+static __sum16 *get_l4_checksum(struct sk_buff *skb, const struct odp_flow_key *key)
+{
+ int transport_len = skb->len - skb_transport_offset(skb);
+ if (key->nw_proto == IPPROTO_TCP) {
+ if (likely(transport_len >= sizeof(struct tcphdr)))
+ return &tcp_hdr(skb)->check;
+ } else if (key->nw_proto == IPPROTO_UDP) {
+ if (likely(transport_len >= sizeof(struct udphdr)))
+ return &udp_hdr(skb)->check;
+ }
+ return NULL;
+}
+
static struct sk_buff *set_nw_addr(struct sk_buff *skb,
- struct odp_flow_key *key,
- const struct odp_action_nw_addr *a,
- gfp_t gfp)
+ const struct odp_flow_key *key,
+ const struct odp_action_nw_addr *a)
{
- if (key->dl_type != htons(ETH_P_IP))
+ struct iphdr *nh;
+ __sum16 *check;
+ __be32 *nwaddr;
+
+ if (unlikely(!is_ip(skb, key)))
return skb;
- skb = make_writable(skb, 0, gfp);
- if (skb) {
- struct iphdr *nh = ip_hdr(skb);
- u32 *f = a->type == ODPAT_SET_NW_SRC ? &nh->saddr : &nh->daddr;
- u32 old = *f;
- u32 new = a->nw_addr;
-
- if (key->nw_proto == IPPROTO_TCP) {
- struct tcphdr *th = tcp_hdr(skb);
- update_csum(&th->check, skb, old, new, 1);
- } else if (key->nw_proto == IPPROTO_UDP) {
- struct udphdr *th = udp_hdr(skb);
- update_csum(&th->check, skb, old, new, 1);
- }
- update_csum(&nh->check, skb, old, new, 0);
- *f = new;
- }
+ skb = make_writable(skb, 0);
+ if (unlikely(!skb))
+ return NULL;
+
+ nh = ip_hdr(skb);
+ nwaddr = a->type == ODPAT_SET_NW_SRC ? &nh->saddr : &nh->daddr;
+
+ check = get_l4_checksum(skb, key);
+ if (likely(check))
+ update_csum(check, skb, *nwaddr, a->nw_addr, 1);
+ update_csum(&nh->check, skb, *nwaddr, a->nw_addr, 0);
+
+ *nwaddr = a->nw_addr;
+
return skb;
}
static struct sk_buff *set_nw_tos(struct sk_buff *skb,
- struct odp_flow_key *key,
- const struct odp_action_nw_tos *a,
- gfp_t gfp)
+ const struct odp_flow_key *key,
+ const struct odp_action_nw_tos *a)
{
- if (key->dl_type != htons(ETH_P_IP))
+ if (unlikely(!is_ip(skb, key)))
return skb;
- skb = make_writable(skb, 0, gfp);
+ skb = make_writable(skb, 0);
if (skb) {
struct iphdr *nh = ip_hdr(skb);
u8 *f = &nh->tos;
u8 new;
/* Set the DSCP bits and preserve the ECN bits. */
- new = (a->nw_tos & ~INET_ECN_MASK) | (nh->tos & INET_ECN_MASK);
- update_csum(&nh->check, skb, htons((uint16_t)old),
- htons((uint16_t)new), 0);
+ new = a->nw_tos | (nh->tos & INET_ECN_MASK);
+ update_csum(&nh->check, skb, htons((u16)old),
+ htons((u16)new), 0);
*f = new;
}
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)
{
- int check_ofs;
+ struct udphdr *th;
+ __sum16 *check;
+ __be16 *port;
- if (key->dl_type != htons(ETH_P_IP))
+ if (unlikely(!is_ip(skb, key)))
return skb;
- if (key->nw_proto == IPPROTO_TCP)
- check_ofs = offsetof(struct tcphdr, check);
- else if (key->nw_proto == IPPROTO_UDP)
- check_ofs = offsetof(struct udphdr, check);
- else
+ skb = make_writable(skb, 0);
+ if (unlikely(!skb))
+ return NULL;
+
+ /* Must follow make_writable() since that can move the skb data. */
+ check = get_l4_checksum(skb, key);
+ if (unlikely(!check))
return skb;
- skb = make_writable(skb, 0, gfp);
- if (skb) {
- struct udphdr *th = udp_hdr(skb);
- u16 *f = a->type == ODPAT_SET_TP_SRC ? &th->source : &th->dest;
- u16 old = *f;
- u16 new = a->tp_port;
- update_csum((u16*)(skb_transport_header(skb) + check_ofs),
- skb, old, new, 0);
- *f = new;
- }
- return skb;
-}
+ /*
+ * Update port and checksum.
+ *
+ * This is OK because source and destination port numbers are at the
+ * same offsets in both UDP and TCP headers, and get_l4_checksum() only
+ * supports those protocols.
+ */
+ th = udp_hdr(skb);
+ port = a->type == ODPAT_SET_TP_SRC ? &th->source : &th->dest;
+ update_csum(check, skb, *port, a->tp_port, 0);
+ *port = a->tp_port;
-static inline unsigned packet_length(const struct sk_buff *skb)
-{
- unsigned length = skb->len - ETH_HLEN;
- if (skb->protocol == htons(ETH_P_8021Q))
- length -= VLAN_HLEN;
- return length;
+ return skb;
}
-int dp_xmit_skb(struct sk_buff *skb)
+/**
+ * is_spoofed_arp - check for invalid ARP packet
+ *
+ * @skb: skbuff containing an Ethernet packet, with network header pointing
+ * just past the Ethernet and optional 802.1Q header.
+ * @key: flow key extracted from @skb by flow_extract()
+ *
+ * Returns true if @skb is an invalid Ethernet+IPv4 ARP packet: one with screwy
+ * or truncated header fields or one whose inner and outer Ethernet address
+ * differ.
+ */
+static bool is_spoofed_arp(struct sk_buff *skb, const struct odp_flow_key *key)
{
- struct datapath *dp = skb->dev->br_port->dp;
- int len = skb->len;
+ struct arp_eth_header *arp;
- 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;
- }
+ if (key->dl_type != htons(ETH_P_ARP))
+ return false;
- forward_ip_summed(skb);
- dev_queue_xmit(skb);
+ if (skb_network_offset(skb) + sizeof(struct arp_eth_header) > skb->len)
+ return true;
- return len;
+ arp = (struct arp_eth_header *)skb_network_header(skb);
+ return (arp->ar_hrd != htons(ARPHRD_ETHER) ||
+ arp->ar_pro != htons(ETH_P_IP) ||
+ arp->ar_hln != ETH_ALEN ||
+ arp->ar_pln != 4 ||
+ compare_ether_addr(arp->ar_sha, eth_hdr(skb)->h_source));
}
-static void
-do_output(struct datapath *dp, struct sk_buff *skb, int out_port)
+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:
kfree_skb(skb);
}
-/* Never consumes 'skb'. Returns a port that 'skb' should be sent to, -1 if
- * none. */
-static int output_group(struct datapath *dp, __u16 group,
- struct sk_buff *skb, gfp_t gfp)
-{
- struct dp_port_group *g = rcu_dereference(dp->groups[group]);
- int prev_port = -1;
- int i;
-
- 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)
- continue;
- if (prev_port != -1) {
- struct sk_buff *clone = skb_clone(skb, gfp);
- if (!clone)
- return -1;
- do_output(dp, clone, prev_port);
- }
- prev_port = p->port_no;
- }
- 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)
{
- skb = skb_clone(skb, gfp);
+ skb = skb_clone(skb, GFP_ATOMIC);
if (!skb)
return -ENOMEM;
return dp_output_control(dp, skb, _ODPL_ACTION_NR, arg);
* 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)
+ struct dp_port *dp_port)
{
struct odp_sflow_sample_header *hdr;
unsigned int actlen = n_actions * sizeof(union odp_action);
unsigned int hdrlen = sizeof(struct odp_sflow_sample_header);
struct sk_buff *nskb;
- nskb = skb_copy_expand(skb, actlen + hdrlen, 0, gfp);
+ nskb = skb_copy_expand(skb, actlen + hdrlen, 0, GFP_ATOMIC);
if (!nskb)
return;
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 union odp_action *a, int n_actions,
- gfp_t gfp)
+ const struct odp_flow_key *key,
+ const union odp_action *a, int n_actions)
{
/* Every output action needs a separate clone of 'skb', but the common
* case is just a single output action, so that doing a clone and
* 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 ||
net_random() < dp->sflow_probability)
- sflow_sample(dp, skb, a, n_actions, gfp, p);
+ sflow_sample(dp, skb, a, n_actions, p);
}
}
+ 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);
+ do_output(dp, skb_clone(skb, GFP_ATOMIC), prev_port);
prev_port = -1;
}
prev_port = a->output.port;
break;
- case ODPAT_OUTPUT_GROUP:
- prev_port = output_group(dp, a->output_group.group,
- skb, gfp);
- break;
-
case ODPAT_CONTROLLER:
- err = output_control(dp, skb, a->controller.arg, gfp);
+ err = output_control(dp, skb, a->controller.arg);
if (err) {
kfree_skb(skb);
return err;
}
break;
- case ODPAT_SET_VLAN_VID:
- case ODPAT_SET_VLAN_PCP:
- skb = modify_vlan_tci(dp, skb, key, a, n_actions, gfp);
+ case ODPAT_SET_TUNNEL:
+ OVS_CB(skb)->tun_id = a->tunnel.tun_id;
+ break;
+
+ case ODPAT_SET_DL_TCI:
+ skb = modify_vlan_tci(dp, skb, key, a, n_actions);
if (IS_ERR(skb))
return PTR_ERR(skb);
break;
case ODPAT_STRIP_VLAN:
- skb = strip_vlan(skb, key, gfp);
+ skb = strip_vlan(skb);
break;
case ODPAT_SET_DL_SRC:
case ODPAT_SET_DL_DST:
- skb = set_dl_addr(skb, &a->dl_addr, gfp);
+ skb = set_dl_addr(skb, &a->dl_addr);
break;
case ODPAT_SET_NW_SRC:
case ODPAT_SET_NW_DST:
- skb = set_nw_addr(skb, key, &a->nw_addr, gfp);
+ skb = set_nw_addr(skb, key, &a->nw_addr);
break;
case ODPAT_SET_NW_TOS:
- skb = set_nw_tos(skb, key, &a->nw_tos, gfp);
+ skb = set_nw_tos(skb, key, &a->nw_tos);
break;
case ODPAT_SET_TP_SRC:
case ODPAT_SET_TP_DST:
- skb = set_tp_port(skb, key, &a->tp_port, gfp);
+ skb = set_tp_port(skb, key, &a->tp_port);
+ break;
+
+ case ODPAT_SET_PRIORITY:
+ skb->priority = a->priority.priority;
+ break;
+
+ case ODPAT_POP_PRIORITY:
+ skb->priority = priority;
+ break;
+
+ case ODPAT_DROP_SPOOFED_ARP:
+ if (unlikely(is_spoofed_arp(skb, key)))
+ goto exit;
break;
}
if (!skb)
return -ENOMEM;
}
+exit:
if (prev_port != -1)
do_output(dp, skb, prev_port);
else