Commit 3b61075b authored by David S. Miller's avatar David S. Miller

Merge branch 'ovs-802.1ad'

Eric Garver says:

====================
openvswitch: add 802.1ad support

This series adds 802.1ad support to openvswitch. It is a continuation of the
work originally started by Thomas F Herbert - hence the large rev number.

The extra VLAN is implemented by using an additional level of the
OVS_KEY_ATTR_ENCAP netlink attribute.
In OVS flow speak, this looks like

   eth_type(0x88a8),vlan(vid=100),encap(eth_type(0x8100), vlan(vid=200),
                                        encap(eth_type(0x0800), ...))

The userspace counterpart has also seen recent activity on the ovs-dev mailing
lists. There are some new 802.1ad OVS tests being added - also on the ovs-dev
list. This patch series has been tested using the most recent version of
userspace (v3) and tests (v2).

v22 changes:
  - merge patch 4 into patch 3
  - fix checkpatch.pl errors
    - Still some 80 char warnings for long string literals
  - refresh pointer after pskb_may_pull()
  - refactor vlan nlattr parsing to remove some double checks
  - introduce ovs_nla_put_vlan()
  - move triple VLAN check to after ethertype serialization
  - WARN_ON_ONCE() on triple VLAN and unexpected encap values

v21 changes:
  - Fix (and simplify) netlink attribute parsing
  - re-add handling of truncated VLAN tags
  - fix if/else dangling assignment in {push,pop}_vlan()
  - simplify parse_vlan()
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d545caca 018c1dda
...@@ -272,6 +272,23 @@ static inline int vlan_get_encap_level(struct net_device *dev) ...@@ -272,6 +272,23 @@ static inline int vlan_get_encap_level(struct net_device *dev)
} }
#endif #endif
/**
* eth_type_vlan - check for valid vlan ether type.
* @ethertype: ether type to check
*
* Returns true if the ether type is a vlan ether type.
*/
static inline bool eth_type_vlan(__be16 ethertype)
{
switch (ethertype) {
case htons(ETH_P_8021Q):
case htons(ETH_P_8021AD):
return true;
default:
return false;
}
}
static inline bool vlan_hw_offload_capable(netdev_features_t features, static inline bool vlan_hw_offload_capable(netdev_features_t features,
__be16 proto) __be16 proto)
{ {
...@@ -425,8 +442,7 @@ static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci) ...@@ -425,8 +442,7 @@ static inline int __vlan_get_tag(const struct sk_buff *skb, u16 *vlan_tci)
{ {
struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data; struct vlan_ethhdr *veth = (struct vlan_ethhdr *)skb->data;
if (veth->h_vlan_proto != htons(ETH_P_8021Q) && if (!eth_type_vlan(veth->h_vlan_proto))
veth->h_vlan_proto != htons(ETH_P_8021AD))
return -EINVAL; return -EINVAL;
*vlan_tci = ntohs(veth->h_vlan_TCI); *vlan_tci = ntohs(veth->h_vlan_TCI);
...@@ -488,7 +504,7 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, ...@@ -488,7 +504,7 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type,
* present at mac_len - VLAN_HLEN (if mac_len > 0), or at * present at mac_len - VLAN_HLEN (if mac_len > 0), or at
* ETH_HLEN otherwise * ETH_HLEN otherwise
*/ */
if (type == htons(ETH_P_8021Q) || type == htons(ETH_P_8021AD)) { if (eth_type_vlan(type)) {
if (vlan_depth) { if (vlan_depth) {
if (WARN_ON(vlan_depth < VLAN_HLEN)) if (WARN_ON(vlan_depth < VLAN_HLEN))
return 0; return 0;
...@@ -506,8 +522,7 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type, ...@@ -506,8 +522,7 @@ static inline __be16 __vlan_get_protocol(struct sk_buff *skb, __be16 type,
vh = (struct vlan_hdr *)(skb->data + vlan_depth); vh = (struct vlan_hdr *)(skb->data + vlan_depth);
type = vh->h_vlan_encapsulated_proto; type = vh->h_vlan_encapsulated_proto;
vlan_depth += VLAN_HLEN; vlan_depth += VLAN_HLEN;
} while (type == htons(ETH_P_8021Q) || } while (eth_type_vlan(type));
type == htons(ETH_P_8021AD));
} }
if (depth) if (depth)
...@@ -572,8 +587,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb, ...@@ -572,8 +587,7 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
static inline bool skb_vlan_tagged(const struct sk_buff *skb) static inline bool skb_vlan_tagged(const struct sk_buff *skb)
{ {
if (!skb_vlan_tag_present(skb) && if (!skb_vlan_tag_present(skb) &&
likely(skb->protocol != htons(ETH_P_8021Q) && likely(!eth_type_vlan(skb->protocol)))
skb->protocol != htons(ETH_P_8021AD)))
return false; return false;
return true; return true;
...@@ -593,15 +607,14 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb) ...@@ -593,15 +607,14 @@ static inline bool skb_vlan_tagged_multi(const struct sk_buff *skb)
if (!skb_vlan_tag_present(skb)) { if (!skb_vlan_tag_present(skb)) {
struct vlan_ethhdr *veh; struct vlan_ethhdr *veh;
if (likely(protocol != htons(ETH_P_8021Q) && if (likely(!eth_type_vlan(protocol)))
protocol != htons(ETH_P_8021AD)))
return false; return false;
veh = (struct vlan_ethhdr *)skb->data; veh = (struct vlan_ethhdr *)skb->data;
protocol = veh->h_vlan_encapsulated_proto; protocol = veh->h_vlan_encapsulated_proto;
} }
if (protocol != htons(ETH_P_8021Q) && protocol != htons(ETH_P_8021AD)) if (!eth_type_vlan(protocol))
return false; return false;
return true; return true;
......
...@@ -605,13 +605,13 @@ struct ovs_action_push_mpls { ...@@ -605,13 +605,13 @@ struct ovs_action_push_mpls {
* @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set * @vlan_tci: Tag control identifier (TCI) to push. The CFI bit must be set
* (but it will not be set in the 802.1Q header that is pushed). * (but it will not be set in the 802.1Q header that is pushed).
* *
* The @vlan_tpid value is typically %ETH_P_8021Q. The only acceptable TPID * The @vlan_tpid value is typically %ETH_P_8021Q or %ETH_P_8021AD.
* values are those that the kernel module also parses as 802.1Q headers, to * The only acceptable TPID values are those that the kernel module also parses
* prevent %OVS_ACTION_ATTR_PUSH_VLAN followed by %OVS_ACTION_ATTR_POP_VLAN * as 802.1Q or 802.1AD headers, to prevent %OVS_ACTION_ATTR_PUSH_VLAN followed
* from having surprising results. * by %OVS_ACTION_ATTR_POP_VLAN from having surprising results.
*/ */
struct ovs_action_push_vlan { struct ovs_action_push_vlan {
__be16 vlan_tpid; /* 802.1Q TPID. */ __be16 vlan_tpid; /* 802.1Q or 802.1ad TPID. */
__be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */ __be16 vlan_tci; /* 802.1Q TCI (VLAN ID and priority). */
}; };
...@@ -721,9 +721,10 @@ enum ovs_nat_attr { ...@@ -721,9 +721,10 @@ enum ovs_nat_attr {
* is copied from the value to the packet header field, rest of the bits are * is copied from the value to the packet header field, rest of the bits are
* left unchanged. The non-masked value bits must be passed in as zeroes. * left unchanged. The non-masked value bits must be passed in as zeroes.
* Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute. * Masking is not supported for the %OVS_KEY_ATTR_TUNNEL attribute.
* @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q header onto the * @OVS_ACTION_ATTR_PUSH_VLAN: Push a new outermost 802.1Q or 802.1ad header
* packet. * onto the packet.
* @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q header off the packet. * @OVS_ACTION_ATTR_POP_VLAN: Pop the outermost 802.1Q or 802.1ad header
* from the packet.
* @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in * @OVS_ACTION_ATTR_SAMPLE: Probabilitically executes actions, as specified in
* the nested %OVS_SAMPLE_ATTR_* attributes. * the nested %OVS_SAMPLE_ATTR_* attributes.
* @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the * @OVS_ACTION_ATTR_PUSH_MPLS: Push a new MPLS label stack entry onto the
......
...@@ -246,20 +246,24 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key) ...@@ -246,20 +246,24 @@ static int pop_vlan(struct sk_buff *skb, struct sw_flow_key *key)
int err; int err;
err = skb_vlan_pop(skb); err = skb_vlan_pop(skb);
if (skb_vlan_tag_present(skb)) if (skb_vlan_tag_present(skb)) {
invalidate_flow_key(key); invalidate_flow_key(key);
else } else {
key->eth.tci = 0; key->eth.vlan.tci = 0;
key->eth.vlan.tpid = 0;
}
return err; return err;
} }
static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key, static int push_vlan(struct sk_buff *skb, struct sw_flow_key *key,
const struct ovs_action_push_vlan *vlan) const struct ovs_action_push_vlan *vlan)
{ {
if (skb_vlan_tag_present(skb)) if (skb_vlan_tag_present(skb)) {
invalidate_flow_key(key); invalidate_flow_key(key);
else } else {
key->eth.tci = vlan->vlan_tci; key->eth.vlan.tci = vlan->vlan_tci;
key->eth.vlan.tpid = vlan->vlan_tpid;
}
return skb_vlan_push(skb, vlan->vlan_tpid, return skb_vlan_push(skb, vlan->vlan_tpid,
ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT); ntohs(vlan->vlan_tci) & ~VLAN_TAG_PRESENT);
} }
......
...@@ -302,24 +302,57 @@ static bool icmp6hdr_ok(struct sk_buff *skb) ...@@ -302,24 +302,57 @@ static bool icmp6hdr_ok(struct sk_buff *skb)
sizeof(struct icmp6hdr)); sizeof(struct icmp6hdr));
} }
static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key) /**
* Parse vlan tag from vlan header.
* Returns ERROR on memory error.
* Returns 0 if it encounters a non-vlan or incomplete packet.
* Returns 1 after successfully parsing vlan tag.
*/
static int parse_vlan_tag(struct sk_buff *skb, struct vlan_head *key_vh)
{ {
struct qtag_prefix { struct vlan_head *vh = (struct vlan_head *)skb->data;
__be16 eth_type; /* ETH_P_8021Q */
__be16 tci;
};
struct qtag_prefix *qp;
if (unlikely(skb->len < sizeof(struct qtag_prefix) + sizeof(__be16))) if (likely(!eth_type_vlan(vh->tpid)))
return 0; return 0;
if (unlikely(!pskb_may_pull(skb, sizeof(struct qtag_prefix) + if (unlikely(skb->len < sizeof(struct vlan_head) + sizeof(__be16)))
return 0;
if (unlikely(!pskb_may_pull(skb, sizeof(struct vlan_head) +
sizeof(__be16)))) sizeof(__be16))))
return -ENOMEM; return -ENOMEM;
qp = (struct qtag_prefix *) skb->data; vh = (struct vlan_head *)skb->data;
key->eth.tci = qp->tci | htons(VLAN_TAG_PRESENT); key_vh->tci = vh->tci | htons(VLAN_TAG_PRESENT);
__skb_pull(skb, sizeof(struct qtag_prefix)); key_vh->tpid = vh->tpid;
__skb_pull(skb, sizeof(struct vlan_head));
return 1;
}
static int parse_vlan(struct sk_buff *skb, struct sw_flow_key *key)
{
int res;
key->eth.vlan.tci = 0;
key->eth.vlan.tpid = 0;
key->eth.cvlan.tci = 0;
key->eth.cvlan.tpid = 0;
if (likely(skb_vlan_tag_present(skb))) {
key->eth.vlan.tci = htons(skb->vlan_tci);
key->eth.vlan.tpid = skb->vlan_proto;
} else {
/* Parse outer vlan tag in the non-accelerated case. */
res = parse_vlan_tag(skb, &key->eth.vlan);
if (res <= 0)
return res;
}
/* Parse inner vlan tag. */
res = parse_vlan_tag(skb, &key->eth.cvlan);
if (res <= 0)
return res;
return 0; return 0;
} }
...@@ -480,10 +513,6 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key) ...@@ -480,10 +513,6 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
* update skb->csum here. * update skb->csum here.
*/ */
key->eth.tci = 0;
if (skb_vlan_tag_present(skb))
key->eth.tci = htons(skb->vlan_tci);
else if (eth->h_proto == htons(ETH_P_8021Q))
if (unlikely(parse_vlan(skb, key))) if (unlikely(parse_vlan(skb, key)))
return -ENOMEM; return -ENOMEM;
......
...@@ -50,6 +50,11 @@ struct ovs_tunnel_info { ...@@ -50,6 +50,11 @@ struct ovs_tunnel_info {
struct metadata_dst *tun_dst; struct metadata_dst *tun_dst;
}; };
struct vlan_head {
__be16 tpid; /* Vlan type. Generally 802.1q or 802.1ad.*/
__be16 tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */
};
#define OVS_SW_FLOW_KEY_METADATA_SIZE \ #define OVS_SW_FLOW_KEY_METADATA_SIZE \
(offsetof(struct sw_flow_key, recirc_id) + \ (offsetof(struct sw_flow_key, recirc_id) + \
FIELD_SIZEOF(struct sw_flow_key, recirc_id)) FIELD_SIZEOF(struct sw_flow_key, recirc_id))
...@@ -69,7 +74,8 @@ struct sw_flow_key { ...@@ -69,7 +74,8 @@ struct sw_flow_key {
struct { struct {
u8 src[ETH_ALEN]; /* Ethernet source address. */ u8 src[ETH_ALEN]; /* Ethernet source address. */
u8 dst[ETH_ALEN]; /* Ethernet destination address. */ u8 dst[ETH_ALEN]; /* Ethernet destination address. */
__be16 tci; /* 0 if no VLAN, VLAN_TAG_PRESENT set otherwise. */ struct vlan_head vlan;
struct vlan_head cvlan;
__be16 type; /* Ethernet frame type. */ __be16 type; /* Ethernet frame type. */
} eth; } eth;
union { union {
......
This diff is collapsed.
...@@ -485,9 +485,14 @@ static unsigned int packet_length(const struct sk_buff *skb) ...@@ -485,9 +485,14 @@ static unsigned int packet_length(const struct sk_buff *skb)
{ {
unsigned int length = skb->len - ETH_HLEN; unsigned int length = skb->len - ETH_HLEN;
if (skb->protocol == htons(ETH_P_8021Q)) if (skb_vlan_tagged(skb))
length -= VLAN_HLEN; length -= VLAN_HLEN;
/* Don't subtract for multiple VLAN tags. Most (all?) drivers allow
* (ETH_LEN + VLAN_HLEN) in addition to the mtu value, but almost none
* account for 802.1ad. e.g. is_skb_forwardable().
*/
return length; return length;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment