 a8c5f90fb5
			
		
	
	
	a8c5f90fb5
	
	
	
		
			
			Instead of calling fou and gue functions directly from ip_tunnel use ops for these that were previously registered. This patch adds the logic to add and remove encapsulation operations for ip_tunnel, and modified fou (and gue) to register with ip_tunnels. This patch also addresses a circular dependency between ip_tunnel and fou that was causing link errors when CONFIG_NET_IP_TUNNEL=y and CONFIG_NET_FOU=m. References to fou an gue have been removed from ip_tunnel.c Reported-by: Randy Dunlap <rdunlap@infradead.org> Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
		
			
				
	
	
		
			221 lines
		
	
	
	
		
			6.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			221 lines
		
	
	
	
		
			6.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef __NET_IP_TUNNELS_H
 | |
| #define __NET_IP_TUNNELS_H 1
 | |
| 
 | |
| #include <linux/if_tunnel.h>
 | |
| #include <linux/netdevice.h>
 | |
| #include <linux/skbuff.h>
 | |
| #include <linux/types.h>
 | |
| #include <linux/u64_stats_sync.h>
 | |
| #include <net/dsfield.h>
 | |
| #include <net/gro_cells.h>
 | |
| #include <net/inet_ecn.h>
 | |
| #include <net/ip.h>
 | |
| #include <net/netns/generic.h>
 | |
| #include <net/rtnetlink.h>
 | |
| 
 | |
| #if IS_ENABLED(CONFIG_IPV6)
 | |
| #include <net/ipv6.h>
 | |
| #include <net/ip6_fib.h>
 | |
| #include <net/ip6_route.h>
 | |
| #endif
 | |
| 
 | |
| /* Keep error state on tunnel for 30 sec */
 | |
| #define IPTUNNEL_ERR_TIMEO	(30*HZ)
 | |
| 
 | |
| /* 6rd prefix/relay information */
 | |
| #ifdef CONFIG_IPV6_SIT_6RD
 | |
| struct ip_tunnel_6rd_parm {
 | |
| 	struct in6_addr		prefix;
 | |
| 	__be32			relay_prefix;
 | |
| 	u16			prefixlen;
 | |
| 	u16			relay_prefixlen;
 | |
| };
 | |
| #endif
 | |
| 
 | |
| struct ip_tunnel_encap {
 | |
| 	__u16			type;
 | |
| 	__u16			flags;
 | |
| 	__be16			sport;
 | |
| 	__be16			dport;
 | |
| };
 | |
| 
 | |
| struct ip_tunnel_prl_entry {
 | |
| 	struct ip_tunnel_prl_entry __rcu *next;
 | |
| 	__be32				addr;
 | |
| 	u16				flags;
 | |
| 	struct rcu_head			rcu_head;
 | |
| };
 | |
| 
 | |
| struct ip_tunnel_dst {
 | |
| 	struct dst_entry __rcu 		*dst;
 | |
| 	__be32				 saddr;
 | |
| };
 | |
| 
 | |
| struct ip_tunnel {
 | |
| 	struct ip_tunnel __rcu	*next;
 | |
| 	struct hlist_node hash_node;
 | |
| 	struct net_device	*dev;
 | |
| 	struct net		*net;	/* netns for packet i/o */
 | |
| 
 | |
| 	int		err_count;	/* Number of arrived ICMP errors */
 | |
| 	unsigned long	err_time;	/* Time when the last ICMP error
 | |
| 					 * arrived */
 | |
| 
 | |
| 	/* These four fields used only by GRE */
 | |
| 	__u32		i_seqno;	/* The last seen seqno	*/
 | |
| 	__u32		o_seqno;	/* The last output seqno */
 | |
| 	int		tun_hlen;	/* Precalculated header length */
 | |
| 	int		mlink;
 | |
| 
 | |
| 	struct ip_tunnel_dst __percpu *dst_cache;
 | |
| 
 | |
| 	struct ip_tunnel_parm parms;
 | |
| 
 | |
| 	int		encap_hlen;	/* Encap header length (FOU,GUE) */
 | |
| 	struct ip_tunnel_encap encap;
 | |
| 
 | |
| 	int		hlen;		/* tun_hlen + encap_hlen */
 | |
| 
 | |
| 	/* for SIT */
 | |
| #ifdef CONFIG_IPV6_SIT_6RD
 | |
| 	struct ip_tunnel_6rd_parm ip6rd;
 | |
| #endif
 | |
| 	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */
 | |
| 	unsigned int		prl_count;	/* # of entries in PRL */
 | |
| 	int			ip_tnl_net_id;
 | |
| 	struct gro_cells	gro_cells;
 | |
| };
 | |
| 
 | |
| #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_OPTIONS_PRESENT	__cpu_to_be16(0x0800)
 | |
| 
 | |
| struct tnl_ptk_info {
 | |
| 	__be16 flags;
 | |
| 	__be16 proto;
 | |
| 	__be32 key;
 | |
| 	__be32 seq;
 | |
| };
 | |
| 
 | |
| #define PACKET_RCVD	0
 | |
| #define PACKET_REJECT	1
 | |
| 
 | |
| #define IP_TNL_HASH_BITS   7
 | |
| #define IP_TNL_HASH_SIZE   (1 << IP_TNL_HASH_BITS)
 | |
| 
 | |
| struct ip_tunnel_net {
 | |
| 	struct net_device *fb_tunnel_dev;
 | |
| 	struct hlist_head tunnels[IP_TNL_HASH_SIZE];
 | |
| };
 | |
| 
 | |
