2009-07-08 13:19:16 -07:00
|
|
|
/*
|
2013-06-17 07:51:00 -07:00
|
|
|
* Copyright (c) 2007-2013 Nicira, Inc.
|
2009-06-15 15:11:30 -07:00
|
|
|
*
|
2011-11-16 13:39:40 -08:00
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of version 2 of the GNU General Public
|
|
|
|
* License as published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
* 02110-1301, USA
|
2009-07-08 13:19:16 -07:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "flow.h"
|
2010-03-04 17:55:44 -05:00
|
|
|
#include "datapath.h"
|
2011-11-07 15:53:01 -08:00
|
|
|
#include <linux/uaccess.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/netdevice.h>
|
|
|
|
#include <linux/etherdevice.h>
|
|
|
|
#include <linux/if_ether.h>
|
|
|
|
#include <linux/if_vlan.h>
|
|
|
|
#include <net/llc_pdu.h>
|
|
|
|
#include <linux/kernel.h>
|
2010-04-02 16:46:18 -04:00
|
|
|
#include <linux/jhash.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/jiffies.h>
|
|
|
|
#include <linux/llc.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/in.h>
|
|
|
|
#include <linux/rcupdate.h>
|
2009-07-16 12:58:28 -07:00
|
|
|
#include <linux/if_arp.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/ip.h>
|
2010-12-29 19:03:46 -08:00
|
|
|
#include <linux/ipv6.h>
|
2013-08-22 20:24:43 +12:00
|
|
|
#include <linux/sctp.h>
|
2013-10-23 14:34:39 -07:00
|
|
|
#include <linux/smp.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <linux/tcp.h>
|
|
|
|
#include <linux/udp.h>
|
|
|
|
#include <linux/icmp.h>
|
2010-12-29 19:03:46 -08:00
|
|
|
#include <linux/icmpv6.h>
|
2011-09-09 19:09:47 -07:00
|
|
|
#include <linux/rculist.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
#include <net/ip.h>
|
2010-12-29 19:03:46 -08:00
|
|
|
#include <net/ipv6.h>
|
2011-02-01 22:54:11 -08:00
|
|
|
#include <net/ndisc.h>
|
2009-07-08 13:19:16 -07:00
|
|
|
|
2010-12-29 22:13:15 -08:00
|
|
|
#include "vlan.h"
|
|
|
|
|
2013-09-11 20:26:11 -07:00
|
|
|
u64 ovs_flow_used_time(unsigned long flow_jiffies)
|
2013-06-17 07:51:00 -07:00
|
|
|
{
|
2013-09-11 20:26:11 -07:00
|
|
|
struct timespec cur_ts;
|
|
|
|
u64 cur_ms, idle_ms;
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2013-09-11 20:26:11 -07:00
|
|
|
ktime_get_ts(&cur_ts);
|
|
|
|
idle_ms = jiffies_to_msecs(jiffies - flow_jiffies);
|
|
|
|
cur_ms = (u64)cur_ts.tv_sec * MSEC_PER_SEC +
|
|
|
|
cur_ts.tv_nsec / NSEC_PER_MSEC;
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2013-09-11 20:26:11 -07:00
|
|
|
return cur_ms - idle_ms;
|
2013-08-27 11:21:26 -07:00
|
|
|
}
|
|
|
|
|
2013-10-28 13:54:39 -07:00
|
|
|
#define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2013-10-23 14:34:39 -07:00
|
|
|
void ovs_flow_stats_update(struct sw_flow *flow, struct sk_buff *skb)
|
2013-06-17 07:51:00 -07:00
|
|
|
{
|
2013-12-05 15:50:27 -08:00
|
|
|
struct flow_stats *stats;
|
2013-10-28 13:54:39 -07:00
|
|
|
__be16 tcp_flags = 0;
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (!flow->stats.is_percpu)
|
|
|
|
stats = flow->stats.stat;
|
|
|
|
else
|
|
|
|
stats = this_cpu_ptr(flow->stats.cpu_stats);
|
|
|
|
|
2013-09-11 20:26:11 -07:00
|
|
|
if ((flow->key.eth.type == htons(ETH_P_IP) ||
|
|
|
|
flow->key.eth.type == htons(ETH_P_IPV6)) &&
|
|
|
|
flow->key.ip.proto == IPPROTO_TCP &&
|
|
|
|
likely(skb->len >= skb_transport_offset(skb) + sizeof(struct tcphdr))) {
|
2013-10-28 13:54:39 -07:00
|
|
|
tcp_flags = TCP_FLAGS_BE16(tcp_hdr(skb));
|
2013-07-03 09:18:27 -07:00
|
|
|
}
|
2013-06-17 07:51:00 -07:00
|
|
|
|
2013-10-23 14:34:39 -07:00
|
|
|
spin_lock(&stats->lock);
|
|
|
|
stats->used = jiffies;
|
|
|
|
stats->packet_count++;
|
|
|
|
stats->byte_count += skb->len;
|
|
|
|
stats->tcp_flags |= tcp_flags;
|
|
|
|
spin_unlock(&stats->lock);
|
|
|
|
}
|
|
|
|
|
2013-12-17 15:43:30 -08:00
|
|
|
static void stats_read(struct flow_stats *stats, bool lock_bh,
|
2013-12-05 15:50:27 -08:00
|
|
|
struct ovs_flow_stats *ovs_stats,
|
|
|
|
unsigned long *used, __be16 *tcp_flags)
|
2013-10-23 14:34:39 -07:00
|
|
|
{
|
2013-12-17 15:43:30 -08:00
|
|
|
if (lock_bh)
|
|
|
|
spin_lock_bh(&stats->lock);
|
|
|
|
else
|
|
|
|
spin_lock(&stats->lock);
|
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (time_after(stats->used, *used))
|
|
|
|
*used = stats->used;
|
|
|
|
*tcp_flags |= stats->tcp_flags;
|
|
|
|
ovs_stats->n_packets += stats->packet_count;
|
|
|
|
ovs_stats->n_bytes += stats->byte_count;
|
2013-12-17 15:43:30 -08:00
|
|
|
|
|
|
|
if (lock_bh)
|
|
|
|
spin_unlock_bh(&stats->lock);
|
|
|
|
else
|
|
|
|
spin_unlock(&stats->lock);
|
2013-12-05 15:50:27 -08:00
|
|
|
}
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
void ovs_flow_stats_get(struct sw_flow *flow, struct ovs_flow_stats *ovs_stats,
|
|
|
|
unsigned long *used, __be16 *tcp_flags)
|
|
|
|
{
|
|
|
|
int cpu, cur_cpu;
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
*used = 0;
|
|
|
|
*tcp_flags = 0;
|
|
|
|
memset(ovs_stats, 0, sizeof(*ovs_stats));
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (!flow->stats.is_percpu) {
|
2013-12-17 15:43:30 -08:00
|
|
|
stats_read(flow->stats.stat, true, ovs_stats, used, tcp_flags);
|
2013-12-05 15:50:27 -08:00
|
|
|
} else {
|
|
|
|
cur_cpu = get_cpu();
|
2013-12-17 15:43:30 -08:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
struct flow_stats *stats;
|
2013-12-17 15:43:30 -08:00
|
|
|
bool lock_bh;
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
stats = per_cpu_ptr(flow->stats.cpu_stats, cpu);
|
2013-12-17 15:43:30 -08:00
|
|
|
lock_bh = (cpu == cur_cpu);
|
|
|
|
stats_read(stats, lock_bh, ovs_stats, used, tcp_flags);
|
2013-12-05 15:50:27 -08:00
|
|
|
}
|
|
|
|
put_cpu();
|
2013-10-23 14:34:39 -07:00
|
|
|
}
|
2013-12-05 15:50:27 -08:00
|
|
|
}
|
|
|
|
|
2013-12-17 15:43:30 -08:00
|
|
|
static void stats_reset(struct flow_stats *stats, bool lock_bh)
|
2013-12-05 15:50:27 -08:00
|
|
|
{
|
2013-12-17 15:43:30 -08:00
|
|
|
if (lock_bh)
|
|
|
|
spin_lock_bh(&stats->lock);
|
|
|
|
else
|
|
|
|
spin_lock(&stats->lock);
|
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
stats->used = 0;
|
|
|
|
stats->packet_count = 0;
|
|
|
|
stats->byte_count = 0;
|
|
|
|
stats->tcp_flags = 0;
|
2013-12-17 15:43:30 -08:00
|
|
|
|
|
|
|
if (lock_bh)
|
|
|
|
spin_unlock_bh(&stats->lock);
|
|
|
|
else
|
|
|
|
spin_unlock(&stats->lock);
|
2013-10-23 14:34:39 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
void ovs_flow_stats_clear(struct sw_flow *flow)
|
|
|
|
{
|
|
|
|
int cpu, cur_cpu;
|
|
|
|
|
2013-12-05 15:50:27 -08:00
|
|
|
if (!flow->stats.is_percpu) {
|
2013-12-17 15:43:30 -08:00
|
|
|
stats_reset(flow->stats.stat, true);
|
2013-12-05 15:50:27 -08:00
|
|
|
} else {
|
|
|
|
cur_cpu = get_cpu();
|
|
|
|
|
|
|
|
for_each_possible_cpu(cpu) {
|
2013-12-17 15:43:30 -08:00
|
|
|
bool lock_bh;
|
2013-10-23 14:34:39 -07:00
|
|
|
|
2013-12-17 15:43:30 -08:00
|
|
|
lock_bh = (cpu == cur_cpu);
|
|
|
|
stats_reset(per_cpu_ptr(flow->stats.cpu_stats, cpu), lock_bh);
|
2013-12-05 15:50:27 -08:00
|
|
|
}
|
|
|
|
put_cpu();
|
2013-10-23 14:34:39 -07:00
|
|
|
}
|
2013-06-17 07:51:00 -07:00
|
|
|
}
|
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
static bool arphdr_ok(struct sk_buff *skb)
|
2009-07-16 12:58:28 -07:00
|
|
|
{
|
2011-05-10 11:48:36 -07:00
|
|
|
return pskb_may_pull(skb, skb_network_offset(skb) +
|
|
|
|
sizeof(struct arp_eth_header));
|
2009-07-16 12:58:28 -07:00
|
|
|
}
|
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
static int check_iphdr(struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2010-08-27 12:32:05 -07:00
|
|
|
unsigned int nh_ofs = skb_network_offset(skb);
|
|
|
|
unsigned int ip_len;
|
2011-05-10 11:48:36 -07:00
|
|
|
int err;
|
2010-08-27 12:32:05 -07:00
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
err = check_header(skb, nh_ofs + sizeof(struct iphdr));
|
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
2010-08-27 12:32:05 -07:00
|
|
|
|
|
|
|
ip_len = ip_hdrlen(skb);
|
2011-05-10 11:48:36 -07:00
|
|
|
if (unlikely(ip_len < sizeof(struct iphdr) ||
|
|
|
|
skb->len < nh_ofs + ip_len))
|
2010-08-27 12:32:05 -07:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
skb_set_transport_header(skb, nh_ofs + ip_len);
|
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
static bool tcphdr_ok(struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
|
|
|
int th_ofs = skb_transport_offset(skb);
|
2011-05-10 11:48:36 -07:00
|
|
|
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;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
static bool udphdr_ok(struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-05-10 11:48:36 -07:00
|
|
|
return pskb_may_pull(skb, skb_transport_offset(skb) +
|
|
|
|
sizeof(struct udphdr));
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2013-08-22 20:24:43 +12:00
|
|
|
static bool sctphdr_ok(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
return pskb_may_pull(skb, skb_transport_offset(skb) +
|
|
|
|
sizeof(struct sctphdr));
|
|
|
|
}
|
|
|
|
|
2011-11-07 15:53:01 -08:00
|
|
|
static bool icmphdr_ok(struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2011-05-10 11:48:36 -07:00
|
|
|
return pskb_may_pull(skb, skb_transport_offset(skb) +
|
|
|
|
sizeof(struct icmphdr));
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
static int parse_ipv6hdr(struct sk_buff *skb, struct sw_flow_key *key)
|
2010-12-29 19:03:46 -08:00
|
|
|
{
|
|
|
|
unsigned int nh_ofs = skb_network_offset(skb);
|
|
|
|
unsigned int nh_len;
|
|
|
|
int payload_ofs;
|
|
|
|
struct ipv6hdr *nh;
|
|
|
|
uint8_t nexthdr;
|
2011-12-01 16:09:05 -08:00
|
|
|
__be16 frag_off;
|
2011-05-10 11:48:36 -07:00
|
|
|
int err;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
err = check_header(skb, nh_ofs + sizeof(*nh));
|
|
|
|
if (unlikely(err))
|
|
|
|
return err;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
|
|
|
nh = ipv6_hdr(skb);
|
|
|
|
nexthdr = nh->nexthdr;
|
|
|
|
payload_ofs = (u8 *)(nh + 1) - skb->data;
|
|
|
|
|
2011-06-08 12:28:57 -07:00
|
|
|
key->ip.proto = NEXTHDR_NONE;
|
2011-11-02 23:34:15 -07:00
|
|
|
key->ip.tos = ipv6_get_dsfield(nh);
|
2011-11-05 15:48:12 -07:00
|
|
|
key->ip.ttl = nh->hop_limit;
|
2011-11-01 15:57:56 -07:00
|
|
|
key->ipv6.label = *(__be32 *)nh & htonl(IPV6_FLOWINFO_FLOWLABEL);
|
2011-11-30 10:46:54 -08:00
|
|
|
key->ipv6.addr.src = nh->saddr;
|
|
|
|
key->ipv6.addr.dst = nh->daddr;
|
2010-12-29 19:03:46 -08:00
|
|
|
|
2011-12-01 16:09:05 -08:00
|
|
|
payload_ofs = ipv6_skip_exthdr(skb, payload_ofs, &nexthdr, &frag_off);
|
2011-02-25 16:46:19 -08:00
|
|
|
if (unlikely(payload_ofs < 0))
|
2010-12-29 19:03:46 -08:00
|
|
|
return -EINVAL;
|
2011-02-25 16:46:19 -08:00
|
|
|
|
2011-12-01 16:09:05 -08:00
|
|
|
if (frag_off) {
|
|
|
|
if (frag_off & htons(~0x7))
|
|
|
|
key->ip.frag = OVS_FRAG_TYPE_LATER;
|
|
|
|
else
|
|
|
|
key->ip.frag = OVS_FRAG_TYPE_FIRST;
|
|
|
|
}
|
|
|
|
|
2010-12-29 19:03:46 -08:00
|
|
|
nh_len = payload_ofs - nh_ofs;
|
|
|
|
skb_set_transport_header(skb, nh_ofs + nh_len);
|
2011-06-08 12:28:57 -07:00
|
|
|
key->ip.proto = nexthdr;
|
2010-12-29 19:03:46 -08:00
|
|
|
return nh_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool icmp6hdr_ok(struct sk_buff *skb)
|
|
|
|
{
|
2011-05-10 11:48:36 -07:00
|
|
|
return pskb_may_pull(skb, skb_transport_offset(skb) +
|
|
|
|
sizeof(struct icmp6hdr));
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
2011-01-29 14:11:23 -08:00
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
struct qtag_prefix {
|
|
|
|
__be16 eth_type; /* ETH_P_8021Q */
|
|
|
|
__be16 tci;
|
|
|
|
};
|
|
|
|
struct qtag_prefix *qp;
|
|
|
|
|
2011-11-14 17:19:41 -08:00
|
|
|
if (unlikely(skb->len < sizeof(struct qtag_prefix) + sizeof(__be16)))
|
|
|
|
return 0;
|
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
if (unlikely(!pskb_may_pull(skb, sizeof(struct qtag_prefix) +
|
|
|
|
sizeof(__be16))))
|
|
|
|
return -ENOMEM;
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
|
|
qp = (struct qtag_prefix *) skb->data;
|
2011-05-18 11:30:07 -07:00
|
|
|
key->eth.tci = qp->tci | htons(VLAN_TAG_PRESENT);
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
__skb_pull(skb, sizeof(struct qtag_prefix));
|
2011-05-10 11:48:36 -07:00
|
|
|
|
|
|
|
return 0;
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
static __be16 parse_ethertype(struct sk_buff *skb)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
struct llc_snap_hdr {
|
|
|
|
u8 dsap; /* Always 0xAA */
|
|
|
|
u8 ssap; /* Always 0xAA */
|
|
|
|
u8 ctrl;
|
|
|
|
u8 oui[3];
|
2010-12-04 12:04:39 -08:00
|
|
|
__be16 ethertype;
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
};
|
|
|
|
struct llc_snap_hdr *llc;
|
|
|
|
__be16 proto;
|
|
|
|
|
|
|
|
proto = *(__be16 *) skb->data;
|
|
|
|
__skb_pull(skb, sizeof(__be16));
|
|
|
|
|
2013-03-28 12:01:17 -07:00
|
|
|
if (ntohs(proto) >= ETH_P_802_3_MIN)
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
return proto;
|
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
if (skb->len < sizeof(struct llc_snap_hdr))
|
2011-01-23 18:44:44 -08:00
|
|
|
return htons(ETH_P_802_2);
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
if (unlikely(!pskb_may_pull(skb, sizeof(struct llc_snap_hdr))))
|
|
|
|
return htons(0);
|
|
|
|
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
llc = (struct llc_snap_hdr *) skb->data;
|
|
|
|
if (llc->dsap != LLC_SAP_SNAP ||
|
|
|
|
llc->ssap != LLC_SAP_SNAP ||
|
|
|
|
(llc->oui[0] | llc->oui[1] | llc->oui[2]) != 0)
|
2011-01-23 18:44:44 -08:00
|
|
|
return htons(ETH_P_802_2);
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
|
|
|
|
__skb_pull(skb, sizeof(struct llc_snap_hdr));
|
2013-02-08 15:29:57 -08:00
|
|
|
|
2013-03-28 12:01:17 -07:00
|
|
|
if (ntohs(llc->ethertype) >= ETH_P_802_3_MIN)
|
2013-02-08 15:29:57 -08:00
|
|
|
return llc->ethertype;
|
|
|
|
|
|
|
|
return htons(ETH_P_802_2);
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
|
|
|
|
2011-02-01 22:54:11 -08:00
|
|
|
static int parse_icmpv6(struct sk_buff *skb, struct sw_flow_key *key,
|
2013-06-17 07:51:00 -07:00
|
|
|
int nh_len)
|
2011-02-01 22:54:11 -08:00
|
|
|
{
|
|
|
|
struct icmp6hdr *icmp = icmp6_hdr(skb);
|
|
|
|
|
|
|
|
/* The ICMPv6 type and code fields use the 16-bit transport port
|
2011-02-25 16:46:19 -08:00
|
|
|
* fields, so we need to store them in 16-bit network byte order.
|
|
|
|
*/
|
2011-05-18 11:30:07 -07:00
|
|
|
key->ipv6.tp.src = htons(icmp->icmp6_type);
|
|
|
|
key->ipv6.tp.dst = htons(icmp->icmp6_code);
|
2011-02-01 22:54:11 -08:00
|
|
|
|
2011-02-25 16:46:19 -08:00
|
|
|
if (icmp->icmp6_code == 0 &&
|
|
|
|
(icmp->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION ||
|
|
|
|
icmp->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT)) {
|
2011-03-02 14:51:31 -08:00
|
|
|
int icmp_len = skb->len - skb_transport_offset(skb);
|
2011-02-01 22:54:11 -08:00
|
|
|
struct nd_msg *nd;
|
|
|
|
int offset;
|
|
|
|
|
|
|
|
/* In order to process neighbor discovery options, we need the
|
2011-02-25 16:46:19 -08:00
|
|
|
* entire packet.
|
|
|
|
*/
|
|
|
|
if (unlikely(icmp_len < sizeof(*nd)))
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (unlikely(skb_linearize(skb)))
|
|
|
|
return -ENOMEM;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
|
|
nd = (struct nd_msg *)skb_transport_header(skb);
|
2011-11-30 10:46:54 -08:00
|
|
|
key->ipv6.nd.target = nd->target;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
|
|
icmp_len -= sizeof(*nd);
|
|
|
|
offset = 0;
|
|
|
|
while (icmp_len >= 8) {
|
2011-11-07 15:53:01 -08:00
|
|
|
struct nd_opt_hdr *nd_opt =
|
|
|
|
(struct nd_opt_hdr *)(nd->opt + offset);
|
2011-02-01 22:54:11 -08:00
|
|
|
int opt_len = nd_opt->nd_opt_len * 8;
|
|
|
|
|
2011-02-25 16:46:19 -08:00
|
|
|
if (unlikely(!opt_len || opt_len > icmp_len))
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
2011-02-25 16:46:19 -08:00
|
|
|
/* 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.
|
|
|
|
*/
|
2011-02-01 22:54:11 -08:00
|
|
|
if (nd_opt->nd_opt_type == ND_OPT_SOURCE_LL_ADDR
|
2011-02-25 16:46:19 -08:00
|
|
|
&& opt_len == 8) {
|
2011-05-18 11:30:07 -07:00
|
|
|
if (unlikely(!is_zero_ether_addr(key->ipv6.nd.sll)))
|
2011-02-01 22:54:11 -08:00
|
|
|
goto invalid;
|
2011-05-18 11:30:07 -07:00
|
|
|
memcpy(key->ipv6.nd.sll,
|
2011-02-25 16:46:19 -08:00
|
|
|
&nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN);
|
2011-02-01 22:54:11 -08:00
|
|
|
} else if (nd_opt->nd_opt_type == ND_OPT_TARGET_LL_ADDR
|
2011-02-25 16:46:19 -08:00
|
|
|
&& opt_len == 8) {
|
2011-05-18 11:30:07 -07:00
|
|
|
if (unlikely(!is_zero_ether_addr(key->ipv6.nd.tll)))
|
2011-02-01 22:54:11 -08:00
|
|
|
goto invalid;
|
2011-05-18 11:30:07 -07:00
|
|
|
memcpy(key->ipv6.nd.tll,
|
2011-02-25 16:46:19 -08:00
|
|
|
&nd->opt[offset+sizeof(*nd_opt)], ETH_ALEN);
|
2011-02-01 22:54:11 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
icmp_len -= opt_len;
|
|
|
|
offset += opt_len;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
2011-02-01 22:54:11 -08:00
|
|
|
|
|
|
|
invalid:
|
2011-05-18 11:30:07 -07:00
|
|
|
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));
|
2011-02-01 22:54:11 -08:00
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
2011-02-01 22:54:11 -08:00
|
|
|
}
|
|
|
|
|
2010-08-13 10:47:44 -07:00
|
|
|
/**
|
2011-11-21 17:15:20 -08:00
|
|
|
* ovs_flow_extract - extracts a flow key from an Ethernet frame.
|
2010-08-13 10:47:44 -07:00
|
|
|
* @skb: sk_buff that contains the frame, with skb->data pointing to the
|
|
|
|
* Ethernet header
|
|
|
|
* @in_port: port number on which @skb was received.
|
|
|
|
* @key: output flow key
|
|
|
|
*
|
|
|
|
* The caller must ensure that skb->len >= ETH_HLEN.
|
|
|
|
*
|
2010-08-27 12:32:05 -07:00
|
|
|
* Returns 0 if successful, otherwise a negative errno value.
|
|
|
|
*
|
2010-08-27 12:41:00 -07:00
|
|
|
* Initializes @skb header pointers as follows:
|
|
|
|
*
|
|
|
|
* - skb->mac_header: the Ethernet header.
|
|
|
|
*
|
|
|
|
* - skb->network_header: just past the Ethernet header, or just past the
|
|
|
|
* VLAN header, to the first byte of the Ethernet payload.
|
|
|
|
*
|
2013-06-03 08:43:37 -07:00
|
|
|
* - skb->transport_header: If key->eth.type is ETH_P_IP or ETH_P_IPV6
|
2010-12-29 19:03:46 -08:00
|
|
|
* on output, then just past the IP header, if one is present and
|
|
|
|
* of a correct length, otherwise the same as skb->network_header.
|
2013-06-03 08:43:37 -07:00
|
|
|
* For other key->eth.type values it is left untouched.
|
2010-08-13 10:47:44 -07:00
|
|
|
*/
|
2013-06-17 07:51:00 -07:00
|
|
|
int ovs_flow_extract(struct sk_buff *skb, u16 in_port, struct sw_flow_key *key)
|
2009-07-08 13:19:16 -07:00
|
|
|
{
|
2013-06-17 07:51:00 -07:00
|
|
|
int error;
|
2009-07-08 13:19:16 -07:00
|
|
|
struct ethhdr *eth;
|
|
|
|
|
2011-01-17 14:34:55 -08:00
|
|
|
memset(key, 0, sizeof(*key));
|
2011-11-01 10:13:16 -07:00
|
|
|
|
|
|
|
key->phy.priority = skb->priority;
|
2012-10-20 12:15:24 -07:00
|
|
|
if (OVS_CB(skb)->tun_key)
|
2012-11-07 07:57:22 -08:00
|
|
|
memcpy(&key->tun_key, OVS_CB(skb)->tun_key, sizeof(key->tun_key));
|
2011-11-01 10:13:16 -07:00
|
|
|
key->phy.in_port = in_port;
|
2013-08-26 13:27:02 -07:00
|
|
|
key->phy.skb_mark = skb->mark;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
skb_reset_mac_header(skb);
|
|
|
|
|
2011-05-10 11:48:36 -07:00
|
|
|
/* Link layer. We are guaranteed to have at least the 14 byte Ethernet
|
|
|
|
* header in the linear data area.
|
|
|
|
*/
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
eth = eth_hdr(skb);
|
2011-05-18 11:30:07 -07:00
|
|
|
memcpy(key->eth.src, eth->h_source, ETH_ALEN);
|
|
|
|
memcpy(key->eth.dst, eth->h_dest, ETH_ALEN);
|
|
|
|
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
__skb_pull(skb, 2 * ETH_ALEN);
|
2013-06-12 16:59:28 -07:00
|
|
|
/* We are going to push all headers that we pull, so no need to
|
|
|
|
* update skb->csum here. */
|
2010-12-29 22:13:15 -08:00
|
|
|
|
|
|
|
if (vlan_tx_tag_present(skb))
|
2011-05-18 11:30:07 -07:00
|
|
|
key->eth.tci = htons(vlan_get_tci(skb));
|
2010-12-29 22:13:15 -08:00
|
|
|
else if (eth->h_proto == htons(ETH_P_8021Q))
|
2011-05-10 11:48:36 -07:00
|
|
|
if (unlikely(parse_vlan(skb, key)))
|
|
|
|
return -ENOMEM;
|
2010-12-29 22:13:15 -08:00
|
|
|
|
2011-05-18 11:30:07 -07:00
|
|
|
key->eth.type = parse_ethertype(skb);
|
|
|
|
if (unlikely(key->eth.type == htons(0)))
|
2011-05-10 11:48:36 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
datapath: Fix handling of 802.1Q and SNAP headers.
The kernel and user datapaths have code that assumes that 802.1Q headers
are used only inside Ethernet II frames, not inside SNAP-encapsulated
frames. But the kernel and user flow_extract() implementations would
interpret 802.1Q headers inside SNAP headers as being valid VLANs. This
would cause packet corruption if any VLAN-related actions were to be taken,
so change the two flow_extract() implementations only to accept 802.1Q as
an Ethernet II frame type, not as a SNAP-encoded frame type.
802.1Q-2005 says that this is correct anyhow:
Where the ISS instance used to transmit and receive tagged frames is
provided by a media access control method that can support Ethernet
Type encoding directly (e.g., is an IEEE 802.3 or IEEE 802.11 MAC) or
is media access method independent (e.g., 6.6), the TPID is Ethernet
Type encoded, i.e., is two octets in length and comprises solely the
assigned Ethernet Type value.
Where the ISS instance is provided by a media access method that
cannot directly support Ethernet Type encoding (e.g., is an IEEE
802.5 or FDDI MAC), the TPID is encoded according to the rule for
a Subnetwork Access Protocol (Clause 10 of IEEE Std 802) that
encapsulates Ethernet frames over LLC, and comprises the SNAP
header (AA-AA-03) followed by the SNAP PID (00-00-00) followed by
the two octets of the assigned Ethernet Type value.
All of the media that OVS handles supports Ethernet Type fields, so to me
that means that we don't have to handle 802.1Q-inside-SNAP.
On the other hand, we *do* have to handle SNAP-inside-802.1Q, because this
is actually allowed by the standards. So this commit also adds that
support.
I verified that, with this change, both SNAP and Ethernet packets are
properly recognized both with and without 802.1Q encapsulation.
I was a bit surprised to find out that Linux does not accept
SNAP-encapsulated IP frames on Ethernet.
Here's a summary of how frames are handled before and after this commit:
Common cases
------------
Ethernet
+------------+
1. |dst|src|TYPE|
+------------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
2. |dst|src| len| |aa|aa|03| |000000|TYPE|
+------------+ +--------+ +-----------+
Ethernet 802.1Q
+------------+ +---------+
3. |dst|src|8100| |VLAN|TYPE|
+------------+ +---------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
4. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |000000|TYPE|
+------------+ +---------+ +--------+ +-----------+
Unusual cases
-------------
Ethernet LLC SNAP 802.1Q
+------------+ +--------+ +-----------+ +---------+
5. |dst|src| len| |aa|aa|03| |000000|8100| |VLAN|TYPE|
+------------+ +--------+ +-----------+ +---------+
Ethernet LLC
+------------+ +--------+
6. |dst|src| len| |xx|xx|xx|
+------------+ +--------+
Ethernet LLC SNAP
+------------+ +--------+ +-----------+
7. |dst|src| len| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +--------+ +-----------+
Ethernet 802.1Q LLC
+------------+ +---------+ +--------+
8. |dst|src|8100| |VLAN| LEN| |xx|xx|xx|
+------------+ +---------+ +--------+
Ethernet 802.1Q LLC SNAP
+------------+ +---------+ +--------+ +-----------+
9. |dst|src|8100| |VLAN| LEN| |aa|aa|03| |xxxxxx|xxxx|
+------------+ +---------+ +--------+ +-----------+
Behavior
--------
--------------- --------------- -------------------------------------
Before After
this commit this commit
dl_type dl_vlan dl_type dl_vlan Notes
------- ------- ------- ------- -------------------------------------
1. TYPE ffff TYPE ffff no change
2. TYPE ffff TYPE ffff no change
3. TYPE VLAN TYPE VLAN no change
4. LEN VLAN TYPE VLAN proposal fixes behavior
5. TYPE VLAN 8100 ffff 802.1Q says this is invalid framing
6. 05ff ffff 05ff ffff no change
7. 05ff ffff 05ff ffff no change
8. LEN VLAN 05ff VLAN proposal fixes behavior
9. LEN VLAN 05ff VLAN proposal fixes behavior
Signed-off-by: Ben Pfaff <blp@nicira.com>
2010-08-10 11:35:46 -07:00
|
|
|
skb_reset_network_header(skb);
|
2011-05-10 11:48:36 -07:00
|
|
|
__skb_push(skb, skb->data - skb_mac_header(skb));
|
2009-07-08 13:19:16 -07:00
|
|
|
|
|
|
|
/* Network layer. */
|
2011-05-18 11:30:07 -07:00
|
|
|
if (key->eth.type == htons(ETH_P_IP)) {
|
2010-08-27 12:32:05 -07:00
|
|
|
struct iphdr *nh;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
__be16 offset;
|
2011-05-18 11:30:07 -07:00
|
|
|
|
2010-08-27 12:32:05 -07:00
|
|
|
error = check_iphdr(skb);
|
|
|
|
if (unlikely(error)) {
|
|
|
|
if (error == -EINVAL) {
|
|
|
|
skb->transport_header = skb->network_header;
|
2011-05-18 11:30:07 -07:00
|
|
|
error = 0;
|
2010-08-27 12:32:05 -07:00
|
|
|
}
|
2013-06-17 07:51:00 -07:00
|
|
|
return error;
|
2010-08-27 12:32:05 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
nh = ip_hdr(skb);
|
2011-05-18 11:30:07 -07:00
|
|
|
key->ipv4.addr.src = nh->saddr;
|
|
|
|
key->ipv4.addr.dst = nh->daddr;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2011-06-08 12:28:57 -07:00
|
|
|
key->ip.proto = nh->protocol;
|
2011-11-02 23:34:15 -07:00
|
|
|
key->ip.tos = nh->tos;
|
2011-11-05 15:48:12 -07:00
|
|
|
key->ip.ttl = nh->ttl;
|
2009-07-08 13:19:16 -07:00
|
|
|
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
offset = nh->frag_off & htons(IP_OFFSET);
|
|
|
|
if (offset) {
|
2011-11-02 18:17:36 -07:00
|
|
|
key->ip.frag = OVS_FRAG_TYPE_LATER;
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
}
|
|
|
|
if (nh->frag_off & htons(IP_MF) ||
|
|
|
|
skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
|
2011-11-02 18:17:36 -07:00
|
|
|
key->ip.frag = OVS_FRAG_TYPE_FIRST;
|
2010-08-29 14:28:58 -07:00
|
|
|
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
/* Transport layer. */
|
2011-06-08 12:28:57 -07:00
|
|
|
if (key->ip.proto == IPPROTO_TCP) {
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
if (tcphdr_ok(skb)) {
|
2011-06-08 12:23:05 -07:00
|
|
|
struct tcphdr *tcp = tcp_hdr(skb);
|
|
|
|
key->ipv4.tp.src = tcp->source;
|
|
|
|
key->ipv4.tp.dst = tcp->dest;
|
2013-10-28 13:54:40 -07:00
|
|
|
key->ipv4.tp.flags = TCP_FLAGS_BE16(tcp);
|
2011-06-08 12:23:05 -07:00
|
|
|
}
|
2011-06-08 12:28:57 -07:00
|
|
|
} else if (key->ip.proto == IPPROTO_UDP) {
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
if (udphdr_ok(skb)) {
|
2011-06-08 12:23:05 -07:00
|
|
|
struct udphdr *udp = udp_hdr(skb);
|
|
|
|
key->ipv4.tp.src = udp->source;
|
|
|
|
key->ipv4.tp.dst = udp->dest;
|
|
|
|
}
|
2013-08-22 20:24:43 +12:00
|
|
|
} else if (key->ip.proto == IPPROTO_SCTP) {
|
|
|
|
if (sctphdr_ok(skb)) {
|
|
|
|
struct sctphdr *sctp = sctp_hdr(skb);
|
|
|
|
key->ipv4.tp.src = sctp->source;
|
|
|
|
key->ipv4.tp.dst = sctp->dest;
|
|
|
|
}
|
2011-06-08 12:28:57 -07:00
|
|
|
} else if (key->ip.proto == IPPROTO_ICMP) {
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
if (icmphdr_ok(skb)) {
|
2011-06-08 12:23:05 -07:00
|
|
|
struct icmphdr *icmp = icmp_hdr(skb);
|
|
|
|
/* The ICMP type and code fields use the 16-bit
|
2011-11-07 15:53:01 -08:00
|
|
|
* transport port fields, so we need to store
|
|
|
|
* them in 16-bit network byte order. */
|
2011-06-08 12:23:05 -07:00
|
|
|
key->ipv4.tp.src = htons(icmp->type);
|
|
|
|
key->ipv4.tp.dst = htons(icmp->code);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-11-02 11:43:46 -07:00
|
|
|
} else if ((key->eth.type == htons(ETH_P_ARP) ||
|
|
|
|
key->eth.type == htons(ETH_P_RARP)) && arphdr_ok(skb)) {
|
2009-07-16 12:58:28 -07:00
|
|
|
struct arp_eth_header *arp;
|
|
|
|
|
|
|
|
arp = (struct arp_eth_header *)skb_network_header(skb);
|
|
|
|
|
2010-03-04 17:55:44 -05:00
|
|
|
if (arp->ar_hrd == htons(ARPHRD_ETHER)
|
2009-11-16 15:24:35 -08:00
|
|
|
&& arp->ar_pro == htons(ETH_P_IP)
|
|
|
|
&& arp->ar_hln == ETH_ALEN
|
|
|
|
&& arp->ar_pln == 4) {
|
|
|
|
|
|
|
|
/* We only match on the lower 8 bits of the opcode. */
|
2010-08-29 14:28:58 -07:00
|
|
|
if (ntohs(arp->ar_op) <= 0xff)
|
2011-06-08 12:28:57 -07:00
|
|
|
key->ip.proto = ntohs(arp->ar_op);
|
2012-10-23 19:00:02 -07:00
|
|
|
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);
|
2009-11-16 15:24:35 -08:00
|
|
|
}
|
2011-05-18 11:30:07 -07:00
|
|
|
} else if (key->eth.type == htons(ETH_P_IPV6)) {
|
2010-12-29 19:03:46 -08:00
|
|
|
int nh_len; /* IPv6 Header + Extensions */
|
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
nh_len = parse_ipv6hdr(skb, key);
|
2010-12-29 19:03:46 -08:00
|
|
|
if (unlikely(nh_len < 0)) {
|
2013-06-17 07:51:00 -07:00
|
|
|
if (nh_len == -EINVAL) {
|
2010-12-29 19:03:46 -08:00
|
|
|
skb->transport_header = skb->network_header;
|
2013-06-17 07:51:00 -07:00
|
|
|
error = 0;
|
|
|
|
} else {
|
2011-05-18 11:30:07 -07:00
|
|
|
error = nh_len;
|
2013-06-17 07:51:00 -07:00
|
|
|
}
|
|
|
|
return error;
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
|
|
|
|
2011-11-02 18:17:36 -07:00
|
|
|
if (key->ip.frag == OVS_FRAG_TYPE_LATER)
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
if (skb_shinfo(skb)->gso_type & SKB_GSO_UDP)
|
2011-11-02 18:17:36 -07:00
|
|
|
key->ip.frag = OVS_FRAG_TYPE_FIRST;
|
Implement new fragment handling policy.
Until now, OVS has handled IP fragments more awkwardly than necessary. It
has not been possible to match on L4 headers, even in fragments with offset
0 where they are actually present. This means that there was no way to
implement ACLs that treat, say, different TCP ports differently, on
fragmented traffic; instead, all decisions for fragment forwarding had to
be made on the basis of L2 and L3 headers alone.
This commit improves the situation significantly. It is still not possible
to match on L4 headers in fragments with nonzero offset, because that
information is simply not present in such fragments, but this commit adds
the ability to match on L4 headers for fragments with zero offset. This
means that it becomes possible to implement ACLs that drop such "first
fragments" on the basis of L4 headers. In practice, that effectively
blocks even fragmented traffic on an L4 basis, because the receiving IP
stack cannot reassemble a full packet when the first fragment is missing.
This commit works by adding a new "fragment type" to the kernel flow match
and making it available through OpenFlow as a new NXM field named
NXM_NX_IP_FRAG. Because OpenFlow 1.0 explicitly says that the L4 fields
are always 0 for IP fragments, it adds a new OpenFlow fragment handling
mode that fills in the L4 fields for "first fragments". It also enhances
ovs-ofctl to allow users to configure this new fragment handling mode and
to parse the new field.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Bug #7557.
2011-10-19 21:33:44 -07:00
|
|
|
|
2010-12-29 19:03:46 -08:00
|
|
|
/* Transport layer. */
|
2011-06-08 12:28:57 -07:00
|
|
|
if (key->ip.proto == NEXTHDR_TCP) {
|
2010-12-29 19:03:46 -08:00
|
|
|
if (tcphdr_ok(skb)) {
|
|
|
|
struct tcphdr *tcp = tcp_hdr(skb);
|
2011-05-18 11:30:07 -07:00
|
|
|
key->ipv6.tp.src = tcp->source;
|
|
|
|
key->ipv6.tp.dst = tcp->dest;
|
2013-10-28 13:54:40 -07:00
|
|
|
key->ipv6.tp.flags = TCP_FLAGS_BE16(tcp);
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
2011-06-08 12:28:57 -07:00
|
|
|
} else if (key->ip.proto == NEXTHDR_UDP) {
|
2010-12-29 19:03:46 -08:00
|
|
|
if (udphdr_ok(skb)) {
|
|
|
|
struct udphdr *udp = udp_hdr(skb);
|
2011-05-18 11:30:07 -07:00
|
|
|
key->ipv6.tp.src = udp->source;
|
|
|
|
key->ipv6.tp.dst = udp->dest;
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
2013-08-22 20:24:43 +12:00
|
|
|
} else if (key->ip.proto == NEXTHDR_SCTP) {
|
|
|
|
if (sctphdr_ok(skb)) {
|
|
|
|
struct sctphdr *sctp = sctp_hdr(skb);
|
|
|
|
key->ipv6.tp.src = sctp->source;
|
|
|
|
key->ipv6.tp.dst = sctp->dest;
|
|
|
|
}
|
2011-06-08 12:28:57 -07:00
|
|
|
} else if (key->ip.proto == NEXTHDR_ICMP) {
|
2010-12-29 19:03:46 -08:00
|
|
|
if (icmp6hdr_ok(skb)) {
|
2013-06-17 07:51:00 -07:00
|
|
|
error = parse_icmpv6(skb, key, nh_len);
|
|
|
|
if (error)
|
|
|
|
return error;
|
2010-12-29 19:03:46 -08:00
|
|
|
}
|
|
|
|
}
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|
2011-05-18 11:30:07 -07:00
|
|
|
|
2013-06-17 07:51:00 -07:00
|
|
|
return 0;
|
2009-07-08 13:19:16 -07:00
|
|
|
}
|