1 files changed, 37 insertions, 6 deletions

diff --git a/net/openvswitch/flow.c b/net/openvswitch/flow.c
index 2b78789ea7c5..da2fae0873a5 100644
--- a/net/openvswitch/flow.c
+++ b/net/openvswitch/flow.c
@@ -32,6 +32,7 @@
 #include <linux/if_arp.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
+#include <linux/mpls.h>
 #include <linux/sctp.h>
 #include <linux/smp.h>
 #include <linux/tcp.h>
@@ -42,6 +43,7 @@
 #include <net/ip.h>
 #include <net/ip_tunnels.h>
 #include <net/ipv6.h>
+#include <net/mpls.h>
 #include <net/ndisc.h>
 
 #include "datapath.h"
@@ -64,10 +66,11 @@ u64 ovs_flow_used_time(unsigned long flow_jiffies)
 #define TCP_FLAGS_BE16(tp) (*(__be16 *)&tcp_flag_word(tp) & htons(0x0FFF))
 
 void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
-                           struct sk_buff *skb)
+                           const struct sk_buff *skb)
 {
         struct flow_stats *stats;
         int node = numa_node_id();
+        int len = skb->len + (vlan_tx_tag_present(skb) ? VLAN_HLEN : 0);
 
         stats = rcu_dereference(flow->stats[node]);
 
@@ -103,7 +106,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
                                 if (likely(new_stats)) {
                                         new_stats->used = jiffies;
                                         new_stats->packet_count = 1;
-                                        new_stats->byte_count = skb->len;
+                                        new_stats->byte_count = len;
                                         new_stats->tcp_flags = tcp_flags;
                                         spin_lock_init(&new_stats->lock);
 
@@ -118,7 +121,7 @@ void ovs_flow_stats_update(struct sw_flow *flow, __be16 tcp_flags,
 
         stats->used = jiffies;
         stats->packet_count++;
-        stats->byte_count += skb->len;
+        stats->byte_count += len;
         stats->tcp_flags |= tcp_flags;
 unlock:
         spin_unlock(&stats->lock);
@@ -480,6 +483,7 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
                 return -ENOMEM;
 
         skb_reset_network_header(skb);
+        skb_reset_mac_len(skb);
         __skb_push(skb, skb->data - skb_mac_header(skb));
 
         /* Network layer. */
@@ -584,6 +588,33 @@ static int key_extract(struct sk_buff *skb, struct sw_flow_key *key)
                         memset(&key->ip, 0, sizeof(key->ip));
                         memset(&key->ipv4, 0, sizeof(key->ipv4));
                 }
+        } else if (eth_p_mpls(key->eth.type)) {
+                size_t stack_len = MPLS_HLEN;
+
+                /* In the presence of an MPLS label stack the end of the L2
+                 * header and the beginning of the L3 header differ.
+                 *
+                 * Advance network_header to the beginning of the L3
+                 * header. mac_len corresponds to the end of the L2 header.
+                 */
+                while (1) {
+                        __be32 lse;
+
+                        error = check_header(skb, skb->mac_len + stack_len);
+                        if (unlikely(error))
+                                return 0;
+
+                        memcpy(&lse, skb_network_header(skb), MPLS_HLEN);
+
+                        if (stack_len == MPLS_HLEN)
+                                memcpy(&key->mpls.top_lse, &lse, MPLS_HLEN);
+
+                        skb_set_network_header(skb, skb->mac_len + stack_len);
+                        if (lse & htonl(MPLS_LS_S_MASK))
+                                break;
+
+                        stack_len += MPLS_HLEN;
+                }
         } else if (key->eth.type == htons(ETH_P_IPV6)) {
                 int nh_len;             /* IPv6 Header + Extensions */
 
@@ -649,7 +680,7 @@ int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key)
         return key_extract(skb, key);
 }
 
-int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info,
+int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info,
                          struct sk_buff *skb, struct sw_flow_key *key)
 {
         /* Extract metadata from packet. */
@@ -682,12 +713,12 @@ int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info,
 
 int ovs_flow_key_extract_userspace(const struct nlattr *attr,
                                    struct sk_buff *skb,
-                                   struct sw_flow_key *key)
+                                   struct sw_flow_key *key, bool log)
 {
         int err;
 
         /* Extract metadata from netlink attributes. */
-        err = ovs_nla_get_flow_metadata(attr, key);
+        err = ovs_nla_get_flow_metadata(attr, key, log);
         if (err)
                 return err;