openvswitch: Wrap struct ovs_key_ipv4_tunnel in a new structure.

Currently, the flow information that is matched for tunnels and
the tunnel data passed around with packets is the same. However,
as additional information is added this is not necessarily desirable,
as in the case of pointers.

This adds a new structure for tunnel metadata which currently contains
only the existing struct. This change is purely internal to the kernel
since the current OVS_KEY_ATTR_IPV4_TUNNEL is simply a compressed version
of OVS_KEY_ATTR_TUNNEL that is translated at flow setup.

Signed-off-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 17 insertions, 13 deletions

diff --git a/net/openvswitch/flow.h b/net/openvswitch/flow.h
index 0f5db4ec565d..fe5a71b81c1f 100644
--- a/net/openvswitch/flow.h
+++ b/net/openvswitch/flow.h
@@ -49,20 +49,24 @@ struct ovs_key_ipv4_tunnel {
         u8   ipv4_ttl;
 } __packed __aligned(4); /* Minimize padding. */
 
-static inline void ovs_flow_tun_key_init(struct ovs_key_ipv4_tunnel *tun_key,
-                                         const struct iphdr *iph, __be64 tun_id,
-                                         __be16 tun_flags)
+struct ovs_tunnel_info {
+        struct ovs_key_ipv4_tunnel tunnel;
+};
+
+static inline void ovs_flow_tun_info_init(struct ovs_tunnel_info *tun_info,
+                                          const struct iphdr *iph,
+                                          __be64 tun_id, __be16 tun_flags)
 {
-        tun_key->tun_id = tun_id;
-        tun_key->ipv4_src = iph->saddr;
-        tun_key->ipv4_dst = iph->daddr;
-        tun_key->ipv4_tos = iph->tos;
-        tun_key->ipv4_ttl = iph->ttl;
-        tun_key->tun_flags = tun_flags;
+        tun_info->tunnel.tun_id = tun_id;
+        tun_info->tunnel.ipv4_src = iph->saddr;
+        tun_info->tunnel.ipv4_dst = iph->daddr;
+        tun_info->tunnel.ipv4_tos = iph->tos;
+        tun_info->tunnel.ipv4_ttl = iph->ttl;
+        tun_info->tunnel.tun_flags = tun_flags;
 
         /* clear struct padding. */
-        memset((unsigned char *) tun_key + OVS_TUNNEL_KEY_SIZE, 0,
-               sizeof(*tun_key) - OVS_TUNNEL_KEY_SIZE);
+        memset((unsigned char *)&tun_info->tunnel + OVS_TUNNEL_KEY_SIZE, 0,
+               sizeof(tun_info->tunnel) - OVS_TUNNEL_KEY_SIZE);
 }
 
 struct sw_flow_key {
@@ -190,8 +194,8 @@ 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(struct ovs_key_ipv4_tunnel *tun_key,
-                         struct sk_buff *skb, struct sw_flow_key *key);
+int ovs_flow_key_extract(struct ovs_tunnel_info *tun_info, struct sk_buff *skb,
+                         struct sw_flow_key *key);
 /* Extract key from packet coming from userspace. */
 int ovs_flow_key_extract_userspace(const struct nlattr *attr,
                                    struct sk_buff *skb,