ip_tunnel: Make ovs_tunnel_info and ovs_key_ipv4_tunnel generic

Rename the tunnel metadata data structures currently internal to
OVS and make them generic for use by all IP tunnels.

Both structures are kernel internal and will stay that way. Their
members are exposed to user space through individual Netlink
attributes by OVS. It will therefore be possible to extend/modify
these structures without affecting user ABI.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 73 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index a076e445ccc2..cadc6c5c3545 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -32,31 +32,10 @@
 #include <linux/time.h>
 #include <linux/flex_array.h>
 #include <net/inet_ecn.h>
+#include <net/ip_tunnels.h>
 
 struct sk_buff;
 
-/* Used to memset ovs_key_ipv4_tunnel padding. */
-#define OVS_TUNNEL_KEY_SIZE                                     \
-        (offsetof(struct ovs_key_ipv4_tunnel, tp_dst) +         \
-         FIELD_SIZEOF(struct ovs_key_ipv4_tunnel, tp_dst))
-
-struct ovs_key_ipv4_tunnel {
-        __be64 tun_id;
-        __be32 ipv4_src;
-        __be32 ipv4_dst;
-        __be16 tun_flags;
-        u8   ipv4_tos;
-        u8   ipv4_ttl;
-        __be16 tp_src;
-        __be16 tp_dst;
-} __packed __aligned(4); /* Minimize padding. */
-
-struct ovs_tunnel_info {
-        struct ovs_key_ipv4_tunnel tunnel;
-        const void *options;
-        u8 options_len;
-};
-
 /* Store options at the end of the array if they are less than the
  * maximum size. This allows us to get the benefits of variable length
  * matching for small options.
@@ -66,55 +45,6 @@ struct ovs_tunnel_info {
 #define TUN_METADATA_OPTS(flow_key, opt_len) \
         ((void *)((flow_key)->tun_opts + TUN_METADATA_OFFSET(opt_len)))
 
-static inline void __ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
-                                            __be32 saddr, __be32 daddr,
-                                            u8 tos, u8 ttl,
-                                            __be16 tp_src,
-                                            __be16 tp_dst,
-                                            __be64 tun_id,
-                                            __be16 tun_flags,
-                                            const void *opts,
-                                            u8 opts_len)
-{
-        tun_info->tunnel.tun_id = tun_id;
-        tun_info->tunnel.ipv4_src = saddr;
-        tun_info->tunnel.ipv4_dst = daddr;
-        tun_info->tunnel.ipv4_tos = tos;
-        tun_info->tunnel.ipv4_ttl = ttl;
-        tun_info->tunnel.tun_flags = tun_flags;
-
-        /* For the tunnel types on the top of IPsec, the tp_src and tp_dst of
-         * the upper tunnel are used.
-         * E.g: GRE over IPSEC, the tp_src and tp_port are zero.
-         */
-        tun_info->tunnel.tp_src = tp_src;
-        tun_info->tunnel.tp_dst = tp_dst;
-
-        /* Clear struct padding. */
-        if (sizeof(tun_info->tunnel) != OVS_TUNNEL_KEY_SIZE)
-                memset((unsigned char *)&tun_info->tunnel + OVS_TUNNEL_KEY_SIZE,
-                       0, sizeof(tun_info->tunnel) - OVS_TUNNEL_KEY_SIZE);
-
-        tun_info->options = opts;
-        tun_info->options_len = opts_len;
-}
-
-static inline void ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
-                                          const struct iphdr *iph,
-                                          __be16 tp_src,
-                                          __be16 tp_dst,
-                                          __be64 tun_id,
-                                          __be16 tun_flags,
-                                          const void *opts,
-                                          u8 opts_len)
-{
-        __ovs_flow_tun_info_init(tun_info, iph->saddr, iph->daddr,
-                                 iph->tos, iph->ttl,
-                                 tp_src, tp_dst,
-                                 tun_id, tun_flags,
-                                 opts, opts_len);
-}
-
 #define OVS_SW_FLOW_KEY_METADATA_SIZE                   \
         (offsetof(struct sw_flow_key, recirc_id) +      \
         FIELD_SIZEOF(struct sw_flow_key, recirc_id))
@@ -122,7 +52,7 @@ static inline void ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
 struct sw_flow_key {
         u8 tun_opts[255];
         u8 tun_opts_len;
-        struct ovs_key_ipv4_tunnel tun_key;  /* Encapsulating tunnel key. */
+        struct ip_tunnel_key tun_key;   /* Encapsulating tunnel key. */
         struct {
                 u32     priority;       /* Packet QoS priority. */
                 u32     skb_mark;       /* SKB mark. */
@@ -273,7 +203,7 @@ void ovs_flow_stats_clear(struct sw_flow *);
 u64 ovs_flow_used_time(unsigned long flow_jiffies);
 
 int ovs_flow_key_update(struct sk_buff *skb, struct sw_flow_key *key);
-int ovs_flow_key_extract(const struct ovs_tunnel_info *tun_info,
+int ovs_flow_key_extract(const struct ip_tunnel_info *tun_info,
                          struct sk_buff *skb,
                          struct sw_flow_key *key);
 /* Extract key from packet coming from userspace. */