| struct ip_tunnel_encap_ops {
 | |
| 	size_t (*encap_hlen)(struct ip_tunnel_encap *e);
 | |
| 	int (*build_header)(struct sk_buff *skb, struct ip_tunnel_encap *e,
 | |
| 			    u8 *protocol, struct flowi4 *fl4);
 | |
| };
 | |
| 
 | |
| #define MAX_IPTUN_ENCAP_OPS 8
 | |
| 
 | |
| extern const struct ip_tunnel_encap_ops __rcu *
 | |
| 		iptun_encaps[MAX_IPTUN_ENCAP_OPS];
 | |
| 
 | |
| int ip_tunnel_encap_add_ops(const struct ip_tunnel_encap_ops *op,
 | |
| 			    unsigned int num);
 | |
| int ip_tunnel_encap_del_ops(const struct ip_tunnel_encap_ops *op,
 | |
| 			    unsigned int num);
 | |
| 
 | |
| #ifdef CONFIG_INET
 | |
| 
 | |
| int ip_tunnel_init(struct net_device *dev);
 | |
| void ip_tunnel_uninit(struct net_device *dev);
 | |
| void  ip_tunnel_dellink(struct net_device *dev, struct list_head *head);
 | |
| int ip_tunnel_init_net(struct net *net, int ip_tnl_net_id,
 | |
| 		       struct rtnl_link_ops *ops, char *devname);
 | |
| 
 | |
| void ip_tunnel_delete_net(struct ip_tunnel_net *itn, struct rtnl_link_ops *ops);
 | |
| 
 | |
| void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev,
 | |
| 		    const struct iphdr *tnl_params, const u8 protocol);
 | |
| int ip_tunnel_ioctl(struct net_device *dev, struct ip_tunnel_parm *p, int cmd);
 | |
| int ip_tunnel_encap(struct sk_buff *skb, struct ip_tunnel *t,
 | |
| 		    u8 *protocol, struct flowi4 *fl4);
 | |
| int ip_tunnel_change_mtu(struct net_device *dev, int new_mtu);
 | |
| 
 | |
| struct rtnl_link_stats64 *ip_tunnel_get_stats64(struct net_device *dev,
 | |
| 						struct rtnl_link_stats64 *tot);
 | |
| struct ip_tunnel *ip_tunnel_lookup(struct ip_tunnel_net *itn,
 | |
| 				   int link, __be16 flags,
 | |
| 				   __be32 remote, __be32 local,
 | |
| 				   __be32 key);
 | |
| 
 | |
| int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
 | |
| 		  const struct tnl_ptk_info *tpi, bool log_ecn_error);
 | |
| int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],
 | |
| 			 struct ip_tunnel_parm *p);
 | |
| int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[],
 | |
| 		      struct ip_tunnel_parm *p);
 | |
| void ip_tunnel_setup(struct net_device *dev, int net_id);
 | |
| void ip_tunnel_dst_reset_all(struct ip_tunnel *t);
 | |
| int ip_tunnel_encap_setup(struct ip_tunnel *t,
 | |
| 			  struct ip_tunnel_encap *ipencap);
 | |
| 
 | |
| /* Extract dsfield from inner protocol */
 | |
| static inline u8 ip_tunnel_get_dsfield(const struct iphdr *iph,
 | |
| 				       const struct sk_buff *skb)
 | |
| {
 | |
| 	if (skb->protocol == htons(ETH_P_IP))
 | |
| 		return iph->tos;
 | |
| 	else if (skb->protocol == htons(ETH_P_IPV6))
 | |
| 		return ipv6_get_dsfield((const struct ipv6hdr *)iph);
 | |
| 	else
 | |
| 		return 0;
 | |
| }
 | |
| 
 | |
| /* Propogate ECN bits out */
 | |
| static inline u8 ip_tunnel_ecn_encap(u8 tos, const struct iphdr *iph,
 | |
| 				     const struct sk_buff *skb)
 | |
| {
 | |
| 	u8 inner = ip_tunnel_get_dsfield(iph, skb);
 | |
| 
 | |
| 	return INET_ECN_encapsulate(tos, inner);
 | |
| }
 | |
| 
 | |
| int iptunnel_pull_header(struct sk_buff *skb, int hdr_len, __be16 inner_proto);
 | |
| int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
 | |
| 		  __be32 src, __be32 dst, __u8 proto,
 | |
| 		  __u8 tos, __u8 ttl, __be16 df, bool xnet);
 | |
| 
 | |
| struct sk_buff *iptunnel_handle_offloads(struct sk_buff *skb, bool gre_csum,
 | |
| 					 int gso_type_mask);
 | |
| 
 | |
| static inline void iptunnel_xmit_stats(int err,
 | |
| 				       struct net_device_stats *err_stats,
 | |
| 				       struct pcpu_sw_netstats __percpu *stats)
 | |
| {
 | |
| 	if (err > 0) {
 | |
| 		struct pcpu_sw_netstats *tstats = this_cpu_ptr(stats);
 | |
| 
 | |
| 		u64_stats_update_begin(&tstats->syncp);
 | |
| 		tstats->tx_bytes += err;
 | |
| 		tstats->tx_packets++;
 | |
| 		u64_stats_update_end(&tstats->syncp);
 | |
| 	} else if (err < 0) {
 | |
| 		err_stats->tx_errors++;
 | |
| 		err_stats->tx_aborted_errors++;
 | |
| 	} else {
 | |
| 		err_stats->tx_dropped++;
 | |
| 	}
 | |
| }
 | |
| 
 | |
| #endif /* CONFIG_INET */
 | |
| 
 | |
| #endif /* __NET_IP_TUNNELS_H */
 |