From: William Tu <u9012...@gmail.com>

    commit 1a66a836da630cd70f3639208da549b549ce576b
    Author: William Tu <u9012...@gmail.com>
    Date:   Fri Aug 25 09:21:28 2017 -0700

    gre: add collect_md mode to ERSPAN tunnel

    Similar to gre, vxlan, geneve, ipip tunnels, allow ERSPAN tunnels to
    operate in 'collect metadata' mode.  bpf_skb_[gs]et_tunnel_key() helpers
    can make use of it right away.  OVS can use it as well in the future.

    Signed-off-by: William Tu <u9012...@gmail.com>
    Signed-off-by: David S. Miller <da...@davemloft.net>

With some adjustments for compatibility layer.

Cc: William Tu <u9012...@gmail.com>
Signed-off-by: Greg Rose <gvrose8...@gmail.com>
---
 datapath/linux/compat/include/net/ip_tunnels.h | 68 +++++++++++++++-----------
 datapath/linux/compat/ip_gre.c                 | 23 ++++++---
 2 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/datapath/linux/compat/include/net/ip_tunnels.h 
b/datapath/linux/compat/include/net/ip_tunnels.h
index 2685de7..ea3fb8d 100644
--- a/datapath/linux/compat/include/net/ip_tunnels.h
+++ b/datapath/linux/compat/include/net/ip_tunnels.h
@@ -74,14 +74,25 @@ void rpl_ip_tunnel_xmit(struct sk_buff *skb, struct 
net_device *dev,
 
 
 #ifndef TUNNEL_CSUM
-#define TUNNEL_CSUM    __cpu_to_be16(0x01)
-#define TUNNEL_ROUTING __cpu_to_be16(0x02)
-#define TUNNEL_KEY     __cpu_to_be16(0x04)
-#define TUNNEL_SEQ     __cpu_to_be16(0x08)
-#define TUNNEL_STRICT  __cpu_to_be16(0x10)
-#define TUNNEL_REC     __cpu_to_be16(0x20)
-#define TUNNEL_VERSION __cpu_to_be16(0x40)
-#define TUNNEL_NO_KEY  __cpu_to_be16(0x80)
+#define TUNNEL_CSUM            __cpu_to_be16(0x01)
+#define TUNNEL_ROUTING         __cpu_to_be16(0x02)
+#define TUNNEL_KEY             __cpu_to_be16(0x04)
+#define TUNNEL_SEQ             __cpu_to_be16(0x08)
+#define TUNNEL_STRICT          __cpu_to_be16(0x10)
+#define TUNNEL_REC             __cpu_to_be16(0x20)
+#define TUNNEL_VERSION         __cpu_to_be16(0x40)
+#define TUNNEL_NO_KEY          __cpu_to_be16(0x80)
+#define TUNNEL_DONT_FRAGMENT    __cpu_to_be16(0x0100)
+#define TUNNEL_OAM             __cpu_to_be16(0x0200)
+#define TUNNEL_CRIT_OPT                __cpu_to_be16(0x0400)
+#define TUNNEL_GENEVE_OPT      __cpu_to_be16(0x0800)
+#define TUNNEL_VXLAN_OPT       __cpu_to_be16(0x1000)
+#define TUNNEL_NOCACHE         __cpu_to_be16(0x2000)
+#define TUNNEL_ERSPAN_OPT      __cpu_to_be16(0x4000)
+
+#undef TUNNEL_OPTIONS_PRESENT
+#define TUNNEL_OPTIONS_PRESENT \
+               (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT | TUNNEL_ERSPAN_OPT)
 
 struct tnl_ptk_info {
        __be16 flags;
@@ -99,27 +110,6 @@ struct tnl_ptk_info {
 #define IP_TNL_HASH_BITS   7
 #define IP_TNL_HASH_SIZE   (1 << IP_TNL_HASH_BITS)
 
-#ifndef TUNNEL_DONT_FRAGMENT
-#define TUNNEL_DONT_FRAGMENT   __cpu_to_be16(0x0100)
-#endif
-
-#ifndef TUNNEL_OAM
-#define TUNNEL_OAM     __cpu_to_be16(0x0200)
-#define TUNNEL_CRIT_OPT        __cpu_to_be16(0x0400)
-#endif
-
-#ifndef TUNNEL_GENEVE_OPT
-#define TUNNEL_GENEVE_OPT      __cpu_to_be16(0x0800)
-#endif
-
-#ifndef TUNNEL_VXLAN_OPT
-#define TUNNEL_VXLAN_OPT       __cpu_to_be16(0x1000)
-#endif
-
-/* Older kernels defined TUNNEL_OPTIONS_PRESENT to GENEVE only */
-#undef TUNNEL_OPTIONS_PRESENT
-#define TUNNEL_OPTIONS_PRESENT (TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)
-
 /* Keep error state on tunnel for 30 sec */
 #define IPTUNNEL_ERR_TIMEO     (30*HZ)
 
@@ -242,6 +232,7 @@ static inline void ip_tunnel_key_init(struct ip_tunnel_key 
*key,
 #define ip_tunnel_collect_metadata() true
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(4,6,0)
+#undef TUNNEL_NOCACHE
 #define TUNNEL_NOCACHE 0
 
 static inline bool
@@ -419,6 +410,25 @@ static inline void iptunnel_xmit_stats(struct net_device 
*dev, int pkt_len)
        }
 }
 
+static inline __be64 key32_to_tunnel_id(__be32 key)
+{
+#ifdef __BIG_ENDIAN
+       return (__force __be64)key;
+#else
+       return (__force __be64)((__force u64)key << 32);
+#endif
+}
+
+/* Returns the least-significant 32 bits of a __be64. */
+static inline __be32 tunnel_id_to_key32(__be64 tun_id)
+{
+#ifdef __BIG_ENDIAN
+       return (__force __be32)tun_id;
+#else
+       return (__force __be32)((__force u64)tun_id >> 32);
+#endif
+}
+
 #define ip_tunnel_init rpl_ip_tunnel_init
 int rpl_ip_tunnel_init(struct net_device *dev);
 
diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c
index e30e428..a5ec59c 100644
--- a/datapath/linux/compat/ip_gre.c
+++ b/datapath/linux/compat/ip_gre.c
@@ -93,6 +93,9 @@ static __be32 tunnel_id_to_key(__be64 x)
 #endif
 }
 
+static void erspan_build_header(struct sk_buff *skb,
+                               __be32 id, u32 index, bool truncate);
+
 /* Called with rcu_read_lock and BH disabled. */
 static int gre_err(struct sk_buff *skb, u32 info,
                   const struct tnl_ptk_info *tpi)
@@ -187,7 +190,7 @@ static int erspan_rcv(struct sk_buff *skb, struct 
tnl_ptk_info *tpi,
                      int gre_hdr_len)
 {
        struct net *net = dev_net(skb->dev);
-       struct metadata_dst *tun_dst = NULL;
+       struct metadata_dst tun_dst;
        struct ip_tunnel_net *itn;
        struct ip_tunnel *tunnel;
        struct erspanhdr *ershdr;
@@ -823,18 +826,17 @@ static int erspan_validate(struct nlattr *tb[], struct 
nlattr *data[])
                return ret;
 
        /* ERSPAN should only have GRE sequence and key flag */
-       flags |= nla_get_be16(data[IFLA_GRE_OFLAGS]);
-       flags |= nla_get_be16(data[IFLA_GRE_IFLAGS]);
-       if (flags != (GRE_SEQ | GRE_KEY))
+       if (data[IFLA_GRE_OFLAGS])
+               flags |= nla_get_be16(data[IFLA_GRE_OFLAGS]);
+       if (data[IFLA_GRE_IFLAGS])
+               flags |= nla_get_be16(data[IFLA_GRE_IFLAGS]);
+       if (!data[IFLA_GRE_COLLECT_METADATA] &&
+           flags != (GRE_SEQ | GRE_KEY))
                return -EINVAL;
 
        /* ERSPAN Session ID only has 10-bit. Since we reuse
         * 32-bit key field as ID, check it's range.
         */
-       if (data[IFLA_GRE_IKEY] &&
-           (ntohl(nla_get_be32(data[IFLA_GRE_IKEY])) & ~ID_MASK))
-               return -EINVAL;
-
        if (data[IFLA_GRE_OKEY] &&
            (ntohl(nla_get_be32(data[IFLA_GRE_OKEY])) & ~ID_MASK))
                return -EINVAL;
@@ -983,6 +985,11 @@ static netdev_tx_t erspan_xmit(struct sk_buff *skb,
        struct ip_tunnel *tunnel = netdev_priv(dev);
        bool truncate = false;
 
+       if (tunnel->collect_md) {
+               erspan_fb_xmit(skb, dev, skb->protocol);
+               return NETDEV_TX_OK;
+       }
+
        if (gre_handle_offloads(skb, false))
                goto free_skb;
 
-- 
1.8.3.1

_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to