X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Ftunnel.h;h=951a6f1f7fceab0657be94c23cd6c62daa94549d;hb=7c690f462fec1af60d76c67fac226fc648ea9149;hp=b3e21fa9f3006904518515410e915452fc0de419;hpb=f686a33af8cb41ee228e6a35410c9a488fba3eb1;p=sliver-openvswitch.git diff --git a/datapath/tunnel.h b/datapath/tunnel.h index b3e21fa9f..951a6f1f7 100644 --- a/datapath/tunnel.h +++ b/datapath/tunnel.h @@ -1,15 +1,27 @@ /* - * Copyright (c) 2010, 2011 Nicira Networks. - * Distributed under the terms of the GNU GPL version 2. + * Copyright (c) 2007-2012 Nicira, Inc. * - * Significant portions of this file may be copied from parts of the Linux - * kernel, by Linus Torvalds and others. + * This program is free software; you can redistribute it and/or + * modify it under the terms of version 2 of the GNU General Public + * License as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301, USA */ #ifndef TUNNEL_H #define TUNNEL_H 1 #include +#include +#include #include "flow.h" #include "openvswitch/tunnel.h" @@ -28,16 +40,18 @@ * identifiers. */ #define TNL_T_PROTO_GRE 0 -#define TNL_T_PROTO_CAPWAP 1 +#define TNL_T_PROTO_GRE64 1 +#define TNL_T_PROTO_CAPWAP 2 /* These flags are only needed when calling tnl_find_port(). */ #define TNL_T_KEY_EXACT (1 << 10) #define TNL_T_KEY_MATCH (1 << 11) -#define TNL_T_KEY_EITHER (TNL_T_KEY_EXACT | TNL_T_KEY_MATCH) /* Private flags not exposed to userspace in this form. */ -#define TNL_F_IN_KEY_MATCH (1 << 16) /* Store the key in tun_id to match in flow table. */ -#define TNL_F_OUT_KEY_ACTION (1 << 17) /* Get the key from a SET_TUNNEL action. */ +#define TNL_F_IN_KEY_MATCH (1 << 16) /* Store the key in tun_id to + * match in flow table. */ +#define TNL_F_OUT_KEY_ACTION (1 << 17) /* Get the key from a SET_TUNNEL + * action. */ /* All public tunnel flags. */ #define TNL_F_PUBLIC (TNL_F_CSUM | TNL_F_TOS_INHERIT | TNL_F_TTL_INHERIT | \ @@ -47,17 +61,34 @@ /** * struct port_lookup_key - Tunnel port key, used as hash table key. * @in_key: Key to match on input, 0 for wildcard. + * @net: Network namespace of the port. * @saddr: IPv4 source address to match, 0 to accept any source address. * @daddr: IPv4 destination of tunnel. * @tunnel_type: Set of TNL_T_* flags that define lookup. */ struct port_lookup_key { __be64 in_key; +#ifdef CONFIG_NET_NS + struct net *net; +#endif __be32 saddr; __be32 daddr; u32 tunnel_type; }; +#define PORT_KEY_LEN (offsetof(struct port_lookup_key, tunnel_type) + \ + FIELD_SIZEOF(struct port_lookup_key, tunnel_type)) + +static inline struct net *port_key_get_net(const struct port_lookup_key *key) +{ + return read_pnet(&key->net); +} + +static inline void port_key_set_net(struct port_lookup_key *key, struct net *net) +{ + write_pnet(&key->net, net); +} + /** * struct tnl_mutable_config - modifiable configuration for a tunnel. * @key: Used as key for tunnel port. Configured via OVS_TUNNEL_ATTR_* @@ -78,8 +109,6 @@ struct tnl_mutable_config { unsigned seq; - unsigned tunnel_hlen; - unsigned char eth_addr[ETH_ALEN]; /* Configured via OVS_TUNNEL_ATTR_* attributes. */ @@ -87,6 +116,9 @@ struct tnl_mutable_config { u32 flags; u8 tos; u8 ttl; + + /* Multicast configuration. */ + int mlink; }; struct tnl_ops { @@ -98,7 +130,8 @@ struct tnl_ops { * build_header() (i.e. excludes the IP header). Returns a negative * error code if the configuration is invalid. */ - int (*hdr_len)(const struct tnl_mutable_config *); + int (*hdr_len)(const struct tnl_mutable_config *, + const struct ovs_key_ipv4_tunnel *); /* * Builds the static portion of the tunnel header, which is stored in @@ -109,7 +142,8 @@ struct tnl_ops { * called for every packet, so try not to make it too slow. */ void (*build_header)(const struct vport *, - const struct tnl_mutable_config *, void *header); + const struct tnl_mutable_config *, + const struct ovs_key_ipv4_tunnel *, void *header); /* * Updates the cached header of a packet to match the actual packet @@ -121,7 +155,8 @@ struct tnl_ops { */ struct sk_buff *(*update_header)(const struct vport *, const struct tnl_mutable_config *, - struct dst_entry *, struct sk_buff *); + struct dst_entry *, struct sk_buff *, + int tunnel_hlen); }; #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,20) @@ -146,8 +181,10 @@ struct tnl_cache { struct rcu_head rcu; int len; /* Length of data to be memcpy'd from cache. */ + int hh_len; /* Hardware hdr length, cached from hh_cache. */ - /* Sequence number of mutable->seq from which this cache was generated. */ + /* Sequence number of mutable->seq from which this cache was + * generated. */ unsigned mutable_seq; #ifdef HAVE_HH_SEQ @@ -210,7 +247,7 @@ struct tnl_vport { atomic_t frag_id; spinlock_t cache_lock; - struct tnl_cache __rcu *cache; /* Protected by RCU/cache_lock. */ + struct tnl_cache __rcu *cache; /* Protected by RCU/cache_lock. */ #ifdef NEED_CACHE_TIMEOUT /* @@ -223,33 +260,43 @@ struct tnl_vport { #endif }; -struct vport *tnl_create(const struct vport_parms *, const struct vport_ops *, - const struct tnl_ops *); -void tnl_destroy(struct vport *); - -int tnl_set_options(struct vport *, struct nlattr *); -int tnl_get_options(const struct vport *, struct sk_buff *); - -int tnl_set_addr(struct vport *vport, const unsigned char *addr); -const char *tnl_get_name(const struct vport *vport); -const unsigned char *tnl_get_addr(const struct vport *vport); -int tnl_send(struct vport *vport, struct sk_buff *skb); -void tnl_rcv(struct vport *vport, struct sk_buff *skb, u8 tos); - -struct vport *tnl_find_port(__be32 saddr, __be32 daddr, __be64 key, - int tunnel_type, - const struct tnl_mutable_config **mutable); -bool tnl_frag_needed(struct vport *vport, - const struct tnl_mutable_config *mutable, - struct sk_buff *skb, unsigned int mtu, __be64 flow_key); -void tnl_free_linked_skbs(struct sk_buff *skb); - -int tnl_init(void); -void tnl_exit(void); +struct vport *ovs_tnl_create(const struct vport_parms *, const struct vport_ops *, + const struct tnl_ops *); +void ovs_tnl_destroy(struct vport *); + +int ovs_tnl_set_options(struct vport *, struct nlattr *); +int ovs_tnl_get_options(const struct vport *, struct sk_buff *); + +int ovs_tnl_set_addr(struct vport *vport, const unsigned char *addr); +const char *ovs_tnl_get_name(const struct vport *vport); +const unsigned char *ovs_tnl_get_addr(const struct vport *vport); +int ovs_tnl_send(struct vport *vport, struct sk_buff *skb); +void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb); + +struct vport *ovs_tnl_find_port(struct net *net, __be32 saddr, __be32 daddr, + __be64 key, int tunnel_type, + const struct tnl_mutable_config **mutable); +bool ovs_tnl_frag_needed(struct vport *vport, + const struct tnl_mutable_config *mutable, + struct sk_buff *skb, unsigned int mtu); +void ovs_tnl_free_linked_skbs(struct sk_buff *skb); + +int ovs_tnl_init(void); +void ovs_tnl_exit(void); static inline struct tnl_vport *tnl_vport_priv(const struct vport *vport) { return vport_priv(vport); } +static inline void tnl_tun_key_init(struct ovs_key_ipv4_tunnel *tun_key, + const struct iphdr *iph, __be64 tun_id, u32 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; +} #endif /* tunnel.h */