commit 1659a4ead54b7109d50420b13ae4436399c3630a · pyrox.dev/nixpkgs

+22 -24

pkgs/os-specific/linux/fanctl/default.nix

···

       1
       1
       -
       { stdenv, lib, fetchbzr, makeWrapper, bridge-utils, iproute, dnsmasq, iptables, kmod, utillinux }:

     

       1
       1
       +
       { stdenv, lib, fetchurl, gnugrep, glibc, gawk, coreutils, bridge-utils, iproute

     

       2
       2
       +
       , dnsmasq, iptables, kmod, utillinux, gnused }:

     

       2
       3
        
       

     

       3
       3
       -
       let stateDir = "/var/lib/fan-networking";

     

       4
       4
       -
       in stdenv.mkDerivation rec {

     

       4
       4
       +
       stdenv.mkDerivation rec {

     

       5
       5
        
         name = "fanctl-${version}";

     

       6
       6
        
       

     

       7
       7
       -
         version = "0.3.0";

     

       7
       7
       +
         version = "0.9.0";

     

       8
       8
        
       

     

       9
       9
       -
         src = fetchbzr {

     

       10
       10
       -
           url = "https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/ubuntu-fan/vivid-updates";

     

       11
       11
       -
           rev = 2;

     

       12
       12
       -
           sha256 = "1vcr2rg99g7sx1zynhiggjzc9y9z591i4535hbm21dysy3cisp7i";

     

       9
       9
       +
         src = fetchurl {

     

       10
       10
       +
           url = "https://launchpad.net/ubuntu/+archive/primary/+files/ubuntu-fan_${version}.tar.xz";

     

       11
       11
       +
           sha256 = "03dv5zzb8fkl9kkbhznxm48d6j3fjms74fn0s1zip2gz53l1s14n";

     

       13
       12
        
         };

     

       14
       13
        
       

     

       15
       15
       -
         buildInputs = [ makeWrapper ];

     

       14
       14
       +
         # The Ubuntu package creates a number of state/config directories upon

     

       15
       15
       +
         # installation, and so the fanctl script expects those directories to exist

     

       16
       16
       +
         # before being used. Instead, we patch the fanctl script to gracefully handle

     

       17
       17
       +
         # the fact that the directories might not exist yet.

     

       18
       18
       +
         # Also, when dnsmasq is given --conf-file="", it will still attempt to read

     

       19
       19
       +
         # /etc/dnsmasq.conf; if that file does not exist, dnsmasq subsequently fails,

     

       20
       20
       +
         # so we'll use /dev/null, which actually works as intended.

     

       21
       21
       +
         patches = [ ./robustness.patch ];

     

       16
       22
        
       

     

       17
       17
       -
         # When given --conf-file="", dnsmasq still attempts to read /etc/dnsmasq.conf;

     

       18
       18
       -
         # if that files does not exist, dnsmasq subsequently fails,

     

       19
       19
       -
         # so we'll use /dev/null.

     

       20
       20
       -
         #

     

       21
       21
       -
         # Also, make sure the state directory before starting dnsmasq.

     

       22
       22
       -
         buildPhase = ''

     

       23
       23
       +
         postPatch = ''

     

       23
       24
        
           substituteInPlace fanctl \

     

       24
       24
       -
             --replace '--conf-file= ' \

     

       25
       25
       -
                       '--conf-file=/dev/null ' \

     

       26
       26
       -
             --replace '/var/lib/misc' \

     

       27
       27
       -
                       '${stateDir}'

     

       28
       28
       -
       

     

       29
       29
       -
           sed -i '/dnsmasq -u/i \

     

       30
       30
       -
           mkdir -p ${stateDir}' fanctl

     

       25
       25
       +
             --replace '@PATH@' \

     

       26
       26
       +
                       '${lib.makeSearchPath "bin" [

     

       27
       27
       +
                            gnugrep gawk coreutils bridge-utils iproute dnsmasq

     

       28
       28
       +
                            iptables kmod utillinux gnused

     

       29
       29
       +
                            glibc # needed for getent

     

       30
       30
       +
                          ]}'

     

       31
       31
        
         '';

     

       32
       32
        
       

     

       33
       33
        
         installPhase = ''

     

       34
       34
        
           mkdir -p $out/bin $out/man/man8

     

       35
       35
        
           cp fanctl.8 $out/man/man8

     

       36
       36
        
           cp fanctl $out/bin

     

       37
       37
       -
           wrapProgram $out/bin/fanctl --prefix PATH : \

     

       38
       38
       -
             ${lib.makeSearchPath "bin" [ bridge-utils iproute dnsmasq iptables kmod utillinux ]};

     

       39
       37
        
         '';

     

       40
       38
        
       

     

       41
       39
        
         meta = with lib; {

+85

pkgs/os-specific/linux/fanctl/robustness.patch

···

       1
       1
       +
       diff --git a/fanctl b/fanctl

     

       2
       2
       +
       index 4338b75..84cf987 100755

     

       3
       3
       +
       --- a/fanctl

     

       4
       4
       +
       +++ b/fanctl

     

       5
       5
       +
       @@ -5,6 +5,8 @@

     

       6
       6
       +
        #   fanctl down 15 10.1.0.1

     

       7
       7
       +
        #

     

       8
       8
       +
        

     

       9
       9
       +
       +export PATH="@PATH@"

     

       10
       10
       +
       +

     

       11
       11
       +
        usage()

     

       12
       12
       +
        {

     

       13
       13
       +
        	echo "Usage: $0 <cmd> [<options>...]" 1>&2

     

       14
       14
       +
       @@ -23,8 +25,8 @@ run()

     

       15
       15
       +
        	"$@"

     

       16
       16
       +
        }

     

       17
       17
       +
        

     

       18
       18
       +
       -state_dir="/run/ubuntu-fan"

     

       19
       19
       +
       -lconfig_dir="/var/lib/ubuntu-fan/config"

     

       20
       20
       +
       +state_dir="/run/fan-networking"

     

       21
       21
       +
       +lconfig_dir="/var/lib/fan-networking/config"

     

       22
       22
       +
        

     

       23
       23
       +
        __ip_split()

     

       24
       24
       +
        {

     

       25
       25
       +
       @@ -931,12 +933,12 @@ dhcp_reconfigure()

     

       26
       26
       +
        		--strict-order \

     

       27
       27
       +
        		--bind-interfaces \

     

       28
       28
       +
        		--pid-file="$state_dir/dnsmasq-$C_bridge_state.pid" \

     

       29
       29
       +
       -		--conf-file= \

     

       30
       30
       +
       +		--conf-file=/dev/null \

     

       31
       31
       +
        		$dhcp_flags \

     

       32
       32
       +
        		--dhcp-no-override \

     

       33
       33
       +
        		--except-interface=lo \

     

       34
       34
       +
        		--interface="$C_bridge" \

     

       35
       35
       +
       -		--dhcp-leasefile=/var/lib/misc/dnsmasq."$C_bridge_state".leases \

     

       36
       36
       +
       +		--dhcp-leasefile=/var/lib/fan-networking/dnsmasq."$C_bridge_state".leases \

     

       37
       37
       +
        		--dhcp-authoritative \

     

       38
       38
       +
        	    || $fail "$C_bridge: failed to start dnsmasq"

     

       39
       39
       +
        

     

       40
       40
       +
       @@ -1559,21 +1561,23 @@ cmd_config()

     

       41
       41
       +
        

     

       42
       42
       +
        	case "$cmd" in

     

       43
       43
       +
        	list|ls)

     

       44
       44
       +
       -		ls -1 "$lconfig_dir" | \

     

       45
       45
       +
       -		while read config

     

       46
       46
       +
       -		do

     

       47
       47
       +
       -			case "$config" in

     

       48
       48
       +
       -			*.conf)		;;

     

       49
       49
       +
       -			*)		continue ;;

     

       50
       50
       +
       -			esac

     

       51
       51
       +
       +		if [ -d $lconfig_dir ]; then

     

       52
       52
       +
       +			ls -1 "$lconfig_dir" | \

     

       53
       53
       +
       +			while read config

     

       54
       54
       +
       +			do

     

       55
       55
       +
       +				case "$config" in

     

       56
       56
       +
       +				*.conf)		;;

     

       57
       57
       +
       +				*)		continue ;;

     

       58
       58
       +
       +				esac

     

       59
       59
       +
        

     

       60
       60
       +
       -			config=$( echo "$config" | sed \

     

       61
       61
       +
       -				-e 's/.conf$//' \

     

       62
       62
       +
       -				-e 's/--/ /g' \

     

       63
       63
       +
       -				-e 's@-@/@g'

     

       64
       64
       +
       -			)

     

       65
       65
       +
       -			echo "$config"

     

       66
       66
       +
       -		done

     

       67
       67
       +
       +				config=$( echo "$config" | sed \

     

       68
       68
       +
       +					-e 's/.conf$//' \

     

       69
       69
       +
       +					-e 's/--/ /g' \

     

       70
       70
       +
       +					-e 's@-@/@g'

     

       71
       71
       +
       +				)

     

       72
       72
       +
       +				echo "$config"

     

       73
       73
       +
       +			done

     

       74
       74
       +
       +		fi

     

       75
       75
       +
        		;;

     

       76
       76
       +
        	show)

     

       77
       77
       +
        		cmd_decode_init

     

       78
       78
       +
       @@ -1588,6 +1592,7 @@ cmd_config()

     

       79
       79
       +
        		[ -f "$uconfig" ] && cat "$uconfig"

     

       80
       80
       +
        		;;

     

       81
       81
       +
        	set)

     

       82
       82
       +
       +		mkdir -p $lconfig_dir || fail "could not create config directory ($lconfig_dir)"

     

       83
       83
       +
        		cmd_decode_init

     

       84
       84
       +
        		if ! cmd_decode_config "config set" "$@"; then

     

       85
       85
       +
        			fail "invalid config"

+65

pkgs/os-specific/linux/iproute/1000-ubuntu-poc-fan-driver.patch

···

       1
       1
       +
       Description: POC fan driver support

     

       2
       2
       +
        POC Fan driver support

     

       3
       3
       +
       Author: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       4
       4
       +
       

     

       5
       5
       +
       Index: iproute2-4.1.1/include/linux/if_tunnel.h

     

       6
       6
       +
       ===================================================================

     

       7
       7
       +
       --- iproute2-4.1.1.orig/include/linux/if_tunnel.h

     

       8
       8
       +
       +++ iproute2-4.1.1/include/linux/if_tunnel.h

     

       9
       9
       +
       @@ -57,6 +57,9 @@ enum {

     

       10
       10
       +
        	IFLA_IPTUN_ENCAP_FLAGS,

     

       11
       11
       +
        	IFLA_IPTUN_ENCAP_SPORT,

     

       12
       12
       +
        	IFLA_IPTUN_ENCAP_DPORT,

     

       13
       13
       +
       +

     

       14
       14
       +
       +	IFLA_IPTUN_FAN_UNDERLAY = 32,

     

       15
       15
       +
       +

     

       16
       16
       +
        	__IFLA_IPTUN_MAX,

     

       17
       17
       +
        };

     

       18
       18
       +
        #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

     

       19
       19
       +
       Index: iproute2-4.1.1/ip/link_iptnl.c

     

       20
       20
       +
       ===================================================================

     

       21
       21
       +
       --- iproute2-4.1.1.orig/ip/link_iptnl.c

     

       22
       22
       +
       +++ iproute2-4.1.1/ip/link_iptnl.c

     

       23
       23
       +
       @@ -66,6 +66,7 @@ static int iptunnel_parse_opt(struct lin

     

       24
       24
       +
        	__u32 link = 0;

     

       25
       25
       +
        	__u32 laddr = 0;

     

       26
       26
       +
        	__u32 raddr = 0;

     

       27
       27
       +
       +	__u32 underlay = 0;

     

       28
       28
       +
        	__u8 ttl = 0;

     

       29
       29
       +
        	__u8 tos = 0;

     

       30
       30
       +
        	__u8 pmtudisc = 1;

     

       31
       31
       +
       @@ -174,6 +175,9 @@ get_failed:

     

       32
       32
       +
        				raddr = get_addr32(*argv);

     

       33
       33
       +
        			else

     

       34
       34
       +
        				raddr = 0;

     

       35
       35
       +
       +		} else if (strcmp(*argv, "underlay") == 0) {

     

       36
       36
       +
       +			NEXT_ARG();

     

       37
       37
       +
       +			underlay = get_addr32(*argv);

     

       38
       38
       +
        		} else if (strcmp(*argv, "local") == 0) {

     

       39
       39
       +
        			NEXT_ARG();

     

       40
       40
       +
        			if (strcmp(*argv, "any"))

     

       41
       41
       +
       @@ -318,6 +322,9 @@ get_failed:

     

       42
       42
       +
        		}

     

       43
       43
       +
        	}

     

       44
       44
       +
        

     

       45
       45
       +
       +	if (underlay)

     

       46
       46
       +
       +		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);

     

       47
       47
       +
       +

     

       48
       48
       +
        	return 0;

     

       49
       49
       +
        }

     

       50
       50
       +
        

     

       51
       51
       +
       @@ -349,6 +356,14 @@ static void iptunnel_print_opt(struct li

     

       52
       52
       +
        

     

       53
       53
       +
        	fprintf(f, "local %s ", local);

     

       54
       54
       +
        

     

       55
       55
       +
       +	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {

     

       56
       56
       +
       +		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);

     

       57
       57
       +
       +

     

       58
       58
       +
       +		if (addr)

     

       59
       59
       +
       +			fprintf(f, "underlay %s ",

     

       60
       60
       +
       +				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

     

       61
       61
       +
       +	}

     

       62
       62
       +
       +

     

       63
       63
       +
        	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {

     

       64
       64
       +
        		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);

     

       65
       65
       +
        		const char *n = if_indextoname(link, s2);

+133

pkgs/os-specific/linux/iproute/1001-ubuntu-poc-fan-driver-v3.patch

···

       1
       1
       +
       Description: Fan driver support v3

     

       2
       2
       +
        Fan driver support v3

     

       3
       3
       +
       Author: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       4
       4
       +
       Index: iproute2-4.1.1/include/linux/if_tunnel.h

     

       5
       5
       +
       ===================================================================

     

       6
       6
       +
       --- iproute2-4.1.1.orig/include/linux/if_tunnel.h

     

       7
       7
       +
       +++ iproute2-4.1.1/include/linux/if_tunnel.h

     

       8
       8
       +
       @@ -59,6 +59,7 @@ enum {

     

       9
       9
       +
        	IFLA_IPTUN_ENCAP_DPORT,

     

       10
       10
       +
        

     

       11
       11
       +
        	IFLA_IPTUN_FAN_UNDERLAY = 32,

     

       12
       12
       +
       +	IFLA_IPTUN_FAN_MAP = 33,

     

       13
       13
       +
        

     

       14
       14
       +
        	__IFLA_IPTUN_MAX,

     

       15
       15
       +
        };

     

       16
       16
       +
       @@ -134,4 +135,20 @@ enum {

     

       17
       17
       +
        };

     

       18
       18
       +
        

     

       19
       19
       +
        #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)

     

       20
       20
       +
       +

     

       21
       21
       +
       +enum {

     

       22
       22
       +
       +	IFLA_FAN_UNSPEC,

     

       23
       23
       +
       +	IFLA_FAN_MAPPING,

     

       24
       24
       +
       +	__IFLA_FAN_MAX,

     

       25
       25
       +
       +};

     

       26
       26
       +
       +

     

       27
       27
       +
       +#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       28
       28
       +
       +

     

       29
       29
       +
       +struct ip_tunnel_fan_map {

     

       30
       30
       +
       +	__be32		underlay;

     

       31
       31
       +
       +	__be32		overlay;

     

       32
       32
       +
       +	__u16		underlay_prefix;

     

       33
       33
       +
       +	__u16		overlay_prefix;

     

       34
       34
       +
       +};

     

       35
       35
       +
       +

     

       36
       36
       +
        #endif /* _IF_TUNNEL_H_ */

     

       37
       37
       +
       Index: iproute2-4.1.1/ip/link_iptnl.c

     

       38
       38
       +
       ===================================================================

     

       39
       39
       +
       --- iproute2-4.1.1.orig/ip/link_iptnl.c

     

       40
       40
       +
       +++ iproute2-4.1.1/ip/link_iptnl.c

     

       41
       41
       +
       @@ -49,6 +49,42 @@ static void usage(int sit)

     

       42
       42
       +
        	print_usage(stderr, sit);

     

       43
       43
       +
        	exit(-1);

     

       44
       44
       +
        }

     

       45
       45
       +
       +static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)

     

       46
       46
       +
       +{

     

       47
       47
       +
       +	inet_prefix underlay, overlay;

     

       48
       48
       +
       +	struct ip_tunnel_fan_map map;

     

       49
       49
       +
       +	struct rtattr *nest;

     

       50
       50
       +
       +	char **argv = *argvp;

     

       51
       51
       +
       +	int argc = *argcp;

     

       52
       52
       +
       +

     

       53
       53
       +
       +	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);

     

       54
       54
       +
       +	while (argc > 0) {

     

       55
       55
       +
       +		char *colon = strchr(*argv, ':');

     

       56
       56
       +
       +

     

       57
       57
       +
       +		if (!colon)

     

       58
       58
       +
       +			break;

     

       59
       59
       +
       +		*colon = '\0';

     

       60
       60
       +
       +

     

       61
       61
       +
       +		if (get_prefix(&overlay, *argv, AF_INET))

     

       62
       62
       +
       +			invarg("invalid fan-map overlay", *argv);

     

       63
       63
       +
       +		if (get_prefix(&underlay, colon + 1, AF_INET))

     

       64
       64
       +
       +			invarg("invalid fan-map underlay", colon + 1);

     

       65
       65
       +
       +		

     

       66
       66
       +
       +		memcpy(&map.underlay, underlay.data, 4);

     

       67
       67
       +
       +		map.underlay_prefix = underlay.bitlen;

     

       68
       68
       +
       +		memcpy(&map.overlay, overlay.data, 4);

     

       69
       69
       +
       +		map.overlay_prefix = overlay.bitlen;

     

       70
       70
       +
       +

     

       71
       71
       +
       +		argc--, argv++;

     

       72
       72
       +
       +

     

       73
       73
       +
       +		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));

     

       74
       74
       +
       +	}

     

       75
       75
       +
       +	addattr_nest_end(n, nest);

     

       76
       76
       +
       +

     

       77
       77
       +
       +	*argcp = argc;

     

       78
       78
       +
       +	*argvp = argv;

     

       79
       79
       +
       +	return 0;

     

       80
       80
       +
       +}

     

       81
       81
       +
        

     

       82
       82
       +
        static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,

     

       83
       83
       +
        			      struct nlmsghdr *n)

     

       84
       84
       +
       @@ -178,6 +214,10 @@ get_failed:

     

       85
       85
       +
        		} else if (strcmp(*argv, "underlay") == 0) {

     

       86
       86
       +
        			NEXT_ARG();

     

       87
       87
       +
        			underlay = get_addr32(*argv);

     

       88
       88
       +
       +		} else if (strcmp(*argv, "fan-map") == 0) {

     

       89
       89
       +
       +			NEXT_ARG();

     

       90
       90
       +
       +			if (fan_parse_map(&argc, &argv, n))

     

       91
       91
       +
       +				invarg("invalid fan-map", *argv);

     

       92
       92
       +
        		} else if (strcmp(*argv, "local") == 0) {

     

       93
       93
       +
        			NEXT_ARG();

     

       94
       94
       +
        			if (strcmp(*argv, "any"))

     

       95
       95
       +
       @@ -328,6 +368,28 @@ get_failed:

     

       96
       96
       +
        	return 0;

     

       97
       97
       +
        }

     

       98
       98
       +
        

     

       99
       99
       +
       +static void fan_print_map(FILE *f, struct rtattr *attr)

     

       100
       100
       +
       +{

     

       101
       101
       +
       +	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];

     

       102
       102
       +
       +	struct ip_tunnel_fan_map *m;

     

       103
       103
       +
       +	struct rtattr *i;

     

       104
       104
       +
       +	int rem;

     

       105
       105
       +
       +	int p;

     

       106
       106
       +
       +

     

       107
       107
       +
       +	fprintf(f, "fan-map ");

     

       108
       108
       +
       +

     

       109
       109
       +
       +	rem = RTA_PAYLOAD(attr);

     

       110
       110
       +
       +	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {

     

       111
       111
       +
       +		p = RTA_PAYLOAD(i);

     

       112
       112
       +
       +		m = RTA_DATA(i);

     

       113
       113
       +
       +		fprintf(f, "%s/%d:%s/%d ",

     

       114
       114
       +
       +			rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),

     

       115
       115
       +
       +			m->overlay_prefix,

     

       116
       116
       +
       +			rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),

     

       117
       117
       +
       +			m->underlay_prefix);

     

       118
       118
       +
       +	}

     

       119
       119
       +
       +}

     

       120
       120
       +
       +

     

       121
       121
       +
        static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

     

       122
       122
       +
        {

     

       123
       123
       +
        	char s1[1024];

     

       124
       124
       +
       @@ -364,6 +426,9 @@ static void iptunnel_print_opt(struct li

     

       125
       125
       +
        				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

     

       126
       126
       +
        	}

     

       127
       127
       +
        

     

       128
       128
       +
       +	if (tb[IFLA_IPTUN_FAN_MAP])

     

       129
       129
       +
       +		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);

     

       130
       130
       +
       +

     

       131
       131
       +
        	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {

     

       132
       132
       +
        		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);

     

       133
       133
       +
        		const char *n = if_indextoname(link, s2);

+177

pkgs/os-specific/linux/iproute/1002-ubuntu-poc-fan-driver-vxlan.patch

···

       1
       1
       +
       Description: Fan driver support VXLAN (p4)

     

       2
       2
       +
        Fan driver setup support for vxlan interfaces.

     

       3
       3
       +
       

     

       4
       4
       +
       Index: iproute2-4.3.0/include/linux/if_link.h

     

       5
       5
       +
       ===================================================================

     

       6
       6
       +
       --- iproute2-4.3.0.orig/include/linux/if_link.h

     

       7
       7
       +
       +++ iproute2-4.3.0/include/linux/if_link.h

     

       8
       8
       +
       @@ -392,6 +392,7 @@ enum {

     

       9
       9
       +
        	IFLA_VXLAN_GBP,

     

       10
       10
       +
        	IFLA_VXLAN_REMCSUM_NOPARTIAL,

     

       11
       11
       +
        	IFLA_VXLAN_COLLECT_METADATA,

     

       12
       12
       +
       +	IFLA_VXLAN_FAN_MAP = 33,

     

       13
       13
       +
        	__IFLA_VXLAN_MAX

     

       14
       14
       +
        };

     

       15
       15
       +
        #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)

     

       16
       16
       +
       Index: iproute2-4.3.0/include/linux/if_tunnel.h

     

       17
       17
       +
       ===================================================================

     

       18
       18
       +
       --- iproute2-4.3.0.orig/include/linux/if_tunnel.h

     

       19
       19
       +
       +++ iproute2-4.3.0/include/linux/if_tunnel.h

     

       20
       20
       +
       @@ -145,7 +145,7 @@ enum {

     

       21
       21
       +
        

     

       22
       22
       +
        #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       23
       23
       +
        

     

       24
       24
       +
       -struct ip_tunnel_fan_map {

     

       25
       25
       +
       +struct ifla_fan_map {

     

       26
       26
       +
        	__be32		underlay;

     

       27
       27
       +
        	__be32		overlay;

     

       28
       28
       +
        	__u16		underlay_prefix;

     

       29
       29
       +
       Index: iproute2-4.3.0/ip/iplink_vxlan.c

     

       30
       30
       +
       ===================================================================

     

       31
       31
       +
       --- iproute2-4.3.0.orig/ip/iplink_vxlan.c

     

       32
       32
       +
       +++ iproute2-4.3.0/ip/iplink_vxlan.c

     

       33
       33
       +
       @@ -15,7 +15,10 @@

     

       34
       34
       +
        #include <net/if.h>

     

       35
       35
       +
        #include <linux/ip.h>

     

       36
       36
       +
        #include <linux/if_link.h>

     

       37
       37
       +
       +#include <linux/types.h>

     

       38
       38
       +
        #include <arpa/inet.h>

     

       39
       39
       +
       +#include <linux/in6.h>

     

       40
       40
       +
       +#include <linux/if_tunnel.h>

     

       41
       41
       +
        

     

       42
       42
       +
        #include "rt_names.h"

     

       43
       43
       +
        #include "utils.h"

     

       44
       44
       +
       @@ -43,6 +46,45 @@ static void explain(void)

     

       45
       45
       +
        	print_explain(stderr);

     

       46
       46
       +
        }

     

       47
       47
       +
        

     

       48
       48
       +
       +static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)

     

       49
       49
       +
       +{

     

       50
       50
       +
       +	inet_prefix underlay, overlay;

     

       51
       51
       +
       +	struct ifla_fan_map map;

     

       52
       52
       +
       +	struct rtattr *nest;

     

       53
       53
       +
       +	char **argv = *argvp;

     

       54
       54
       +
       +	int argc = *argcp;

     

       55
       55
       +
       +

     

       56
       56
       +
       +	nest = addattr_nest(n, 1024, IFLA_VXLAN_FAN_MAP);

     

       57
       57
       +
       +	while (argc > 0) {

     

       58
       58
       +
       +		char *colon = strchr(*argv, ':');

     

       59
       59
       +
       +

     

       60
       60
       +
       +		if (!colon) {

     

       61
       61
       +
       +			PREV_ARG();

     

       62
       62
       +
       +			break;

     

       63
       63
       +
       +		}

     

       64
       64
       +
       +		*colon = '\0';

     

       65
       65
       +
       +

     

       66
       66
       +
       +		if (get_prefix(&overlay, *argv, AF_INET))

     

       67
       67
       +
       +			invarg("invalid fan-map overlay", *argv);

     

       68
       68
       +
       +		if (get_prefix(&underlay, colon + 1, AF_INET))

     

       69
       69
       +
       +			invarg("invalid fan-map underlay", colon + 1);

     

       70
       70
       +
       +

     

       71
       71
       +
       +		memcpy(&map.underlay, underlay.data, 4);

     

       72
       72
       +
       +		map.underlay_prefix = underlay.bitlen;

     

       73
       73
       +
       +		memcpy(&map.overlay, overlay.data, 4);

     

       74
       74
       +
       +		map.overlay_prefix = overlay.bitlen;

     

       75
       75
       +
       +

     

       76
       76
       +
       +		argc--, argv++;

     

       77
       77
       +
       +

     

       78
       78
       +
       +		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));

     

       79
       79
       +
       +	}

     

       80
       80
       +
       +	addattr_nest_end(n, nest);

     

       81
       81
       +
       +

     

       82
       82
       +
       +	*argcp = argc;

     

       83
       83
       +
       +	*argvp = argv;

     

       84
       84
       +
       +	return 0;

     

       85
       85
       +
       +}

     

       86
       86
       +
       +

     

       87
       87
       +
        static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,

     

       88
       88
       +
        			  struct nlmsghdr *n)

     

       89
       89
       +
        {

     

       90
       90
       +
       @@ -201,6 +243,10 @@ static int vxlan_parse_opt(struct link_u

     

       91
       91
       +
        			udp6zerocsumrx = 0;

     

       92
       92
       +
        		} else if (!matches(*argv, "gbp")) {

     

       93
       93
       +
        			gbp = 1;

     

       94
       94
       +
       +		} else if (!matches(*argv, "fan-map")) {

     

       95
       95
       +
       +			NEXT_ARG();

     

       96
       96
       +
       +			if (fan_parse_map(&argc, &argv, n))

     

       97
       97
       +
       +				invarg("invalid fan-map", *argv);

     

       98
       98
       +
        		} else if (matches(*argv, "help") == 0) {

     

       99
       99
       +
        			explain();

     

       100
       100
       +
        			return -1;

     

       101
       101
       +
       @@ -279,6 +325,28 @@ static int vxlan_parse_opt(struct link_u

     

       102
       102
       +
        	return 0;

     

       103
       103
       +
        }

     

       104
       104
       +
        

     

       105
       105
       +
       +static void fan_print_map(FILE *f, struct rtattr *attr)

     

       106
       106
       +
       +{

     

       107
       107
       +
       +	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];

     

       108
       108
       +
       +	struct ifla_fan_map *m;

     

       109
       109
       +
       +	struct rtattr *i;

     

       110
       110
       +
       +	int rem;

     

       111
       111
       +
       +	int p;

     

       112
       112
       +
       +

     

       113
       113
       +
       +	fprintf(f, "fan-map ");

     

       114
       114
       +
       +

     

       115
       115
       +
       +	rem = RTA_PAYLOAD(attr);

     

       116
       116
       +
       +	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {

     

       117
       117
       +
       +		p = RTA_PAYLOAD(i);

     

       118
       118
       +
       +		m = RTA_DATA(i);

     

       119
       119
       +
       +		fprintf(f, "%s/%d:%s/%d ",

     

       120
       120
       +
       +			rt_addr_n2a(AF_INET, p, &m->overlay, b1, INET_ADDRSTRLEN),

     

       121
       121
       +
       +			m->overlay_prefix,

     

       122
       122
       +
       +			rt_addr_n2a(AF_INET, p, &m->underlay, b2, INET_ADDRSTRLEN),

     

       123
       123
       +
       +			m->underlay_prefix);

     

       124
       124
       +
       +	}

     

       125
       125
       +
       +}

     

       126
       126
       +
       +

     

       127
       127
       +
        static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

     

       128
       128
       +
        {

     

       129
       129
       +
        	__u32 vni;

     

       130
       130
       +
       @@ -321,6 +389,9 @@ static void vxlan_print_opt(struct link_

     

       131
       131
       +
        		}

     

       132
       132
       +
        	}

     

       133
       133
       +
        

     

       134
       134
       +
       +	if (tb[IFLA_VXLAN_FAN_MAP])

     

       135
       135
       +
       +		fan_print_map(f, tb[IFLA_VXLAN_FAN_MAP]);

     

       136
       136
       +
       +

     

       137
       137
       +
        	if (tb[IFLA_VXLAN_LOCAL]) {

     

       138
       138
       +
        		__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_LOCAL]);

     

       139
       139
       +
        		if (addr)

     

       140
       140
       +
       Index: iproute2-4.3.0/ip/link_iptnl.c

     

       141
       141
       +
       ===================================================================

     

       142
       142
       +
       --- iproute2-4.3.0.orig/ip/link_iptnl.c

     

       143
       143
       +
       +++ iproute2-4.3.0/ip/link_iptnl.c

     

       144
       144
       +
       @@ -49,10 +49,11 @@ static void usage(int sit)

     

       145
       145
       +
        	print_usage(stderr, sit);

     

       146
       146
       +
        	exit(-1);

     

       147
       147
       +
        }

     

       148
       148
       +
       +

     

       149
       149
       +
        static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)

     

       150
       150
       +
        {

     

       151
       151
       +
        	inet_prefix underlay, overlay;

     

       152
       152
       +
       -	struct ip_tunnel_fan_map map;

     

       153
       153
       +
       +	struct ifla_fan_map map;

     

       154
       154
       +
        	struct rtattr *nest;

     

       155
       155
       +
        	char **argv = *argvp;

     

       156
       156
       +
        	int argc = *argcp;

     

       157
       157
       +
       @@ -61,8 +62,10 @@ static int fan_parse_map(int *argcp, cha

     

       158
       158
       +
        	while (argc > 0) {

     

       159
       159
       +
        		char *colon = strchr(*argv, ':');

     

       160
       160
       +
        

     

       161
       161
       +
       -		if (!colon)

     

       162
       162
       +
       +		if (!colon) {

     

       163
       163
       +
       +			PREV_ARG();

     

       164
       164
       +
        			break;

     

       165
       165
       +
       +		}

     

       166
       166
       +
        		*colon = '\0';

     

       167
       167
       +
        

     

       168
       168
       +
        		if (get_prefix(&overlay, *argv, AF_INET))

     

       169
       169
       +
       @@ -371,7 +374,7 @@ get_failed:

     

       170
       170
       +
        static void fan_print_map(FILE *f, struct rtattr *attr)

     

       171
       171
       +
        {

     

       172
       172
       +
        	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];

     

       173
       173
       +
       -	struct ip_tunnel_fan_map *m;

     

       174
       174
       +
       +	struct ifla_fan_map *m;

     

       175
       175
       +
        	struct rtattr *i;

     

       176
       176
       +
        	int rem;

     

       177
       177
       +
        	int p;

+7 -1

pkgs/os-specific/linux/iproute/default.nix

···

       10
       10
        
           sha256 = "159988vv3fd78bzhisfl1dl4dd7km3vjzs2d8899a0vcvn412fzh";

     

       11
       11
        
         };

     

       12
       12
        
       

     

       13
       13
       -
         patches = lib.optionals enableFan [ ./ubuntu-fan.patch ];

     

       13
       13
       +
         patches = lib.optionals enableFan [

     

       14
       14
       +
           # These patches were pulled from:

     

       15
       15
       +
           # https://launchpad.net/ubuntu/xenial/+source/iproute2

     

       16
       16
       +
           ./1000-ubuntu-poc-fan-driver.patch

     

       17
       17
       +
           ./1001-ubuntu-poc-fan-driver-v3.patch

     

       18
       18
       +
           ./1002-ubuntu-poc-fan-driver-vxlan.patch

     

       19
       19
       +
         ];

     

       14
       20
        
       

     

       15
       21
        
         preConfigure = ''

     

       16
       22
        
           patchShebangs ./configure

-164

pkgs/os-specific/linux/iproute/ubuntu-fan.patch

···

       1
       1
       -
       This provides support for Ubuntu's Fan Networking [1].

     

       2
       2
       -
       

     

       3
       3
       -
       These patches were pulled from:

     

       4
       4
       -
       https://code.launchpad.net/~ubuntu-branches/ubuntu/vivid/iproute2/vivid-proposed

     

       5
       5
       -
       

     

       6
       6
       -
       See revisions 18 and 19.

     

       7
       7
       -
       

     

       8
       8
       -
       [1] https://wiki.ubuntu.com/FanNetworking

     

       9
       9
       -
       

     

       10
       10
       -
       diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h

     

       11
       11
       -
       index 102ce7a..7b8f0e5 100644

     

       12
       12
       -
       --- a/include/linux/if_tunnel.h

     

       13
       13
       -
       +++ b/include/linux/if_tunnel.h

     

       14
       14
       -
       @@ -57,6 +57,9 @@ enum {

     

       15
       15
       -
        	IFLA_IPTUN_ENCAP_FLAGS,

     

       16
       16
       -
        	IFLA_IPTUN_ENCAP_SPORT,

     

       17
       17
       -
        	IFLA_IPTUN_ENCAP_DPORT,

     

       18
       18
       -
       +

     

       19
       19
       -
       +	IFLA_IPTUN_FAN_UNDERLAY = 32,

     

       20
       20
       -
       +	IFLA_IPTUN_FAN_MAP = 33,

     

       21
       21
       -
        	__IFLA_IPTUN_MAX,

     

       22
       22
       -
        };

     

       23
       23
       -
        #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

     

       24
       24
       -
       @@ -131,4 +134,20 @@ enum {

     

       25
       25
       -
        };

     

       26
       26
       -
        

     

       27
       27
       -
        #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)

     

       28
       28
       -
       +

     

       29
       29
       -
       +enum {

     

       30
       30
       -
       +	IFLA_FAN_UNSPEC,

     

       31
       31
       -
       +	IFLA_FAN_MAPPING,

     

       32
       32
       -
       +	__IFLA_FAN_MAX,

     

       33
       33
       -
       +};

     

       34
       34
       -
       +

     

       35
       35
       -
       +#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       36
       36
       -
       +

     

       37
       37
       -
       +struct ip_tunnel_fan_map {

     

       38
       38
       -
       +	__be32		underlay;

     

       39
       39
       -
       +	__be32		overlay;

     

       40
       40
       -
       +	__u16		underlay_prefix;

     

       41
       41
       -
       +	__u16		overlay_prefix;

     

       42
       42
       -
       +};

     

       43
       43
       -
       +

     

       44
       44
       -
        #endif /* _IF_TUNNEL_H_ */

     

       45
       45
       -
       diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c

     

       46
       46
       -
       index 9d6bc98..ec3f05d 100644

     

       47
       47
       -
       --- a/ip/link_iptnl.c

     

       48
       48
       -
       +++ b/ip/link_iptnl.c

     

       49
       49
       -
       @@ -49,6 +49,42 @@ static void usage(int sit)

     

       50
       50
       -
        	print_usage(stderr, sit);

     

       51
       51
       -
        	exit(-1);

     

       52
       52
       -
        }

     

       53
       53
       -
       +static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)

     

       54
       54
       -
       +{

     

       55
       55
       -
       +	inet_prefix underlay, overlay;

     

       56
       56
       -
       +	struct ip_tunnel_fan_map map;

     

       57
       57
       -
       +	struct rtattr *nest;

     

       58
       58
       -
       +	char **argv = *argvp;

     

       59
       59
       -
       +	int argc = *argcp;

     

       60
       60
       -
       +

     

       61
       61
       -
       +	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);

     

       62
       62
       -
       +	while (argc > 0) {

     

       63
       63
       -
       +		char *colon = strchr(*argv, ':');

     

       64
       64
       -
       +

     

       65
       65
       -
       +		if (!colon)

     

       66
       66
       -
       +			break;

     

       67
       67
       -
       +		*colon = '\0';

     

       68
       68
       -
       +

     

       69
       69
       -
       +		if (get_prefix(&overlay, *argv, AF_INET))

     

       70
       70
       -
       +			invarg("invalid fan-map overlay", *argv);

     

       71
       71
       -
       +		if (get_prefix(&underlay, colon + 1, AF_INET))

     

       72
       72
       -
       +			invarg("invalid fan-map underlay", colon + 1);

     

       73
       73
       -
       +		

     

       74
       74
       -
       +		memcpy(&map.underlay, underlay.data, 4);

     

       75
       75
       -
       +		map.underlay_prefix = underlay.bitlen;

     

       76
       76
       -
       +		memcpy(&map.overlay, overlay.data, 4);

     

       77
       77
       -
       +		map.overlay_prefix = overlay.bitlen;

     

       78
       78
       -
       +

     

       79
       79
       -
       +		argc--, argv++;

     

       80
       80
       -
       +

     

       81
       81
       -
       +		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));

     

       82
       82
       -
       +	}

     

       83
       83
       -
       +	addattr_nest_end(n, nest);

     

       84
       84
       -
       +

     

       85
       85
       -
       +	*argcp = argc;

     

       86
       86
       -
       +	*argvp = argv;

     

       87
       87
       -
       +	return 0;

     

       88
       88
       -
       +}

     

       89
       89
       -
        

     

       90
       90
       -
        static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,

     

       91
       91
       -
        			      struct nlmsghdr *n)

     

       92
       92
       -
       @@ -66,6 +102,7 @@ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,

     

       93
       93
       -
        	__u32 link = 0;

     

       94
       94
       -
        	__u32 laddr = 0;

     

       95
       95
       -
        	__u32 raddr = 0;

     

       96
       96
       -
       +	__u32 underlay = 0;

     

       97
       97
       -
        	__u8 ttl = 0;

     

       98
       98
       -
        	__u8 tos = 0;

     

       99
       99
       -
        	__u8 pmtudisc = 1;

     

       100
       100
       -
       @@ -174,6 +211,13 @@ get_failed:

     

       101
       101
       -
        				raddr = get_addr32(*argv);

     

       102
       102
       -
        			else

     

       103
       103
       -
        				raddr = 0;

     

       104
       104
       -
       +		} else if (strcmp(*argv, "underlay") == 0) {

     

       105
       105
       -
       +			NEXT_ARG();

     

       106
       106
       -
       +			underlay = get_addr32(*argv);

     

       107
       107
       -
       +		} else if (strcmp(*argv, "fan-map") == 0) {

     

       108
       108
       -
       +			NEXT_ARG();

     

       109
       109
       -
       +			if (fan_parse_map(&argc, &argv, n))

     

       110
       110
       -
       +				invarg("invalid fan-map", *argv);

     

       111
       111
       -
        		} else if (strcmp(*argv, "local") == 0) {

     

       112
       112
       -
        			NEXT_ARG();

     

       113
       113
       -
        			if (strcmp(*argv, "any"))

     

       114
       114
       -
       @@ -318,9 +362,32 @@ get_failed:

     

       115
       115
       -
        		}

     

       116
       116
       -
        	}

     

       117
       117
       -
        

     

       118
       118
       -
       +	if (underlay)

     

       119
       119
       -
       +		addattr32(n, 1024, IFLA_IPTUN_FAN_UNDERLAY, underlay);

     

       120
       120
       -
       +

     

       121
       121
       -
        	return 0;

     

       122
       122
       -
        }

     

       123
       123
       -
        

     

       124
       124
       -
       +static void fan_print_map(FILE *f, struct rtattr *attr)

     

       125
       125
       -
       +{

     

       126
       126
       -
       +	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];

     

       127
       127
       -
       +	struct ip_tunnel_fan_map *m;

     

       128
       128
       -
       +	struct rtattr *i;

     

       129
       129
       -
       +	int rem;

     

       130
       130
       -
       +

     

       131
       131
       -
       +	fprintf(f, "fan-map ");

     

       132
       132
       -
       +

     

       133
       133
       -
       +	rem = RTA_PAYLOAD(attr);

     

       134
       134
       -
       +	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {

     

       135
       135
       -
       +		m = RTA_DATA(i);

     

       136
       136
       -
       +		fprintf(f, "%s/%d:%s/%d ",

     

       137
       137
       -
       +			rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->overlay, b1, INET_ADDRSTRLEN),

     

       138
       138
       -
       +			m->overlay_prefix,

     

       139
       139
       -
       +			rt_addr_n2a(AF_INET, sizeof(m->overlay), &m->underlay, b2, INET_ADDRSTRLEN),

     

       140
       140
       -
       +			m->underlay_prefix);

     

       141
       141
       -
       +	}

     

       142
       142
       -
       +}

     

       143
       143
       -
       +

     

       144
       144
       -
        static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])

     

       145
       145
       -
        {

     

       146
       146
       -
        	char s1[1024];

     

       147
       147
       -
       @@ -349,6 +416,17 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[

     

       148
       148
       -
        

     

       149
       149
       -
        	fprintf(f, "local %s ", local);

     

       150
       150
       -
        

     

       151
       151
       -
       +	if (tb[IFLA_IPTUN_FAN_UNDERLAY]) {

     

       152
       152
       -
       +		unsigned addr = rta_getattr_u32(tb[IFLA_IPTUN_FAN_UNDERLAY]);

     

       153
       153
       -
       +

     

       154
       154
       -
       +		if (addr)

     

       155
       155
       -
       +			fprintf(f, "underlay %s ",

     

       156
       156
       -
       +				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));

     

       157
       157
       -
       +	}

     

       158
       158
       -
       +

     

       159
       159
       -
       +	if (tb[IFLA_IPTUN_FAN_MAP])

     

       160
       160
       -
       +		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);

     

       161
       161
       -
       +

     

       162
       162
       -
        	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {

     

       163
       163
       -
        		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);

     

       164
       164
       -
        		const char *n = if_indextoname(link, s2);

+2 -7

pkgs/os-specific/linux/kernel/patches.nix

···

       71
       71
        
             patch = ./mips-ext3-n32.patch;

     

       72
       72
        
           };

     

       73
       73
        
       

     

       74
       74
       -
         ubuntu_fan =

     

       74
       74
       +
         ubuntu_fan_4_4 =

     

       75
       75
        
           { name = "ubuntu-fan";

     

       76
       76
       -
             patch = ./ubuntu-fan-3.patch;

     

       77
       77
       -
           };

     

       78
       78
       -
       

     

       79
       79
       -
         ubuntu_fan_4 =

     

       80
       80
       -
           { name = "ubuntu-fan";

     

       81
       81
       -
             patch = ./ubuntu-fan-4.patch;

     

       76
       76
       +
             patch = ./ubuntu-fan-4.4.patch;

     

       82
       77
        
           };

     

       83
       78
        
       

     

       84
       79
        
         ubuntu_unprivileged_overlayfs =

-616

pkgs/os-specific/linux/kernel/ubuntu-fan-3.patch

···

       1
       1
       -
       From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       3
       3
       -
       Date: Wed, 1 Apr 2015 16:11:09 -0700

     

       4
       4
       -
       Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2)

     

       5
       5
       -
       

     

       6
       6
       -
       Modification to ipip tunnel driver to accept a new netlink option,

     

       7
       7
       -
       IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables

     

       8
       8
       -
       TX side destination address remapping for traffic entering the tunnel

     

       9
       9
       -
       (to be encapsulated).

     

       10
       10
       -
       

     

       11
       11
       -
       For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B,

     

       12
       12
       -
       where "F" and "G" are the first two octets of the underlay network (the

     

       13
       13
       -
       network portion of a /16), "A" and "B" are the low order two octets of the

     

       14
       14
       -
       underlay network host (the host portion of a /16), and "Y" is a configured

     

       15
       15
       -
       first octet of the overlay network.

     

       16
       16
       -
       

     

       17
       17
       -
       E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       18
       18
       -
       subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to 99.6.7.8

     

       19
       19
       -
       would be directed to underlay host 10.88.6.7, which hosts overlay network

     

       20
       20
       -
       99.6.7.0/24.

     

       21
       21
       -
       

     

       22
       22
       -
       Includes net.fan.version sysctl as a sentinel for availability of the

     

       23
       23
       -
       fan functionality.

     

       24
       24
       -
       

     

       25
       25
       -
       NOTE: this requires an updated iproute2 to facilitate configuration of

     

       26
       26
       -
       the fan.

     

       27
       27
       -
       

     

       28
       28
       -
       BugLink: http://bugs.launchpad.net/bugs/1439706

     

       29
       29
       -
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       30
       30
       -
       [apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing

     

       31
       31
       -
        with future feature additions.]

     

       32
       32
       -
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       33
       33
       -
       ---

     

       34
       34
       -
        include/net/ip_tunnels.h       |   6 +++

     

       35
       35
       -
        include/uapi/linux/if_tunnel.h |   4 ++

     

       36
       36
       -
        net/ipv4/ipip.c                | 112 +++++++++++++++++++++++++++++++++++++++--

     

       37
       37
       -
        3 files changed, 117 insertions(+), 5 deletions(-)

     

       38
       38
       -
       

     

       39
       39
       -
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       40
       40
       -
       index 25a59eb..d7eada2 100644

     

       41
       41
       -
       --- a/include/net/ip_tunnels.h

     

       42
       42
       -
       +++ b/include/net/ip_tunnels.h

     

       43
       43
       -
       @@ -51,6 +51,11 @@ struct ip_tunnel_dst {

     

       44
       44
       -
        	__be32				 saddr;

     

       45
       45
       -
        };

     

       46
       46
       -
        

     

       47
       47
       -
       +/* Underlay address prefix for ipip fan mode */

     

       48
       48
       -
       +struct ip_tunnel_fan {

     

       49
       49
       -
       +	u32			underlay;

     

       50
       50
       -
       +};

     

       51
       51
       -
       +

     

       52
       52
       -
        struct ip_tunnel {

     

       53
       53
       -
        	struct ip_tunnel __rcu	*next;

     

       54
       54
       -
        	struct hlist_node hash_node;

     

       55
       55
       -
       @@ -82,6 +87,7 @@ struct ip_tunnel {

     

       56
       56
       -
        #endif

     

       57
       57
       -
        	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */

     

       58
       58
       -
        	unsigned int		prl_count;	/* # of entries in PRL */

     

       59
       59
       -
       +	struct ip_tunnel_fan	fan;

     

       60
       60
       -
        	int			ip_tnl_net_id;

     

       61
       61
       -
        	struct gro_cells	gro_cells;

     

       62
       62
       -
        };

     

       63
       63
       -
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       64
       64
       -
       index bd3cc11..8f7d269 100644

     

       65
       65
       -
       --- a/include/uapi/linux/if_tunnel.h

     

       66
       66
       -
       +++ b/include/uapi/linux/if_tunnel.h

     

       67
       67
       -
       @@ -57,6 +57,10 @@ enum {

     

       68
       68
       -
        	IFLA_IPTUN_ENCAP_FLAGS,

     

       69
       69
       -
        	IFLA_IPTUN_ENCAP_SPORT,

     

       70
       70
       -
        	IFLA_IPTUN_ENCAP_DPORT,

     

       71
       71
       -
       +

     

       72
       72
       -
       +	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */

     

       73
       73
       -
       +	IFLA_IPTUN_FAN_UNDERLAY=32,

     

       74
       74
       -
       +

     

       75
       75
       -
        	__IFLA_IPTUN_MAX,

     

       76
       76
       -
        };

     

       77
       77
       -
        #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

     

       78
       78
       -
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       79
       79
       -
       index 40403114..e3c27cd 100644

     

       80
       80
       -
       --- a/net/ipv4/ipip.c

     

       81
       81
       -
       +++ b/net/ipv4/ipip.c

     

       82
       82
       -
       @@ -209,13 +209,38 @@ drop:

     

       83
       83
       -
        }

     

       84
       84
       -
        

     

       85
       85
       -
        /*

     

       86
       86
       -
       + * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       87
       87
       -
       + * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       88
       88
       -
       + * F.G.A.B, where "F" and "G" are the first two octets of the underlay

     

       89
       89
       -
       + * network (the network portion of a /16), "A" and "B" are the low order

     

       90
       90
       -
       + * two octets of the underlay network host (the host portion of a /16),

     

       91
       91
       -
       + * and "Y" is a configured first octet of the overlay network.

     

       92
       92
       -
       + *

     

       93
       93
       -
       + * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       94
       94
       -
       + * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to

     

       95
       95
       -
       + * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       96
       96
       -
       + * overlay network 99.6.7.0/24.

     

       97
       97
       -
       + */

     

       98
       98
       -
       +static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       99
       99
       -
       +{

     

       100
       100
       -
       +	u32 daddr;

     

       101
       101
       -
       +

     

       102
       102
       -
       +	*iph = tunnel->parms.iph;

     

       103
       103
       -
       +

     

       104
       104
       -
       +	daddr = ntohl(ip_hdr(skb)->daddr);

     

       105
       105
       -
       +	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |

     

       106
       106
       -
       +			   ((daddr >> 8) & 0x0000ffff));

     

       107
       107
       -
       +}

     

       108
       108
       -
       +

     

       109
       109
       -
       +/*

     

       110
       110
       -
         *	This function assumes it is being called from dev_queue_xmit()

     

       111
       111
       -
         *	and that skb is filled properly by that function.

     

       112
       112
       -
         */

     

       113
       113
       -
        static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       114
       114
       -
        {

     

       115
       115
       -
        	struct ip_tunnel *tunnel = netdev_priv(dev);

     

       116
       116
       -
       -	const struct iphdr  *tiph = &tunnel->parms.iph;

     

       117
       117
       -
       +	const struct iphdr *tiph;

     

       118
       118
       -
       +	struct iphdr fiph;

     

       119
       119
       -
        

     

       120
       120
       -
        	if (unlikely(skb->protocol != htons(ETH_P_IP)))

     

       121
       121
       -
        		goto tx_error;

     

       122
       122
       -
       @@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       123
       123
       -
        	if (IS_ERR(skb))

     

       124
       124
       -
        		goto out;

     

       125
       125
       -
        

     

       126
       126
       -
       +	if (tunnel->fan.underlay) {

     

       127
       127
       -
       +		ipip_build_fan_iphdr(tunnel, skb, &fiph);

     

       128
       128
       -
       +		tiph = &fiph;

     

       129
       129
       -
       +	} else {

     

       130
       130
       -
       +		tiph = &tunnel->parms.iph;

     

       131
       131
       -
       +	}

     

       132
       132
       -
       +

     

       133
       133
       -
        	skb_set_inner_ipproto(skb, IPPROTO_IPIP);

     

       134
       134
       -
        

     

       135
       135
       -
        	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);

     

       136
       136
       -
       @@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       137
       137
       -
        	return ret;

     

       138
       138
       -
        }

     

       139
       139
       -
        

     

       140
       140
       -
       +static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       141
       141
       -
       +			    struct ip_tunnel_parm *parms)

     

       142
       142
       -
       +{

     

       143
       143
       -
       +	u32 net = t->fan.underlay;

     

       144
       144
       -
       +

     

       145
       145
       -
       +	if (!data[IFLA_IPTUN_FAN_UNDERLAY])

     

       146
       146
       -
       +		goto err_check;

     

       147
       147
       -
       +

     

       148
       148
       -
       +	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;

     

       149
       149
       -
       +

     

       150
       150
       -
       +err_check:

     

       151
       151
       -
       +	if (parms->iph.daddr && net)

     

       152
       152
       -
       +		return -EINVAL;

     

       153
       153
       -
       +

     

       154
       154
       -
       +	t->fan.underlay = net;

     

       155
       155
       -
       +

     

       156
       156
       -
       +	return 0;

     

       157
       157
       -
       +}

     

       158
       158
       -
       +

     

       159
       159
       -
        static int ipip_newlink(struct net *src_net, struct net_device *dev,

     

       160
       160
       -
        			struct nlattr *tb[], struct nlattr *data[])

     

       161
       161
       -
        {

     

       162
       162
       -
        	struct ip_tunnel_parm p;

     

       163
       163
       -
        	struct ip_tunnel_encap ipencap;

     

       164
       164
       -
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       165
       165
       -
       +	int err;

     

       166
       166
       -
        

     

       167
       167
       -
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       168
       168
       -
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       169
       169
       -
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       170
       170
       -
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       171
       171
       -
        

     

       172
       172
       -
        		if (err < 0)

     

       173
       173
       -
        			return err;

     

       174
       174
       -
        	}

     

       175
       175
       -
        

     

       176
       176
       -
        	ipip_netlink_parms(data, &p);

     

       177
       177
       -
       +	err = ipip_netlink_fan(data, t, &p);

     

       178
       178
       -
       +	if (err < 0)

     

       179
       179
       -
       +		return err;

     

       180
       180
       -
        	return ip_tunnel_newlink(dev, tb, &p);

     

       181
       181
       -
        }

     

       182
       182
       -
        

     

       183
       183
       -
       @@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],

     

       184
       184
       -
        {

     

       185
       185
       -
        	struct ip_tunnel_parm p;

     

       186
       186
       -
        	struct ip_tunnel_encap ipencap;

     

       187
       187
       -
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       188
       188
       -
       +	int err;

     

       189
       189
       -
        

     

       190
       190
       -
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       191
       191
       -
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       192
       192
       -
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       193
       193
       -
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       194
       194
       -
        

     

       195
       195
       -
        		if (err < 0)

     

       196
       196
       -
        			return err;

     

       197
       197
       -
        	}

     

       198
       198
       -
        

     

       199
       199
       -
        	ipip_netlink_parms(data, &p);

     

       200
       200
       -
       +	err = ipip_netlink_fan(data, t, &p);

     

       201
       201
       -
       +	if (err < 0)

     

       202
       202
       -
       +		return err;

     

       203
       203
       -
        

     

       204
       204
       -
        	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||

     

       205
       205
       -
        	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))

     

       206
       206
       -
       @@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       207
       207
       -
        		nla_total_size(2) +

     

       208
       208
       -
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       209
       209
       -
        		nla_total_size(2) +

     

       210
       210
       -
       +		/* IFLA_IPTUN_FAN_UNDERLAY */

     

       211
       211
       -
       +		nla_total_size(4) +

     

       212
       212
       -
        		0;

     

       213
       213
       -
        }

     

       214
       214
       -
        

     

       215
       215
       -
       @@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       216
       216
       -
        			tunnel->encap.flags))

     

       217
       217
       -
        		goto nla_put_failure;

     

       218
       218
       -
        

     

       219
       219
       -
       +	if (tunnel->fan.underlay)

     

       220
       220
       -
       +		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,

     

       221
       221
       -
       +				 htonl(tunnel->fan.underlay)))

     

       222
       222
       -
       +			goto nla_put_failure;

     

       223
       223
       -
       +

     

       224
       224
       -
        	return 0;

     

       225
       225
       -
        

     

       226
       226
       -
        nla_put_failure:

     

       227
       227
       -
       @@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {

     

       228
       228
       -
        	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },

     

       229
       229
       -
        	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },

     

       230
       230
       -
        	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },

     

       231
       231
       -
       +

     

       232
       232
       -
       +	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },

     

       233
       233
       -
       +	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },

     

       234
       234
       -
        };

     

       235
       235
       -
        

     

       236
       236
       -
        static struct rtnl_link_ops ipip_link_ops __read_mostly = {

     

       237
       237
       -
       @@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = {

     

       238
       238
       -
        	.size = sizeof(struct ip_tunnel_net),

     

       239
       239
       -
        };

     

       240
       240
       -
        

     

       241
       241
       -
       +#ifdef CONFIG_SYSCTL

     

       242
       242
       -
       +static struct ctl_table_header *ipip_fan_header;

     

       243
       243
       -
       +static unsigned int ipip_fan_version = 1;

     

       244
       244
       -
       +

     

       245
       245
       -
       +static struct ctl_table ipip_fan_sysctls[] = {

     

       246
       246
       -
       +	{

     

       247
       247
       -
       +		.procname	= "version",

     

       248
       248
       -
       +		.data		= &ipip_fan_version,

     

       249
       249
       -
       +		.maxlen		= sizeof(ipip_fan_version),

     

       250
       250
       -
       +		.mode		= 0444,

     

       251
       251
       -
       +		.proc_handler	= proc_dointvec,

     

       252
       252
       -
       +	},

     

       253
       253
       -
       +	{},

     

       254
       254
       -
       +};

     

       255
       255
       -
       +

     

       256
       256
       -
       +#endif /* CONFIG_SYSCTL */

     

       257
       257
       -
       +

     

       258
       258
       -
        static int __init ipip_init(void)

     

       259
       259
       -
        {

     

       260
       260
       -
        	int err;

     

       261
       261
       -
       @@ -542,9 +628,22 @@ static int __init ipip_init(void)

     

       262
       262
       -
        	if (err < 0)

     

       263
       263
       -
        		goto rtnl_link_failed;

     

       264
       264
       -
        

     

       265
       265
       -
       +#ifdef CONFIG_SYSCTL

     

       266
       266
       -
       +	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",

     

       267
       267
       -
       +					      ipip_fan_sysctls);

     

       268
       268
       -
       +	if (!ipip_fan_header) {

     

       269
       269
       -
       +		err = -ENOMEM;

     

       270
       270
       -
       +		goto sysctl_failed;

     

       271
       271
       -
       +	}

     

       272
       272
       -
       +#endif /* CONFIG_SYSCTL */

     

       273
       273
       -
       +

     

       274
       274
       -
        out:

     

       275
       275
       -
        	return err;

     

       276
       276
       -
        

     

       277
       277
       -
       +#ifdef CONFIG_SYSCTL

     

       278
       278
       -
       +sysctl_failed:

     

       279
       279
       -
       +	rtnl_link_unregister(&ipip_link_ops);

     

       280
       280
       -
       +#endif /* CONFIG_SYSCTL */

     

       281
       281
       -
        rtnl_link_failed:

     

       282
       282
       -
        	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);

     

       283
       283
       -
        xfrm_tunnel_failed:

     

       284
       284
       -
       @@ -554,6 +653,9 @@ xfrm_tunnel_failed:

     

       285
       285
       -
        

     

       286
       286
       -
        static void __exit ipip_fini(void)

     

       287
       287
       -
        {

     

       288
       288
       -
       +#ifdef CONFIG_SYSCTL

     

       289
       289
       -
       +	unregister_net_sysctl_table(ipip_fan_header);

     

       290
       290
       -
       +#endif /* CONFIG_SYSCTL */

     

       291
       291
       -
        	rtnl_link_unregister(&ipip_link_ops);

     

       292
       292
       -
        	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))

     

       293
       293
       -
        		pr_info("%s: can't deregister tunnel\n", __func__);

     

       294
       294
       -
       -- 

     

       295
       295
       -
       2.4.1

     

       296
       296
       -
       

     

       297
       297
       -
       From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001

     

       298
       298
       -
       From: Andy Whitcroft <apw@canonical.com>

     

       299
       299
       -
       Date: Tue, 21 Jul 2015 16:52:10 +0100

     

       300
       300
       -
       Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)

     

       301
       301
       -
       

     

       302
       302
       -
       Switch to a single tunnel for all mappings, this removes the limitations

     

       303
       303
       -
       on how many mappings each tunnel can handle, and therefore how many Fan

     

       304
       304
       -
       slices each local address may hold.

     

       305
       305
       -
       

     

       306
       306
       -
       NOTE: This introduces a new kernel netlink interface which needs updated

     

       307
       307
       -
       iproute2 support.

     

       308
       308
       -
       

     

       309
       309
       -
       BugLink: http://bugs.launchpad.net/bugs/1470091

     

       310
       310
       -
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       311
       311
       -
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       312
       312
       -
       Acked-by: Tim Gardner <tim.gardner@canonical.com>

     

       313
       313
       -
       Acked-by: Brad Figg <brad.figg@canonical.com>

     

       314
       314
       -
       Signed-off-by: Brad Figg <brad.figg@canonical.com>

     

       315
       315
       -
       ---

     

       316
       316
       -
        include/net/ip_tunnels.h       |  14 ++++-

     

       317
       317
       -
        include/uapi/linux/if_tunnel.h |  20 ++++++-

     

       318
       318
       -
        net/ipv4/ip_tunnel.c           |   7 ++-

     

       319
       319
       -
        net/ipv4/ipip.c                | 120 +++++++++++++++++++++++++++++++++--------

     

       320
       320
       -
        4 files changed, 133 insertions(+), 28 deletions(-)

     

       321
       321
       -
       

     

       322
       322
       -
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       323
       323
       -
       index d7eada2..2f7bc8c 100644

     

       324
       324
       -
       --- a/include/net/ip_tunnels.h

     

       325
       325
       -
       +++ b/include/net/ip_tunnels.h

     

       326
       326
       -
       @@ -51,9 +51,18 @@ struct ip_tunnel_dst {

     

       327
       327
       -
        	__be32				 saddr;

     

       328
       328
       -
        };

     

       329
       329
       -
        

     

       330
       330
       -
       -/* Underlay address prefix for ipip fan mode */

     

       331
       331
       -
       +/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16

     

       332
       332
       -
       + * underlay (10.88.0.0/16, for example).  Multiple local addresses within

     

       333
       333
       -
       + * the /16 may be used, but a particular overlay may not span

     

       334
       334
       -
       + * multiple underlay subnets.

     

       335
       335
       -
       + *

     

       336
       336
       -
       + * We store one underlay, indexed by the overlay's high order octet.

     

       337
       337
       -
       + */

     

       338
       338
       -
       +#define FAN_OVERLAY_CNT		256

     

       339
       339
       -
       +

     

       340
       340
       -
        struct ip_tunnel_fan {

     

       341
       341
       -
       -	u32			underlay;

     

       342
       342
       -
       +/*	u32 __rcu	*map;*/

     

       343
       343
       -
       +	u32		map[FAN_OVERLAY_CNT];

     

       344
       344
       -
        };

     

       345
       345
       -
        

     

       346
       346
       -
        struct ip_tunnel {

     

       347
       347
       -
       @@ -104,6 +113,7 @@ struct ip_tunnel {

     

       348
       348
       -
        #define TUNNEL_OAM		__cpu_to_be16(0x0200)

     

       349
       349
       -
        #define TUNNEL_CRIT_OPT		__cpu_to_be16(0x0400)

     

       350
       350
       -
        #define TUNNEL_OPTIONS_PRESENT	__cpu_to_be16(0x0800)

     

       351
       351
       -
       +#define TUNNEL_FAN		__cpu_to_be16(0x4000)

     

       352
       352
       -
        

     

       353
       353
       -
        struct tnl_ptk_info {

     

       354
       354
       -
        	__be16 flags;

     

       355
       355
       -
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       356
       356
       -
       index 8f7d269..9625934 100644

     

       357
       357
       -
       --- a/include/uapi/linux/if_tunnel.h

     

       358
       358
       -
       +++ b/include/uapi/linux/if_tunnel.h

     

       359
       359
       -
       @@ -58,8 +58,8 @@ enum {

     

       360
       360
       -
        	IFLA_IPTUN_ENCAP_SPORT,

     

       361
       361
       -
        	IFLA_IPTUN_ENCAP_DPORT,

     

       362
       362
       -
        

     

       363
       363
       -
       -	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */

     

       364
       364
       -
       -	IFLA_IPTUN_FAN_UNDERLAY=32,

     

       365
       365
       -
       +	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */

     

       366
       366
       -
       +	IFLA_IPTUN_FAN_MAP = 33,

     

       367
       367
       -
        

     

       368
       368
       -
        	__IFLA_IPTUN_MAX,

     

       369
       369
       -
        };

     

       370
       370
       -
       @@ -135,4 +135,20 @@ enum {

     

       371
       371
       -
        };

     

       372
       372
       -
        

     

       373
       373
       -
        #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)

     

       374
       374
       -
       +

     

       375
       375
       -
       +enum {

     

       376
       376
       -
       +	IFLA_FAN_UNSPEC,

     

       377
       377
       -
       +	IFLA_FAN_MAPPING,

     

       378
       378
       -
       +	__IFLA_FAN_MAX,

     

       379
       379
       -
       +};

     

       380
       380
       -
       +

     

       381
       381
       -
       +#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       382
       382
       -
       +

     

       383
       383
       -
       +struct ip_tunnel_fan_map {

     

       384
       384
       -
       +	__be32		underlay;

     

       385
       385
       -
       +	__be32		overlay;

     

       386
       386
       -
       +	__u16		underlay_prefix;

     

       387
       387
       -
       +	__u16		overlay_prefix;

     

       388
       388
       -
       +};

     

       389
       389
       -
       +

     

       390
       390
       -
        #endif /* _UAPI_IF_TUNNEL_H_ */

     

       391
       391
       -
       diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c

     

       392
       392
       -
       index d3e4479..60bd10f 100644

     

       393
       393
       -
       --- a/net/ipv4/ip_tunnel.c

     

       394
       394
       -
       +++ b/net/ipv4/ip_tunnel.c

     

       395
       395
       -
       @@ -1078,6 +1078,11 @@ out:

     

       396
       396
       -
        }

     

       397
       397
       -
        EXPORT_SYMBOL_GPL(ip_tunnel_newlink);

     

       398
       398
       -
        

     

       399
       399
       -
       +static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       400
       400
       -
       +{

     

       401
       401
       -
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       402
       402
       -
       +}

     

       403
       403
       -
       +

     

       404
       404
       -
        int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       405
       405
       -
        			 struct ip_tunnel_parm *p)

     

       406
       406
       -
        {

     

       407
       407
       -
       @@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       408
       408
       -
        	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);

     

       409
       409
       -
        

     

       410
       410
       -
        	if (dev == itn->fb_tunnel_dev)

     

       411
       411
       -
       -		return -EINVAL;

     

       412
       412
       -
       +		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;

     

       413
       413
       -
        

     

       414
       414
       -
        	t = ip_tunnel_find(itn, p, dev->type);

     

       415
       415
       -
        

     

       416
       416
       -
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       417
       417
       -
       index e3c27cd..d6ebc66 100644

     

       418
       418
       -
       --- a/net/ipv4/ipip.c

     

       419
       419
       -
       +++ b/net/ipv4/ipip.c

     

       420
       420
       -
       @@ -107,6 +107,7 @@

     

       421
       421
       -
        #include <linux/init.h>

     

       422
       422
       -
        #include <linux/netfilter_ipv4.h>

     

       423
       423
       -
        #include <linux/if_ether.h>

     

       424
       424
       -
       +#include <linux/inetdevice.h>

     

       425
       425
       -
        

     

       426
       426
       -
        #include <net/sock.h>

     

       427
       427
       -
        #include <net/ip.h>

     

       428
       428
       -
       @@ -208,6 +209,11 @@ drop:

     

       429
       429
       -
        	return 0;

     

       430
       430
       -
        }

     

       431
       431
       -
        

     

       432
       432
       -
       +static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       433
       433
       -
       +{

     

       434
       434
       -
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       435
       435
       -
       +}

     

       436
       436
       -
       +

     

       437
       437
       -
        /*

     

       438
       438
       -
         * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       439
       439
       -
         * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       440
       440
       -
       @@ -221,15 +227,20 @@ drop:

     

       441
       441
       -
         * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       442
       442
       -
         * overlay network 99.6.7.0/24.

     

       443
       443
       -
         */

     

       444
       444
       -
       -static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       445
       445
       -
       +static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       446
       446
       -
        {

     

       447
       447
       -
       -	u32 daddr;

     

       448
       448
       -
       -

     

       449
       449
       -
       -	*iph = tunnel->parms.iph;

     

       450
       450
       -
       +	unsigned int overlay;

     

       451
       451
       -
       +	u32 daddr, underlay;

     

       452
       452
       -
        

     

       453
       453
       -
        	daddr = ntohl(ip_hdr(skb)->daddr);

     

       454
       454
       -
       -	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |

     

       455
       455
       -
       -			   ((daddr >> 8) & 0x0000ffff));

     

       456
       456
       -
       +	overlay = daddr >> 24;

     

       457
       457
       -
       +	underlay = tunnel->fan.map[overlay];

     

       458
       458
       -
       +	if (!underlay)

     

       459
       459
       -
       +		return -EINVAL;

     

       460
       460
       -
       +

     

       461
       461
       -
       +	*iph = tunnel->parms.iph;

     

       462
       462
       -
       +	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));

     

       463
       463
       -
       +	return 0;

     

       464
       464
       -
        }

     

       465
       465
       -
        

     

       466
       466
       -
        /*

     

       467
       467
       -
       @@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       468
       468
       -
        	if (IS_ERR(skb))

     

       469
       469
       -
        		goto out;

     

       470
       470
       -
        

     

       471
       471
       -
       -	if (tunnel->fan.underlay) {

     

       472
       472
       -
       -		ipip_build_fan_iphdr(tunnel, skb, &fiph);

     

       473
       473
       -
       +	if (ipip_tunnel_is_fan(tunnel)) {

     

       474
       474
       -
       +		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))

     

       475
       475
       -
       +			goto tx_error;

     

       476
       476
       -
        		tiph = &fiph;

     

       477
       477
       -
        	} else {

     

       478
       478
       -
        		tiph = &tunnel->parms.iph;

     

       479
       479
       -
       @@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       480
       480
       -
        	return ret;

     

       481
       481
       -
        }

     

       482
       482
       -
        

     

       483
       483
       -
       +static void ipip_fan_free_map(struct ip_tunnel *t)

     

       484
       484
       -
       +{

     

       485
       485
       -
       +	memset(&t->fan.map, 0, sizeof(t->fan.map));

     

       486
       486
       -
       +}

     

       487
       487
       -
       +

     

       488
       488
       -
       +static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)

     

       489
       489
       -
       +{

     

       490
       490
       -
       +	u32 overlay, overlay_mask, underlay, underlay_mask;

     

       491
       491
       -
       +

     

       492
       492
       -
       +	if ((map->underlay_prefix && map->underlay_prefix != 16) ||

     

       493
       493
       -
       +	    (map->overlay_prefix && map->overlay_prefix != 8))

     

       494
       494
       -
       +		return -EINVAL;

     

       495
       495
       -
       +

     

       496
       496
       -
       +	overlay = ntohl(map->overlay);

     

       497
       497
       -
       +	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));

     

       498
       498
       -
       +

     

       499
       499
       -
       +	underlay = ntohl(map->underlay);

     

       500
       500
       -
       +	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));

     

       501
       501
       -
       +

     

       502
       502
       -
       +	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))

     

       503
       503
       -
       +		return -EINVAL;

     

       504
       504
       -
       +

     

       505
       505
       -
       +	if (!(overlay & overlay_mask) && (underlay & underlay_mask))

     

       506
       506
       -
       +		return -EINVAL;

     

       507
       507
       -
       +

     

       508
       508
       -
       +	t->parms.i_flags |= TUNNEL_FAN;

     

       509
       509
       -
       +

     

       510
       510
       -
       +	/* Special case: overlay 0 and underlay 0 clears all mappings */

     

       511
       511
       -
       +	if (!overlay && !underlay) {

     

       512
       512
       -
       +		ipip_fan_free_map(t);

     

       513
       513
       -
       +		return 0;

     

       514
       514
       -
       +	}

     

       515
       515
       -
       +

     

       516
       516
       -
       +	overlay >>= (32 - map->overlay_prefix);

     

       517
       517
       -
       +	t->fan.map[overlay] = underlay;

     

       518
       518
       -
       +

     

       519
       519
       -
       +	return 0;

     

       520
       520
       -
       +}

     

       521
       521
       -
       +	

     

       522
       522
       -
       +

     

       523
       523
       -
        static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       524
       524
       -
        			    struct ip_tunnel_parm *parms)

     

       525
       525
       -
        {

     

       526
       526
       -
       -	u32 net = t->fan.underlay;

     

       527
       527
       -
       -

     

       528
       528
       -
       -	if (!data[IFLA_IPTUN_FAN_UNDERLAY])

     

       529
       529
       -
       -		goto err_check;

     

       530
       530
       -
       +	struct ip_tunnel_fan_map *map;

     

       531
       531
       -
       +	struct nlattr *attr;

     

       532
       532
       -
       +	int rem, rv;

     

       533
       533
       -
        

     

       534
       534
       -
       -	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;

     

       535
       535
       -
       +	if (!data[IFLA_IPTUN_FAN_MAP])

     

       536
       536
       -
       +		return 0;

     

       537
       537
       -
        

     

       538
       538
       -
       -err_check:

     

       539
       539
       -
       -	if (parms->iph.daddr && net)

     

       540
       540
       -
       +	if (parms->iph.daddr)

     

       541
       541
       -
        		return -EINVAL;

     

       542
       542
       -
        

     

       543
       543
       -
       -	t->fan.underlay = net;

     

       544
       544
       -
       +	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {

     

       545
       545
       -
       +		map = nla_data(attr);

     

       546
       546
       -
       +		rv = ipip_fan_set_map(t, map);

     

       547
       547
       -
       +		if (rv)

     

       548
       548
       -
       +			return rv;

     

       549
       549
       -
       +	}

     

       550
       550
       -
        

     

       551
       551
       -
        	return 0;

     

       552
       552
       -
        }

     

       553
       553
       -
       @@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       554
       554
       -
        		nla_total_size(2) +

     

       555
       555
       -
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       556
       556
       -
        		nla_total_size(2) +

     

       557
       557
       -
       -		/* IFLA_IPTUN_FAN_UNDERLAY */

     

       558
       558
       -
       -		nla_total_size(4) +

     

       559
       559
       -
       +		/* IFLA_IPTUN_FAN_MAP */

     

       560
       560
       -
       +		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +

     

       561
       561
       -
        		0;

     

       562
       562
       -
        }

     

       563
       563
       -
        

     

       564
       564
       -
       @@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       565
       565
       -
        			tunnel->encap.flags))

     

       566
       566
       -
        		goto nla_put_failure;

     

       567
       567
       -
        

     

       568
       568
       -
       -	if (tunnel->fan.underlay)

     

       569
       569
       -
       -		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,

     

       570
       570
       -
       -				 htonl(tunnel->fan.underlay)))

     

       571
       571
       -
       +	if (tunnel->parms.i_flags & TUNNEL_FAN) {

     

       572
       572
       -
       +		struct nlattr *fan_nest;

     

       573
       573
       -
       +		int i;

     

       574
       574
       -
       +

     

       575
       575
       -
       +		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);

     

       576
       576
       -
       +		if (!fan_nest)

     

       577
       577
       -
        			goto nla_put_failure;

     

       578
       578
       -
       +		for (i = 0; i < 256; i++) {

     

       579
       579
       -
       +			if (tunnel->fan.map[i]) {

     

       580
       580
       -
       +				struct ip_tunnel_fan_map map;

     

       581
       581
       -
       +

     

       582
       582
       -
       +				map.underlay = htonl(tunnel->fan.map[i]);

     

       583
       583
       -
       +				map.underlay_prefix = 16;

     

       584
       584
       -
       +				map.overlay = htonl(i << 24);

     

       585
       585
       -
       +				map.overlay_prefix = 8;

     

       586
       586
       -
       +				if (nla_put(skb, IFLA_FAN_MAPPING,

     

       587
       587
       -
       +					    sizeof(map), &map))

     

       588
       588
       -
       +					goto nla_put_failure;

     

       589
       589
       -
       +			}

     

       590
       590
       -
       +		}

     

       591
       591
       -
       +		nla_nest_end(skb, fan_nest);

     

       592
       592
       -
       +	}

     

       593
       593
       -
        

     

       594
       594
       -
        	return 0;

     

       595
       595
       -
        

     

       596
       596
       -
       @@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {

     

       597
       597
       -
        	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },

     

       598
       598
       -
        

     

       599
       599
       -
        	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },

     

       600
       600
       -
       -	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },

     

       601
       601
       -
       +	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },

     

       602
       602
       -
        };

     

       603
       603
       -
        

     

       604
       604
       -
        static struct rtnl_link_ops ipip_link_ops __read_mostly = {

     

       605
       605
       -
       @@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = {

     

       606
       606
       -
        

     

       607
       607
       -
        #ifdef CONFIG_SYSCTL

     

       608
       608
       -
        static struct ctl_table_header *ipip_fan_header;

     

       609
       609
       -
       -static unsigned int ipip_fan_version = 1;

     

       610
       610
       -
       +static unsigned int ipip_fan_version = 3;

     

       611
       611
       -
        

     

       612
       612
       -
        static struct ctl_table ipip_fan_sysctls[] = {

     

       613
       613
       -
        	{

     

       614
       614
       -
       -- 

     

       615
       615
       -
       2.4.1

     

       616
       616
       -

+1240

pkgs/os-specific/linux/kernel/ubuntu-fan-4.4.patch

···

       1
       1
       +
       From e64058be3b97c5bd3e034fc4ece21e306ef6f90b Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       3
       3
       +
       Date: Wed, 1 Apr 2015 16:11:09 -0700

     

       4
       4
       +
       Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)

     

       5
       5
       +
       

     

       6
       6
       +
       Switch to a single tunnel for all mappings, this removes the limitations

     

       7
       7
       +
       on how many mappings each tunnel can handle, and therefore how many Fan

     

       8
       8
       +
       slices each local address may hold.

     

       9
       9
       +
       

     

       10
       10
       +
       NOTE: This introduces a new kernel netlink interface which needs updated

     

       11
       11
       +
       iproute2 support.

     

       12
       12
       +
       

     

       13
       13
       +
       BugLink: http://bugs.launchpad.net/bugs/1470091

     

       14
       14
       +
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       15
       15
       +
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       16
       16
       +
       Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

     

       17
       17
       +
       

     

       18
       18
       +
       Conflicts:

     

       19
       19
       +
       	include/net/ip_tunnels.h

     

       20
       20
       +
       ---

     

       21
       21
       +
        include/net/ip_tunnels.h       |  15 ++++

     

       22
       22
       +
        include/uapi/linux/if_tunnel.h |  20 +++++

     

       23
       23
       +
        net/ipv4/ip_tunnel.c           |   7 +-

     

       24
       24
       +
        net/ipv4/ipip.c                | 186 +++++++++++++++++++++++++++++++++++++++--

     

       25
       25
       +
        4 files changed, 222 insertions(+), 6 deletions(-)

     

       26
       26
       +
       

     

       27
       27
       +
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       28
       28
       +
       index 62a750a..47fec59 100644

     

       29
       29
       +
       --- a/include/net/ip_tunnels.h

     

       30
       30
       +
       +++ b/include/net/ip_tunnels.h

     

       31
       31
       +
       @@ -91,6 +91,19 @@ struct ip_tunnel_dst {

     

       32
       32
       +
        };

     

       33
       33
       +
        

     

       34
       34
       +
        struct metadata_dst;

     

       35
       35
       +
       +/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16

     

       36
       36
       +
       + * underlay (10.88.0.0/16, for example).  Multiple local addresses within

     

       37
       37
       +
       + * the /16 may be used, but a particular overlay may not span

     

       38
       38
       +
       + * multiple underlay subnets.

     

       39
       39
       +
       + *

     

       40
       40
       +
       + * We store one underlay, indexed by the overlay's high order octet.

     

       41
       41
       +
       + */

     

       42
       42
       +
       +#define FAN_OVERLAY_CNT		256

     

       43
       43
       +
       +

     

       44
       44
       +
       +struct ip_tunnel_fan {

     

       45
       45
       +
       +/*	u32 __rcu	*map;*/

     

       46
       46
       +
       +	u32		map[FAN_OVERLAY_CNT];

     

       47
       47
       +
       +};

     

       48
       48
       +
        

     

       49
       49
       +
        struct ip_tunnel {

     

       50
       50
       +
        	struct ip_tunnel __rcu	*next;

     

       51
       51
       +
       @@ -123,6 +136,7 @@ struct ip_tunnel {

     

       52
       52
       +
        #endif

     

       53
       53
       +
        	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */

     

       54
       54
       +
        	unsigned int		prl_count;	/* # of entries in PRL */

     

       55
       55
       +
       +	struct ip_tunnel_fan	fan;

     

       56
       56
       +
        	int			ip_tnl_net_id;

     

       57
       57
       +
        	struct gro_cells	gro_cells;

     

       58
       58
       +
        	bool			collect_md;

     

       59
       59
       +
       @@ -143,6 +157,7 @@ struct ip_tunnel {

     

       60
       60
       +
        #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)

     

       61
       61
       +
        

     

       62
       62
       +
        #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)

     

       63
       63
       +
       +#define TUNNEL_FAN		__cpu_to_be16(0x4000)

     

       64
       64
       +
        

     

       65
       65
       +
        struct tnl_ptk_info {

     

       66
       66
       +
        	__be16 flags;

     

       67
       67
       +
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       68
       68
       +
       index af4de90..85a3e4b 100644

     

       69
       69
       +
       --- a/include/uapi/linux/if_tunnel.h

     

       70
       70
       +
       +++ b/include/uapi/linux/if_tunnel.h

     

       71
       71
       +
       @@ -57,6 +57,10 @@ enum {

     

       72
       72
       +
        	IFLA_IPTUN_ENCAP_FLAGS,

     

       73
       73
       +
        	IFLA_IPTUN_ENCAP_SPORT,

     

       74
       74
       +
        	IFLA_IPTUN_ENCAP_DPORT,

     

       75
       75
       +
       +

     

       76
       76
       +
       +	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */

     

       77
       77
       +
       +	IFLA_IPTUN_FAN_MAP = 33,

     

       78
       78
       +
       +

     

       79
       79
       +
        	__IFLA_IPTUN_MAX,

     

       80
       80
       +
        };

     

       81
       81
       +
        #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

     

       82
       82
       +
       @@ -132,4 +136,20 @@ enum {

     

       83
       83
       +
        };

     

       84
       84
       +
        

     

       85
       85
       +
        #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)

     

       86
       86
       +
       +

     

       87
       87
       +
       +enum {

     

       88
       88
       +
       +	IFLA_FAN_UNSPEC,

     

       89
       89
       +
       +	IFLA_FAN_MAPPING,

     

       90
       90
       +
       +	__IFLA_FAN_MAX,

     

       91
       91
       +
       +};

     

       92
       92
       +
       +

     

       93
       93
       +
       +#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       94
       94
       +
       +

     

       95
       95
       +
       +struct ip_tunnel_fan_map {

     

       96
       96
       +
       +	__be32		underlay;

     

       97
       97
       +
       +	__be32		overlay;

     

       98
       98
       +
       +	__u16		underlay_prefix;

     

       99
       99
       +
       +	__u16		overlay_prefix;

     

       100
       100
       +
       +};

     

       101
       101
       +
       +

     

       102
       102
       +
        #endif /* _UAPI_IF_TUNNEL_H_ */

     

       103
       103
       +
       diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c

     

       104
       104
       +
       index cbb51f3..7a6174b 100644

     

       105
       105
       +
       --- a/net/ipv4/ip_tunnel.c

     

       106
       106
       +
       +++ b/net/ipv4/ip_tunnel.c

     

       107
       107
       +
       @@ -1110,6 +1110,11 @@ out:

     

       108
       108
       +
        }

     

       109
       109
       +
        EXPORT_SYMBOL_GPL(ip_tunnel_newlink);

     

       110
       110
       +
        

     

       111
       111
       +
       +static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       112
       112
       +
       +{

     

       113
       113
       +
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       114
       114
       +
       +}

     

       115
       115
       +
       +

     

       116
       116
       +
        int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       117
       117
       +
        			 struct ip_tunnel_parm *p)

     

       118
       118
       +
        {

     

       119
       119
       +
       @@ -1119,7 +1124,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       120
       120
       +
        	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);

     

       121
       121
       +
        

     

       122
       122
       +
        	if (dev == itn->fb_tunnel_dev)

     

       123
       123
       +
       -		return -EINVAL;

     

       124
       124
       +
       +		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;

     

       125
       125
       +
        

     

       126
       126
       +
        	t = ip_tunnel_find(itn, p, dev->type);

     

       127
       127
       +
        

     

       128
       128
       +
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       129
       129
       +
       index a09fb0d..56e8984 100644

     

       130
       130
       +
       --- a/net/ipv4/ipip.c

     

       131
       131
       +
       +++ b/net/ipv4/ipip.c

     

       132
       132
       +
       @@ -107,6 +107,7 @@

     

       133
       133
       +
        #include <linux/init.h>

     

       134
       134
       +
        #include <linux/netfilter_ipv4.h>

     

       135
       135
       +
        #include <linux/if_ether.h>

     

       136
       136
       +
       +#include <linux/inetdevice.h>

     

       137
       137
       +
        

     

       138
       138
       +
        #include <net/sock.h>

     

       139
       139
       +
        #include <net/ip.h>

     

       140
       140
       +
       @@ -208,6 +209,40 @@ drop:

     

       141
       141
       +
        	return 0;

     

       142
       142
       +
        }

     

       143
       143
       +
        

     

       144
       144
       +
       +static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       145
       145
       +
       +{

     

       146
       146
       +
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       147
       147
       +
       +}

     

       148
       148
       +
       +

     

       149
       149
       +
       +/*

     

       150
       150
       +
       + * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       151
       151
       +
       + * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       152
       152
       +
       + * F.G.A.B, where "F" and "G" are the first two octets of the underlay

     

       153
       153
       +
       + * network (the network portion of a /16), "A" and "B" are the low order

     

       154
       154
       +
       + * two octets of the underlay network host (the host portion of a /16),

     

       155
       155
       +
       + * and "Y" is a configured first octet of the overlay network.

     

       156
       156
       +
       + *

     

       157
       157
       +
       + * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       158
       158
       +
       + * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to

     

       159
       159
       +
       + * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       160
       160
       +
       + * overlay network 99.6.7.0/24.

     

       161
       161
       +
       + */

     

       162
       162
       +
       +static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       163
       163
       +
       +{

     

       164
       164
       +
       +	unsigned int overlay;

     

       165
       165
       +
       +	u32 daddr, underlay;

     

       166
       166
       +
       +

     

       167
       167
       +
       +	daddr = ntohl(ip_hdr(skb)->daddr);

     

       168
       168
       +
       +	overlay = daddr >> 24;

     

       169
       169
       +
       +	underlay = tunnel->fan.map[overlay];

     

       170
       170
       +
       +	if (!underlay)

     

       171
       171
       +
       +		return -EINVAL;

     

       172
       172
       +
       +

     

       173
       173
       +
       +	*iph = tunnel->parms.iph;

     

       174
       174
       +
       +	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));

     

       175
       175
       +
       +	return 0;

     

       176
       176
       +
       +}

     

       177
       177
       +
       +

     

       178
       178
       +
        /*

     

       179
       179
       +
         *	This function assumes it is being called from dev_queue_xmit()

     

       180
       180
       +
         *	and that skb is filled properly by that function.

     

       181
       181
       +
       @@ -215,7 +250,8 @@ drop:

     

       182
       182
       +
        static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       183
       183
       +
        {

     

       184
       184
       +
        	struct ip_tunnel *tunnel = netdev_priv(dev);

     

       185
       185
       +
       -	const struct iphdr  *tiph = &tunnel->parms.iph;

     

       186
       186
       +
       +	const struct iphdr *tiph;

     

       187
       187
       +
       +	struct iphdr fiph;

     

       188
       188
       +
        

     

       189
       189
       +
        	if (unlikely(skb->protocol != htons(ETH_P_IP)))

     

       190
       190
       +
        		goto tx_error;

     

       191
       191
       +
       @@ -224,6 +260,14 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       192
       192
       +
        	if (IS_ERR(skb))

     

       193
       193
       +
        		goto out;

     

       194
       194
       +
        

     

       195
       195
       +
       +	if (ipip_tunnel_is_fan(tunnel)) {

     

       196
       196
       +
       +		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))

     

       197
       197
       +
       +			goto tx_error;

     

       198
       198
       +
       +		tiph = &fiph;

     

       199
       199
       +
       +	} else {

     

       200
       200
       +
       +		tiph = &tunnel->parms.iph;

     

       201
       201
       +
       +	}

     

       202
       202
       +
       +

     

       203
       203
       +
        	skb_set_inner_ipproto(skb, IPPROTO_IPIP);

     

       204
       204
       +
        

     

       205
       205
       +
        	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);

     

       206
       206
       +
       @@ -375,21 +419,88 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       207
       207
       +
        	return ret;

     

       208
       208
       +
        }

     

       209
       209
       +
        

     

       210
       210
       +
       +static void ipip_fan_free_map(struct ip_tunnel *t)

     

       211
       211
       +
       +{

     

       212
       212
       +
       +	memset(&t->fan.map, 0, sizeof(t->fan.map));

     

       213
       213
       +
       +}

     

       214
       214
       +
       +

     

       215
       215
       +
       +static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)

     

       216
       216
       +
       +{

     

       217
       217
       +
       +	u32 overlay, overlay_mask, underlay, underlay_mask;

     

       218
       218
       +
       +

     

       219
       219
       +
       +	if ((map->underlay_prefix && map->underlay_prefix != 16) ||

     

       220
       220
       +
       +	    (map->overlay_prefix && map->overlay_prefix != 8))

     

       221
       221
       +
       +		return -EINVAL;

     

       222
       222
       +
       +

     

       223
       223
       +
       +	overlay = ntohl(map->overlay);

     

       224
       224
       +
       +	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));

     

       225
       225
       +
       +

     

       226
       226
       +
       +	underlay = ntohl(map->underlay);

     

       227
       227
       +
       +	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));

     

       228
       228
       +
       +

     

       229
       229
       +
       +	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))

     

       230
       230
       +
       +		return -EINVAL;

     

       231
       231
       +
       +

     

       232
       232
       +
       +	if (!(overlay & overlay_mask) && (underlay & underlay_mask))

     

       233
       233
       +
       +		return -EINVAL;

     

       234
       234
       +
       +

     

       235
       235
       +
       +	t->parms.i_flags |= TUNNEL_FAN;

     

       236
       236
       +
       +

     

       237
       237
       +
       +	/* Special case: overlay 0 and underlay 0 clears all mappings */

     

       238
       238
       +
       +	if (!overlay && !underlay) {

     

       239
       239
       +
       +		ipip_fan_free_map(t);

     

       240
       240
       +
       +		return 0;

     

       241
       241
       +
       +	}

     

       242
       242
       +
       +

     

       243
       243
       +
       +	overlay >>= (32 - map->overlay_prefix);

     

       244
       244
       +
       +	t->fan.map[overlay] = underlay;

     

       245
       245
       +
       +

     

       246
       246
       +
       +	return 0;

     

       247
       247
       +
       +}

     

       248
       248
       +
       +	

     

       249
       249
       +
       +

     

       250
       250
       +
       +static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       251
       251
       +
       +			    struct ip_tunnel_parm *parms)

     

       252
       252
       +
       +{

     

       253
       253
       +
       +	struct ip_tunnel_fan_map *map;

     

       254
       254
       +
       +	struct nlattr *attr;

     

       255
       255
       +
       +	int rem, rv;

     

       256
       256
       +
       +

     

       257
       257
       +
       +	if (!data[IFLA_IPTUN_FAN_MAP])

     

       258
       258
       +
       +		return 0;

     

       259
       259
       +
       +

     

       260
       260
       +
       +	if (parms->iph.daddr)

     

       261
       261
       +
       +		return -EINVAL;

     

       262
       262
       +
       +

     

       263
       263
       +
       +	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {

     

       264
       264
       +
       +		map = nla_data(attr);

     

       265
       265
       +
       +		rv = ipip_fan_set_map(t, map);

     

       266
       266
       +
       +		if (rv)

     

       267
       267
       +
       +			return rv;

     

       268
       268
       +
       +	}

     

       269
       269
       +
       +

     

       270
       270
       +
       +	return 0;

     

       271
       271
       +
       +}

     

       272
       272
       +
       +

     

       273
       273
       +
        static int ipip_newlink(struct net *src_net, struct net_device *dev,

     

       274
       274
       +
        			struct nlattr *tb[], struct nlattr *data[])

     

       275
       275
       +
        {

     

       276
       276
       +
        	struct ip_tunnel_parm p;

     

       277
       277
       +
        	struct ip_tunnel_encap ipencap;

     

       278
       278
       +
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       279
       279
       +
       +	int err;

     

       280
       280
       +
        

     

       281
       281
       +
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       282
       282
       +
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       283
       283
       +
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       284
       284
       +
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       285
       285
       +
        

     

       286
       286
       +
        		if (err < 0)

     

       287
       287
       +
        			return err;

     

       288
       288
       +
        	}

     

       289
       289
       +
        

     

       290
       290
       +
        	ipip_netlink_parms(data, &p);

     

       291
       291
       +
       +	err = ipip_netlink_fan(data, t, &p);

     

       292
       292
       +
       +	if (err < 0)

     

       293
       293
       +
       +		return err;

     

       294
       294
       +
        	return ip_tunnel_newlink(dev, tb, &p);

     

       295
       295
       +
        }

     

       296
       296
       +
        

     

       297
       297
       +
       @@ -398,16 +509,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],

     

       298
       298
       +
        {

     

       299
       299
       +
        	struct ip_tunnel_parm p;

     

       300
       300
       +
        	struct ip_tunnel_encap ipencap;

     

       301
       301
       +
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       302
       302
       +
       +	int err;

     

       303
       303
       +
        

     

       304
       304
       +
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       305
       305
       +
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       306
       306
       +
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       307
       307
       +
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       308
       308
       +
        

     

       309
       309
       +
        		if (err < 0)

     

       310
       310
       +
        			return err;

     

       311
       311
       +
        	}

     

       312
       312
       +
        

     

       313
       313
       +
        	ipip_netlink_parms(data, &p);

     

       314
       314
       +
       +	err = ipip_netlink_fan(data, t, &p);

     

       315
       315
       +
       +	if (err < 0)

     

       316
       316
       +
       +		return err;

     

       317
       317
       +
        

     

       318
       318
       +
        	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||

     

       319
       319
       +
        	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))

     

       320
       320
       +
       @@ -439,6 +554,8 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       321
       321
       +
        		nla_total_size(2) +

     

       322
       322
       +
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       323
       323
       +
        		nla_total_size(2) +

     

       324
       324
       +
       +		/* IFLA_IPTUN_FAN_MAP */

     

       325
       325
       +
       +		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +

     

       326
       326
       +
        		0;

     

       327
       327
       +
        }

     

       328
       328
       +
        

     

       329
       329
       +
       @@ -466,6 +583,29 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       330
       330
       +
        			tunnel->encap.flags))

     

       331
       331
       +
        		goto nla_put_failure;

     

       332
       332
       +
        

     

       333
       333
       +
       +	if (tunnel->parms.i_flags & TUNNEL_FAN) {

     

       334
       334
       +
       +		struct nlattr *fan_nest;

     

       335
       335
       +
       +		int i;

     

       336
       336
       +
       +

     

       337
       337
       +
       +		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);

     

       338
       338
       +
       +		if (!fan_nest)

     

       339
       339
       +
       +			goto nla_put_failure;

     

       340
       340
       +
       +		for (i = 0; i < 256; i++) {

     

       341
       341
       +
       +			if (tunnel->fan.map[i]) {

     

       342
       342
       +
       +				struct ip_tunnel_fan_map map;

     

       343
       343
       +
       +

     

       344
       344
       +
       +				map.underlay = htonl(tunnel->fan.map[i]);

     

       345
       345
       +
       +				map.underlay_prefix = 16;

     

       346
       346
       +
       +				map.overlay = htonl(i << 24);

     

       347
       347
       +
       +				map.overlay_prefix = 8;

     

       348
       348
       +
       +				if (nla_put(skb, IFLA_FAN_MAPPING,

     

       349
       349
       +
       +					    sizeof(map), &map))

     

       350
       350
       +
       +					goto nla_put_failure;

     

       351
       351
       +
       +			}

     

       352
       352
       +
       +		}

     

       353
       353
       +
       +		nla_nest_end(skb, fan_nest);

     

       354
       354
       +
       +	}

     

       355
       355
       +
       +

     

       356
       356
       +
        	return 0;

     

       357
       357
       +
        

     

       358
       358
       +
        nla_put_failure:

     

       359
       359
       +
       @@ -483,6 +623,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {

     

       360
       360
       +
        	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },

     

       361
       361
       +
        	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },

     

       362
       362
       +
        	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },

     

       363
       363
       +
       +

     

       364
       364
       +
       +	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },

     

       365
       365
       +
       +	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },

     

       366
       366
       +
        };

     

       367
       367
       +
        

     

       368
       368
       +
        static struct rtnl_link_ops ipip_link_ops __read_mostly = {

     

       369
       369
       +
       @@ -523,6 +666,23 @@ static struct pernet_operations ipip_net_ops = {

     

       370
       370
       +
        	.size = sizeof(struct ip_tunnel_net),

     

       371
       371
       +
        };

     

       372
       372
       +
        

     

       373
       373
       +
       +#ifdef CONFIG_SYSCTL

     

       374
       374
       +
       +static struct ctl_table_header *ipip_fan_header;

     

       375
       375
       +
       +static unsigned int ipip_fan_version = 3;

     

       376
       376
       +
       +

     

       377
       377
       +
       +static struct ctl_table ipip_fan_sysctls[] = {

     

       378
       378
       +
       +	{

     

       379
       379
       +
       +		.procname	= "version",

     

       380
       380
       +
       +		.data		= &ipip_fan_version,

     

       381
       381
       +
       +		.maxlen		= sizeof(ipip_fan_version),

     

       382
       382
       +
       +		.mode		= 0444,

     

       383
       383
       +
       +		.proc_handler	= proc_dointvec,

     

       384
       384
       +
       +	},

     

       385
       385
       +
       +	{},

     

       386
       386
       +
       +};

     

       387
       387
       +
       +

     

       388
       388
       +
       +#endif /* CONFIG_SYSCTL */

     

       389
       389
       +
       +

     

       390
       390
       +
        static int __init ipip_init(void)

     

       391
       391
       +
        {

     

       392
       392
       +
        	int err;

     

       393
       393
       +
       @@ -541,9 +701,22 @@ static int __init ipip_init(void)

     

       394
       394
       +
        	if (err < 0)

     

       395
       395
       +
        		goto rtnl_link_failed;

     

       396
       396
       +
        

     

       397
       397
       +
       +#ifdef CONFIG_SYSCTL

     

       398
       398
       +
       +	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",

     

       399
       399
       +
       +					      ipip_fan_sysctls);

     

       400
       400
       +
       +	if (!ipip_fan_header) {

     

       401
       401
       +
       +		err = -ENOMEM;

     

       402
       402
       +
       +		goto sysctl_failed;

     

       403
       403
       +
       +	}

     

       404
       404
       +
       +#endif /* CONFIG_SYSCTL */

     

       405
       405
       +
       +

     

       406
       406
       +
        out:

     

       407
       407
       +
        	return err;

     

       408
       408
       +
        

     

       409
       409
       +
       +#ifdef CONFIG_SYSCTL

     

       410
       410
       +
       +sysctl_failed:

     

       411
       411
       +
       +	rtnl_link_unregister(&ipip_link_ops);

     

       412
       412
       +
       +#endif /* CONFIG_SYSCTL */

     

       413
       413
       +
        rtnl_link_failed:

     

       414
       414
       +
        	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);

     

       415
       415
       +
        xfrm_tunnel_failed:

     

       416
       416
       +
       @@ -553,6 +726,9 @@ xfrm_tunnel_failed:

     

       417
       417
       +
        

     

       418
       418
       +
        static void __exit ipip_fini(void)

     

       419
       419
       +
        {

     

       420
       420
       +
       +#ifdef CONFIG_SYSCTL

     

       421
       421
       +
       +	unregister_net_sysctl_table(ipip_fan_header);

     

       422
       422
       +
       +#endif /* CONFIG_SYSCTL */

     

       423
       423
       +
        	rtnl_link_unregister(&ipip_link_ops);

     

       424
       424
       +
        	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))

     

       425
       425
       +
        		pr_info("%s: can't deregister tunnel\n", __func__);

     

       426
       426
       +
       -- 

     

       427
       427
       +
       2.7.4

     

       428
       428
       +
       

     

       429
       429
       +
       From 14aba409d044e3a314c09c650e1c42de699700b8 Mon Sep 17 00:00:00 2001

     

       430
       430
       +
       From: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       431
       431
       +
       Date: Wed, 11 Nov 2015 13:04:50 +0000

     

       432
       432
       +
       Subject: [PATCH] UBUNTU: SAUCE: fan: add VXLAN implementation

     

       433
       433
       +
       

     

       434
       434
       +
       Generify the fan mapping support and utilise that to implement fan

     

       435
       435
       +
       mappings over vxlan transport.

     

       436
       436
       +
       

     

       437
       437
       +
       Expose the existance of this functionality (when the module is loaded)

     

       438
       438
       +
       via an additional sysctl marker.

     

       439
       439
       +
       

     

       440
       440
       +
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       441
       441
       +
       [apw@canonical.com: added feature marker for fan over vxlan.]

     

       442
       442
       +
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       443
       443
       +
       ---

     

       444
       444
       +
        drivers/net/vxlan.c            | 245 +++++++++++++++++++++++++++++++++++++++++

     

       445
       445
       +
        include/net/ip_tunnels.h       |  19 +++-

     

       446
       446
       +
        include/net/vxlan.h            |   2 +

     

       447
       447
       +
        include/uapi/linux/if_link.h   |   1 +

     

       448
       448
       +
        include/uapi/linux/if_tunnel.h |   2 +-

     

       449
       449
       +
        net/ipv4/ip_tunnel.c           |   7 +-

     

       450
       450
       +
        net/ipv4/ipip.c                | 242 +++++++++++++++++++++++++++++++---------

     

       451
       451
       +
        7 files changed, 453 insertions(+), 65 deletions(-)

     

       452
       452
       +
       

     

       453
       453
       +
       diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c

     

       454
       454
       +
       index 405a7b6..a17cfd0 100644

     

       455
       455
       +
       --- a/drivers/net/vxlan.c

     

       456
       456
       +
       +++ b/drivers/net/vxlan.c

     

       457
       457
       +
       @@ -23,6 +23,7 @@

     

       458
       458
       +
        #include <linux/udp.h>

     

       459
       459
       +
        #include <linux/igmp.h>

     

       460
       460
       +
        #include <linux/etherdevice.h>

     

       461
       461
       +
       +#include <linux/inetdevice.h>

     

       462
       462
       +
        #include <linux/if_ether.h>

     

       463
       463
       +
        #include <linux/if_vlan.h>

     

       464
       464
       +
        #include <linux/hash.h>

     

       465
       465
       +
       @@ -106,6 +107,167 @@ static inline bool vxlan_collect_metadata(struct vxlan_sock *vs)

     

       466
       466
       +
        	       ip_tunnel_collect_metadata();

     

       467
       467
       +
        }

     

       468
       468
       +
        

     

       469
       469
       +
       +static struct ip_fan_map *vxlan_fan_find_map(struct vxlan_dev *vxlan, __be32 daddr)

     

       470
       470
       +
       +{

     

       471
       471
       +
       +	struct ip_fan_map *fan_map;

     

       472
       472
       +
       +

     

       473
       473
       +
       +	rcu_read_lock();

     

       474
       474
       +
       +	list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {

     

       475
       475
       +
       +		if (fan_map->overlay ==

     

       476
       476
       +
       +		    (daddr & inet_make_mask(fan_map->overlay_prefix))) {

     

       477
       477
       +
       +			rcu_read_unlock();

     

       478
       478
       +
       +			return fan_map;

     

       479
       479
       +
       +		}

     

       480
       480
       +
       +	}

     

       481
       481
       +
       +	rcu_read_unlock();

     

       482
       482
       +
       +

     

       483
       483
       +
       +	return NULL;

     

       484
       484
       +
       +}

     

       485
       485
       +
       +

     

       486
       486
       +
       +static void vxlan_fan_flush_map(struct vxlan_dev *vxlan)

     

       487
       487
       +
       +{

     

       488
       488
       +
       +	struct ip_fan_map *fan_map;

     

       489
       489
       +
       +

     

       490
       490
       +
       +	list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {

     

       491
       491
       +
       +		list_del_rcu(&fan_map->list);

     

       492
       492
       +
       +		kfree_rcu(fan_map, rcu);

     

       493
       493
       +
       +	}

     

       494
       494
       +
       +}

     

       495
       495
       +
       +

     

       496
       496
       +
       +static int vxlan_fan_del_map(struct vxlan_dev *vxlan, __be32 overlay)

     

       497
       497
       +
       +{

     

       498
       498
       +
       +	struct ip_fan_map *fan_map;

     

       499
       499
       +
       +

     

       500
       500
       +
       +	fan_map = vxlan_fan_find_map(vxlan, overlay);

     

       501
       501
       +
       +	if (!fan_map)

     

       502
       502
       +
       +		return -ENOENT;

     

       503
       503
       +
       +

     

       504
       504
       +
       +	list_del_rcu(&fan_map->list);

     

       505
       505
       +
       +	kfree_rcu(fan_map, rcu);

     

       506
       506
       +
       +

     

       507
       507
       +
       +	return 0;

     

       508
       508
       +
       +}

     

       509
       509
       +
       +

     

       510
       510
       +
       +static int vxlan_fan_add_map(struct vxlan_dev *vxlan, struct ifla_fan_map *map)

     

       511
       511
       +
       +{

     

       512
       512
       +
       +	__be32 overlay_mask, underlay_mask;

     

       513
       513
       +
       +	struct ip_fan_map *fan_map;

     

       514
       514
       +
       +

     

       515
       515
       +
       +	overlay_mask = inet_make_mask(map->overlay_prefix);

     

       516
       516
       +
       +	underlay_mask = inet_make_mask(map->underlay_prefix);

     

       517
       517
       +
       +

     

       518
       518
       +
       +	netdev_dbg(vxlan->dev, "vfam: map: o %x/%d u %x/%d om %x um %x\n",

     

       519
       519
       +
       +		   map->overlay, map->overlay_prefix,

     

       520
       520
       +
       +		   map->underlay, map->underlay_prefix,

     

       521
       521
       +
       +		   overlay_mask, underlay_mask);

     

       522
       522
       +
       +

     

       523
       523
       +
       +	if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask))

     

       524
       524
       +
       +		return -EINVAL;

     

       525
       525
       +
       +

     

       526
       526
       +
       +	if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask))

     

       527
       527
       +
       +		return -EINVAL;

     

       528
       528
       +
       +

     

       529
       529
       +
       +	/* Special case: overlay 0 and underlay 0: flush all mappings */

     

       530
       530
       +
       +	if (!map->overlay && !map->underlay) {

     

       531
       531
       +
       +		vxlan_fan_flush_map(vxlan);

     

       532
       532
       +
       +		return 0;

     

       533
       533
       +
       +	}

     

       534
       534
       +
       +	

     

       535
       535
       +
       +	/* Special case: overlay set and underlay 0: clear map for overlay */

     

       536
       536
       +
       +	if (!map->underlay)

     

       537
       537
       +
       +		return vxlan_fan_del_map(vxlan, map->overlay);

     

       538
       538
       +
       +

     

       539
       539
       +
       +	if (vxlan_fan_find_map(vxlan, map->overlay))

     

       540
       540
       +
       +		return -EEXIST;

     

       541
       541
       +
       +

     

       542
       542
       +
       +	fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL);

     

       543
       543
       +
       +	fan_map->underlay = map->underlay;

     

       544
       544
       +
       +	fan_map->overlay = map->overlay;

     

       545
       545
       +
       +	fan_map->underlay_prefix = map->underlay_prefix;

     

       546
       546
       +
       +	fan_map->overlay_mask = ntohl(overlay_mask);

     

       547
       547
       +
       +	fan_map->overlay_prefix = map->overlay_prefix;

     

       548
       548
       +
       +

     

       549
       549
       +
       +	list_add_tail_rcu(&fan_map->list, &vxlan->fan.fan_maps);

     

       550
       550
       +
       +

     

       551
       551
       +
       +	return 0;

     

       552
       552
       +
       +}

     

       553
       553
       +
       +	

     

       554
       554
       +
       +static int vxlan_parse_fan_map(struct nlattr *data[], struct vxlan_dev *vxlan)

     

       555
       555
       +
       +{

     

       556
       556
       +
       +	struct ifla_fan_map *map;

     

       557
       557
       +
       +	struct nlattr *attr;

     

       558
       558
       +
       +	int rem, rv;

     

       559
       559
       +
       +

     

       560
       560
       +
       +	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {

     

       561
       561
       +
       +		map = nla_data(attr);

     

       562
       562
       +
       +		rv = vxlan_fan_add_map(vxlan, map);

     

       563
       563
       +
       +		if (rv)

     

       564
       564
       +
       +			return rv;

     

       565
       565
       +
       +	}

     

       566
       566
       +
       +

     

       567
       567
       +
       +	return 0;

     

       568
       568
       +
       +}

     

       569
       569
       +
       +

     

       570
       570
       +
       +static int vxlan_fan_build_rdst(struct vxlan_dev *vxlan, struct sk_buff *skb,

     

       571
       571
       +
       +				      struct vxlan_rdst *fan_rdst)

     

       572
       572
       +
       +{

     

       573
       573
       +
       +	struct ip_fan_map *f_map;

     

       574
       574
       +
       +	union vxlan_addr *va;

     

       575
       575
       +
       +	u32 daddr, underlay;

     

       576
       576
       +
       +	struct arphdr *arp;

     

       577
       577
       +
       +	void *arp_ptr;

     

       578
       578
       +
       +	struct ethhdr *eth;

     

       579
       579
       +
       +	struct iphdr *iph;

     

       580
       580
       +
       +

     

       581
       581
       +
       +	eth = eth_hdr(skb);

     

       582
       582
       +
       +	switch (eth->h_proto) {

     

       583
       583
       +
       +	case htons(ETH_P_IP):

     

       584
       584
       +
       +		iph = ip_hdr(skb);

     

       585
       585
       +
       +		if (!iph)

     

       586
       586
       +
       +			return -EINVAL;

     

       587
       587
       +
       +		daddr = iph->daddr;

     

       588
       588
       +
       +		break;

     

       589
       589
       +
       +	case htons(ETH_P_ARP):

     

       590
       590
       +
       +		arp = arp_hdr(skb);

     

       591
       591
       +
       +		if (!arp)

     

       592
       592
       +
       +			return -EINVAL;

     

       593
       593
       +
       +		arp_ptr = arp + 1;

     

       594
       594
       +
       +		netdev_dbg(vxlan->dev,

     

       595
       595
       +
       +			   "vfbr: arp sha %pM sip %pI4 tha %pM tip %pI4\n",

     

       596
       596
       +
       +			   arp_ptr, arp_ptr + skb->dev->addr_len,

     

       597
       597
       +
       +			   arp_ptr + skb->dev->addr_len + 4,

     

       598
       598
       +
       +			   arp_ptr + (skb->dev->addr_len * 2) + 4);

     

       599
       599
       +
       +		arp_ptr += (skb->dev->addr_len * 2) + 4;

     

       600
       600
       +
       +		memcpy(&daddr, arp_ptr, 4);

     

       601
       601
       +
       +		break;

     

       602
       602
       +
       +	default:

     

       603
       603
       +
       +		netdev_dbg(vxlan->dev, "vfbr: unknown eth p %x\n", eth->h_proto);

     

       604
       604
       +
       +		return -EINVAL;

     

       605
       605
       +
       +	}

     

       606
       606
       +
       +

     

       607
       607
       +
       +	f_map = vxlan_fan_find_map(vxlan, daddr);

     

       608
       608
       +
       +	if (!f_map)

     

       609
       609
       +
       +		return -EINVAL;

     

       610
       610
       +
       +

     

       611
       611
       +
       +	daddr = ntohl(daddr);

     

       612
       612
       +
       +	underlay = ntohl(f_map->underlay);

     

       613
       613
       +
       +	if (!underlay)

     

       614
       614
       +
       +		return -EINVAL;

     

       615
       615
       +
       +

     

       616
       616
       +
       +	memset(fan_rdst, 0, sizeof(*fan_rdst));

     

       617
       617
       +
       +	va = &fan_rdst->remote_ip;

     

       618
       618
       +
       +	va->sa.sa_family = AF_INET;

     

       619
       619
       +
       +	fan_rdst->remote_vni = vxlan->default_dst.remote_vni;

     

       620
       620
       +
       +	va->sin.sin_addr.s_addr = htonl(underlay |

     

       621
       621
       +
       +					((daddr & ~f_map->overlay_mask) >>

     

       622
       622
       +
       +					 (32 - f_map->overlay_prefix -

     

       623
       623
       +
       +					  (32 - f_map->underlay_prefix))));

     

       624
       624
       +
       +	netdev_dbg(vxlan->dev, "vfbr: daddr %x ul %x dst %x\n",

     

       625
       625
       +
       +		   daddr, underlay, va->sin.sin_addr.s_addr);

     

       626
       626
       +
       +

     

       627
       627
       +
       +	return 0;

     

       628
       628
       +
       +}

     

       629
       629
       +
       +

     

       630
       630
       +
        #if IS_ENABLED(CONFIG_IPV6)

     

       631
       631
       +
        static inline

     

       632
       632
       +
        bool vxlan_addr_equal(const union vxlan_addr *a, const union vxlan_addr *b)

     

       633
       633
       +
       @@ -2029,6 +2191,13 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev,

     

       634
       634
       +
        			goto rt_tx_error;

     

       635
       635
       +
        		}

     

       636
       636
       +
        

     

       637
       637
       +
       +		if (fan_has_map(&vxlan->fan) && rt->rt_flags & RTCF_LOCAL) {

     

       638
       638
       +
       +			netdev_dbg(dev, "discard fan to localhost %pI4\n",

     

       639
       639
       +
       +				   &dst->sin.sin_addr.s_addr);

     

       640
       640
       +
       +			ip_rt_put(rt);

     

       641
       641
       +
       +			goto tx_free;

     

       642
       642
       +
       +		}

     

       643
       643
       +
       +

     

       644
       644
       +
        		/* Bypass encapsulation if the destination is local */

     

       645
       645
       +
        		if (rt->rt_flags & RTCF_LOCAL &&

     

       646
       646
       +
        		    !(rt->rt_flags & (RTCF_BROADCAST | RTCF_MULTICAST))) {

     

       647
       647
       +
       @@ -2169,6 +2338,20 @@ static netdev_tx_t vxlan_xmit(struct sk_buff *skb, struct net_device *dev)

     

       648
       648
       +
        		return NETDEV_TX_OK;

     

       649
       649
       +
        	}

     

       650
       650
       +
        

     

       651
       651
       +
       +	if (fan_has_map(&vxlan->fan)) {

     

       652
       652
       +
       +		struct vxlan_rdst fan_rdst;

     

       653
       653
       +
       +

     

       654
       654
       +
       +		netdev_dbg(vxlan->dev, "vxlan_xmit p %x d %pM\n",

     

       655
       655
       +
       +			   eth->h_proto, eth->h_dest);

     

       656
       656
       +
       +		if (vxlan_fan_build_rdst(vxlan, skb, &fan_rdst)) {

     

       657
       657
       +
       +			dev->stats.tx_dropped++;

     

       658
       658
       +
       +			kfree_skb(skb);

     

       659
       659
       +
       +			return NETDEV_TX_OK;

     

       660
       660
       +
       +		}

     

       661
       661
       +
       +		vxlan_xmit_one(skb, dev, &fan_rdst, 0);

     

       662
       662
       +
       +		return NETDEV_TX_OK;

     

       663
       663
       +
       +	}

     

       664
       664
       +
       +

     

       665
       665
       +
        	f = vxlan_find_mac(vxlan, eth->h_dest);

     

       666
       666
       +
        	did_rsc = false;

     

       667
       667
       +
        

     

       668
       668
       +
       @@ -2532,6 +2715,8 @@ static void vxlan_setup(struct net_device *dev)

     

       669
       669
       +
        

     

       670
       670
       +
        	for (h = 0; h < FDB_HASH_SIZE; ++h)

     

       671
       671
       +
        		INIT_HLIST_HEAD(&vxlan->fdb_head[h]);

     

       672
       672
       +
       +

     

       673
       673
       +
       +	INIT_LIST_HEAD(&vxlan->fan.fan_maps);

     

       674
       674
       +
        }

     

       675
       675
       +
        

     

       676
       676
       +
        static const struct nla_policy vxlan_policy[IFLA_VXLAN_MAX + 1] = {

     

       677
       677
       +
       @@ -2881,6 +3066,7 @@ EXPORT_SYMBOL_GPL(vxlan_dev_create);

     

       678
       678
       +
        static int vxlan_newlink(struct net *src_net, struct net_device *dev,

     

       679
       679
       +
        			 struct nlattr *tb[], struct nlattr *data[])

     

       680
       680
       +
        {

     

       681
       681
       +
       +	struct vxlan_dev *vxlan = netdev_priv(dev);

     

       682
       682
       +
        	struct vxlan_config conf;

     

       683
       683
       +
        	int err;

     

       684
       684
       +
        

     

       685
       685
       +
       @@ -2899,6 +3085,12 @@ static int vxlan_newlink(struct net *src_net, struct net_device *dev,

     

       686
       686
       +
        		conf.remote_ip.sa.sa_family = AF_INET6;

     

       687
       687
       +
        	}

     

       688
       688
       +
        

     

       689
       689
       +
       +	if (data[IFLA_VXLAN_FAN_MAP]) {

     

       690
       690
       +
       +		err = vxlan_parse_fan_map(data, vxlan);

     

       691
       691
       +
       +		if (err)

     

       692
       692
       +
       +			return err;

     

       693
       693
       +
       +	}

     

       694
       694
       +
       +

     

       695
       695
       +
        	if (data[IFLA_VXLAN_LOCAL]) {

     

       696
       696
       +
        		conf.saddr.sin.sin_addr.s_addr = nla_get_in_addr(data[IFLA_VXLAN_LOCAL]);

     

       697
       697
       +
        		conf.saddr.sa.sa_family = AF_INET;

     

       698
       698
       +
       @@ -3037,6 +3229,7 @@ static size_t vxlan_get_size(const struct net_device *dev)

     

       699
       699
       +
        		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_UDP_ZERO_CSUM6_RX */

     

       700
       700
       +
        		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_TX */

     

       701
       701
       +
        		nla_total_size(sizeof(__u8)) + /* IFLA_VXLAN_REMCSUM_RX */

     

       702
       702
       +
       +		nla_total_size(sizeof(struct ip_fan_map) * 256) +

     

       703
       703
       +
        		0;

     

       704
       704
       +
        }

     

       705
       705
       +
        

     

       706
       706
       +
       @@ -3083,6 +3276,26 @@ static int vxlan_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       707
       707
       +
        		}

     

       708
       708
       +
        	}

     

       709
       709
       +
        

     

       710
       710
       +
       +	if (fan_has_map(&vxlan->fan)) {

     

       711
       711
       +
       +		struct nlattr *fan_nest;

     

       712
       712
       +
       +		struct ip_fan_map *fan_map;

     

       713
       713
       +
       +

     

       714
       714
       +
       +		fan_nest = nla_nest_start(skb, IFLA_VXLAN_FAN_MAP);

     

       715
       715
       +
       +		if (!fan_nest)

     

       716
       716
       +
       +			goto nla_put_failure;

     

       717
       717
       +
       +		list_for_each_entry_rcu(fan_map, &vxlan->fan.fan_maps, list) {

     

       718
       718
       +
       +			struct ifla_fan_map map;

     

       719
       719
       +
       +

     

       720
       720
       +
       +			map.underlay = fan_map->underlay;

     

       721
       721
       +
       +			map.underlay_prefix = fan_map->underlay_prefix;

     

       722
       722
       +
       +			map.overlay = fan_map->overlay;

     

       723
       723
       +
       +			map.overlay_prefix = fan_map->overlay_prefix;

     

       724
       724
       +
       +			if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map))

     

       725
       725
       +
       +				goto nla_put_failure;

     

       726
       726
       +
       +		}

     

       727
       727
       +
       +		nla_nest_end(skb, fan_nest);

     

       728
       728
       +
       +	}

     

       729
       729
       +
       +

     

       730
       730
       +
        	if (nla_put_u8(skb, IFLA_VXLAN_TTL, vxlan->cfg.ttl) ||

     

       731
       731
       +
        	    nla_put_u8(skb, IFLA_VXLAN_TOS, vxlan->cfg.tos) ||

     

       732
       732
       +
        	    nla_put_u8(skb, IFLA_VXLAN_LEARNING,

     

       733
       733
       +
       @@ -3201,6 +3414,22 @@ static __net_init int vxlan_init_net(struct net *net)

     

       734
       734
       +
        	return 0;

     

       735
       735
       +
        }

     

       736
       736
       +
        

     

       737
       737
       +
       +#ifdef CONFIG_SYSCTL

     

       738
       738
       +
       +static struct ctl_table_header *vxlan_fan_header;

     

       739
       739
       +
       +static unsigned int vxlan_fan_version = 4;

     

       740
       740
       +
       +

     

       741
       741
       +
       +static struct ctl_table vxlan_fan_sysctls[] = {

     

       742
       742
       +
       +	{

     

       743
       743
       +
       +		.procname	= "vxlan",

     

       744
       744
       +
       +		.data		= &vxlan_fan_version,

     

       745
       745
       +
       +		.maxlen		= sizeof(vxlan_fan_version),

     

       746
       746
       +
       +		.mode		= 0444,

     

       747
       747
       +
       +		.proc_handler	= proc_dointvec,

     

       748
       748
       +
       +	},

     

       749
       749
       +
       +	{},

     

       750
       750
       +
       +};

     

       751
       751
       +
       +#endif /* CONFIG_SYSCTL */

     

       752
       752
       +
       +

     

       753
       753
       +
        static void __net_exit vxlan_exit_net(struct net *net)

     

       754
       754
       +
        {

     

       755
       755
       +
        	struct vxlan_net *vn = net_generic(net, vxlan_net_id);

     

       756
       756
       +
       @@ -3256,7 +3485,20 @@ static int __init vxlan_init_module(void)

     

       757
       757
       +
        	if (rc)

     

       758
       758
       +
        		goto out3;

     

       759
       759
       +
        

     

       760
       760
       +
       +#ifdef CONFIG_SYSCTL

     

       761
       761
       +
       +	vxlan_fan_header = register_net_sysctl(&init_net, "net/fan",

     

       762
       762
       +
       +					      vxlan_fan_sysctls);

     

       763
       763
       +
       +	if (!vxlan_fan_header) {

     

       764
       764
       +
       +		rc = -ENOMEM;

     

       765
       765
       +
       +		goto sysctl_failed;

     

       766
       766
       +
       +	}

     

       767
       767
       +
       +#endif /* CONFIG_SYSCTL */

     

       768
       768
       +
       +

     

       769
       769
       +
        	return 0;

     

       770
       770
       +
       +#ifdef CONFIG_SYSCTL

     

       771
       771
       +
       +sysctl_failed:

     

       772
       772
       +
       +	rtnl_link_unregister(&vxlan_link_ops);

     

       773
       773
       +
       +#endif /* CONFIG_SYSCTL */

     

       774
       774
       +
        out3:

     

       775
       775
       +
        	unregister_netdevice_notifier(&vxlan_notifier_block);

     

       776
       776
       +
        out2:

     

       777
       777
       +
       @@ -3269,6 +3511,9 @@ late_initcall(vxlan_init_module);

     

       778
       778
       +
        

     

       779
       779
       +
        static void __exit vxlan_cleanup_module(void)

     

       780
       780
       +
        {

     

       781
       781
       +
       +#ifdef CONFIG_SYSCTL

     

       782
       782
       +
       +	unregister_net_sysctl_table(vxlan_fan_header);

     

       783
       783
       +
       +#endif /* CONFIG_SYSCTL */

     

       784
       784
       +
        	rtnl_link_unregister(&vxlan_link_ops);

     

       785
       785
       +
        	unregister_netdevice_notifier(&vxlan_notifier_block);

     

       786
       786
       +
        	destroy_workqueue(vxlan_wq);

     

       787
       787
       +
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       788
       788
       +
       index 47fec59..28a38e5 100644

     

       789
       789
       +
       --- a/include/net/ip_tunnels.h

     

       790
       790
       +
       +++ b/include/net/ip_tunnels.h

     

       791
       791
       +
       @@ -100,9 +100,18 @@ struct metadata_dst;

     

       792
       792
       +
         */

     

       793
       793
       +
        #define FAN_OVERLAY_CNT		256

     

       794
       794
       +
        

     

       795
       795
       +
       +struct ip_fan_map {

     

       796
       796
       +
       +	__be32			underlay;

     

       797
       797
       +
       +	__be32			overlay;

     

       798
       798
       +
       +	u16			underlay_prefix;

     

       799
       799
       +
       +	u16			overlay_prefix;

     

       800
       800
       +
       +	u32			overlay_mask;

     

       801
       801
       +
       +	struct list_head	list;

     

       802
       802
       +
       +	struct rcu_head		rcu;

     

       803
       803
       +
       +};

     

       804
       804
       +
       +

     

       805
       805
       +
        struct ip_tunnel_fan {

     

       806
       806
       +
       -/*	u32 __rcu	*map;*/

     

       807
       807
       +
       -	u32		map[FAN_OVERLAY_CNT];

     

       808
       808
       +
       +	struct list_head	fan_maps;

     

       809
       809
       +
        };

     

       810
       810
       +
        

     

       811
       811
       +
        struct ip_tunnel {

     

       812
       812
       +
       @@ -157,7 +166,11 @@ struct ip_tunnel {

     

       813
       813
       +
        #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)

     

       814
       814
       +
        

     

       815
       815
       +
        #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)

     

       816
       816
       +
       -#define TUNNEL_FAN		__cpu_to_be16(0x4000)

     

       817
       817
       +
       +

     

       818
       818
       +
       +static inline int fan_has_map(const struct ip_tunnel_fan *fan)

     

       819
       819
       +
       +{

     

       820
       820
       +
       +	return !list_empty(&fan->fan_maps);

     

       821
       821
       +
       +}

     

       822
       822
       +
        

     

       823
       823
       +
        struct tnl_ptk_info {

     

       824
       824
       +
        	__be16 flags;

     

       825
       825
       +
       diff --git a/include/net/vxlan.h b/include/net/vxlan.h

     

       826
       826
       +
       index e289ada..542f421 100644

     

       827
       827
       +
       --- a/include/net/vxlan.h

     

       828
       828
       +
       +++ b/include/net/vxlan.h

     

       829
       829
       +
       @@ -161,6 +161,8 @@ struct vxlan_dev {

     

       830
       830
       +
        	struct vxlan_rdst default_dst;	/* default destination */

     

       831
       831
       +
        	u32		  flags;	/* VXLAN_F_* in vxlan.h */

     

       832
       832
       +
        

     

       833
       833
       +
       +	struct ip_tunnel_fan fan;

     

       834
       834
       +
       +

     

       835
       835
       +
        	struct timer_list age_timer;

     

       836
       836
       +
        	spinlock_t	  hash_lock;

     

       837
       837
       +
        	unsigned int	  addrcnt;

     

       838
       838
       +
       diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h

     

       839
       839
       +
       index 5ad5737..6cde3bf 100644

     

       840
       840
       +
       --- a/include/uapi/linux/if_link.h

     

       841
       841
       +
       +++ b/include/uapi/linux/if_link.h

     

       842
       842
       +
       @@ -443,6 +443,7 @@ enum {

     

       843
       843
       +
        	IFLA_VXLAN_GBP,

     

       844
       844
       +
        	IFLA_VXLAN_REMCSUM_NOPARTIAL,

     

       845
       845
       +
        	IFLA_VXLAN_COLLECT_METADATA,

     

       846
       846
       +
       +	IFLA_VXLAN_FAN_MAP = 33,

     

       847
       847
       +
        	__IFLA_VXLAN_MAX

     

       848
       848
       +
        };

     

       849
       849
       +
        #define IFLA_VXLAN_MAX	(__IFLA_VXLAN_MAX - 1)

     

       850
       850
       +
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       851
       851
       +
       index 85a3e4b..d36b150 100644

     

       852
       852
       +
       --- a/include/uapi/linux/if_tunnel.h

     

       853
       853
       +
       +++ b/include/uapi/linux/if_tunnel.h

     

       854
       854
       +
       @@ -145,7 +145,7 @@ enum {

     

       855
       855
       +
        

     

       856
       856
       +
        #define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       857
       857
       +
        

     

       858
       858
       +
       -struct ip_tunnel_fan_map {

     

       859
       859
       +
       +struct ifla_fan_map {

     

       860
       860
       +
        	__be32		underlay;

     

       861
       861
       +
        	__be32		overlay;

     

       862
       862
       +
        	__u16		underlay_prefix;

     

       863
       863
       +
       diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c

     

       864
       864
       +
       index 7a6174b..c821bf1 100644

     

       865
       865
       +
       --- a/net/ipv4/ip_tunnel.c

     

       866
       866
       +
       +++ b/net/ipv4/ip_tunnel.c

     

       867
       867
       +
       @@ -1110,11 +1110,6 @@ out:

     

       868
       868
       +
        }

     

       869
       869
       +
        EXPORT_SYMBOL_GPL(ip_tunnel_newlink);

     

       870
       870
       +
        

     

       871
       871
       +
       -static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       872
       872
       +
       -{

     

       873
       873
       +
       -	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       874
       874
       +
       -}

     

       875
       875
       +
       -

     

       876
       876
       +
        int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       877
       877
       +
        			 struct ip_tunnel_parm *p)

     

       878
       878
       +
        {

     

       879
       879
       +
       @@ -1124,7 +1119,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       880
       880
       +
        	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);

     

       881
       881
       +
        

     

       882
       882
       +
        	if (dev == itn->fb_tunnel_dev)

     

       883
       883
       +
       -		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;

     

       884
       884
       +
       +		return fan_has_map(&tunnel->fan) ? 0 : -EINVAL;

     

       885
       885
       +
        

     

       886
       886
       +
        	t = ip_tunnel_find(itn, p, dev->type);

     

       887
       887
       +
        

     

       888
       888
       +
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       889
       889
       +
       index 56e8984..3877b0e 100644

     

       890
       890
       +
       --- a/net/ipv4/ipip.c

     

       891
       891
       +
       +++ b/net/ipv4/ipip.c

     

       892
       892
       +
       @@ -108,6 +108,7 @@

     

       893
       893
       +
        #include <linux/netfilter_ipv4.h>

     

       894
       894
       +
        #include <linux/if_ether.h>

     

       895
       895
       +
        #include <linux/inetdevice.h>

     

       896
       896
       +
       +#include <linux/rculist.h>

     

       897
       897
       +
        

     

       898
       898
       +
        #include <net/sock.h>

     

       899
       899
       +
        #include <net/ip.h>

     

       900
       900
       +
       @@ -209,37 +210,144 @@ drop:

     

       901
       901
       +
        	return 0;

     

       902
       902
       +
        }

     

       903
       903
       +
        

     

       904
       904
       +
       -static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       905
       905
       +
       +static struct ip_fan_map *ipip_fan_find_map(struct ip_tunnel *t, __be32 daddr)

     

       906
       906
       +
        {

     

       907
       907
       +
       -	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       908
       908
       +
       +	struct ip_fan_map *fan_map;

     

       909
       909
       +
       +

     

       910
       910
       +
       +	rcu_read_lock();

     

       911
       911
       +
       +	list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) {

     

       912
       912
       +
       +		if (fan_map->overlay ==

     

       913
       913
       +
       +		    (daddr & inet_make_mask(fan_map->overlay_prefix))) {

     

       914
       914
       +
       +			rcu_read_unlock();

     

       915
       915
       +
       +			return fan_map;

     

       916
       916
       +
       +		}

     

       917
       917
       +
       +	}

     

       918
       918
       +
       +	rcu_read_unlock();

     

       919
       919
       +
       +

     

       920
       920
       +
       +	return NULL;

     

       921
       921
       +
        }

     

       922
       922
       +
        

     

       923
       923
       +
       -/*

     

       924
       924
       +
       - * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       925
       925
       +
       - * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       926
       926
       +
       - * F.G.A.B, where "F" and "G" are the first two octets of the underlay

     

       927
       927
       +
       - * network (the network portion of a /16), "A" and "B" are the low order

     

       928
       928
       +
       - * two octets of the underlay network host (the host portion of a /16),

     

       929
       929
       +
       - * and "Y" is a configured first octet of the overlay network.

     

       930
       930
       +
       +/* Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       931
       931
       +
       + * address.  

     

       932
       932
       +
       + *

     

       933
       933
       +
       + * Given a /8 overlay and /16 underlay, for an overlay (inner) address

     

       934
       934
       +
       + * Y.A.B.C, the transformation is F.G.A.B, where "F" and "G" are the first

     

       935
       935
       +
       + * two octets of the underlay network (the network portion of a /16), "A"

     

       936
       936
       +
       + * and "B" are the low order two octets of the underlay network host (the

     

       937
       937
       +
       + * host portion of a /16), and "Y" is a configured first octet of the

     

       938
       938
       +
       + * overlay network.

     

       939
       939
       +
       + *

     

       940
       940
       +
       + * E.g., underlay host 10.88.3.4/16 with an overlay of 99.0.0.0/8 would

     

       941
       941
       +
       + * host overlay subnet 99.3.4.0/24.  An overlay network datagram from

     

       942
       942
       +
       + * 99.3.4.5 to 99.6.7.8, would be directed to underlay host 10.88.6.7,

     

       943
       943
       +
       + * which hosts overlay network subnet 99.6.7.0/24.  This transformation is

     

       944
       944
       +
       + * described in detail further below.

     

       945
       945
       +
       + *

     

       946
       946
       +
       + * Using netmasks for the overlay and underlay other than /8 and /16, as

     

       947
       947
       +
       + * shown above, can yield larger (or smaller) overlay subnets, with the

     

       948
       948
       +
       + * trade-off of allowing fewer (or more) underlay hosts to participate.

     

       949
       949
       +
       + *

     

       950
       950
       +
       + * The size of each overlay network subnet is defined by the total of the

     

       951
       951
       +
       + * network mask of the overlay plus the size of host portion of the

     

       952
       952
       +
       + * underlay network. In the above example, /8 + /16 = /24.

     

       953
       953
       +
       + *

     

       954
       954
       +
       + * E.g., consider underlay host 10.99.238.5/20 and overlay 99.0.0.0/8. In

     

       955
       955
       +
       + * this case, the network portion of the underlay is 10.99.224.0/20, and

     

       956
       956
       +
       + * the host portion is 0.0.14.5 (12 bits).  To determine the overlay

     

       957
       957
       +
       + * network subnet, the 12 bits of host portion are left shifted 12 bits

     

       958
       958
       +
       + * (/20 - /8) and ORed with the overlay subnet prefix.  This yields an

     

       959
       959
       +
       + * overlay subnet of 99.224.80/20, composed of 8 bits overlay, followed by

     

       960
       960
       +
       + * 12 bits underlay.  This yields 12 bits in the overlay network portion,

     

       961
       961
       +
       + * allowing for 4094 addresses in each overlay network subnet.  The

     

       962
       962
       +
       + * trade-off is that fewer hosts may participate in the underlay network,

     

       963
       963
       +
       + * as its host address size has shrunk from 16 bits (65534 addresses) in

     

       964
       964
       +
       + * the first example to 12 bits (4094 addresses) here.

     

       965
       965
       +
       + *

     

       966
       966
       +
       + * For fewer hosts per overlay subnet (permitting a larger number of

     

       967
       967
       +
       + * underlay hosts to participate), the underlay netmask may be made

     

       968
       968
       +
       + * smaller.

     

       969
       969
       +
       + *

     

       970
       970
       +
       + * E.g., underlay host 10.111.1.2/12 (network 10.96.0.0/12, host portion

     

       971
       971
       +
       + * is 0.15.1.2, 20 bits) with an overlay of 33.0.0.0/8 would left shift

     

       972
       972
       +
       + * the 20 bits of host by 4 (so that it's highest order bit is adjacent to

     

       973
       973
       +
       + * the lowest order bit of the /8 overlay).  This yields an overlay subnet

     

       974
       974
       +
       + * of 33.240.16.32/28 (8 bits overlay, 20 bits from the host portion of

     

       975
       975
       +
       + * the underlay).  This provides more addresses for the underlay network

     

       976
       976
       +
       + * (approximately 2^20), but each host's segment of the overlay provides

     

       977
       977
       +
       + * only 4 bits of addresses (14 usable).

     

       978
       978
       +
       + *

     

       979
       979
       +
       + * It is also possible to adjust the overlay subnet.

     

       980
       980
       +
       + *

     

       981
       981
       +
       + * For an overlay of 240.0.0.0/5 and underlay of 10.88.0.0/20, consider

     

       982
       982
       +
       + * underlay host 10.88.129.2; the 12 bits of host, 0.0.1.2, are left

     

       983
       983
       +
       + * shifted 15 bits (/20 - /5), yielding an overlay network of

     

       984
       984
       +
       + * 240.129.0.0/17.  An underlay host of 10.88.244.215 would yield an

     

       985
       985
       +
       + * overlay network of 242.107.128.0/17.

     

       986
       986
       +
       + *

     

       987
       987
       +
       + * For an overlay of 100.64.0.0/10 and underlay of 10.224.220.0/24, for

     

       988
       988
       +
       + * underlay host 10.224.220.10, the underlay host portion (.10) is left

     

       989
       989
       +
       + * shifted 14 bits, yielding an overlay network subnet of 100.66.128.0/18.

     

       990
       990
       +
       + * This would permit 254 addresses on the underlay, with each overlay

     

       991
       991
       +
       + * segment providing approximately 2^14 - 2 addresses (16382).

     

       992
       992
       +
       + *

     

       993
       993
       +
       + * For packets being encapsulated, the overlay network destination IP

     

       994
       994
       +
       + * address is deconstructed into its overlay and underlay-derived

     

       995
       995
       +
       + * portions.  The underlay portion (determined by the overlay mask and

     

       996
       996
       +
       + * overlay subnet mask) is right shifted according to the size of the

     

       997
       997
       +
       + * underlay network mask.  This value is then ORed with the network

     

       998
       998
       +
       + * portion of the underlay network to produce the underlay network

     

       999
       999
       +
       + * destination for the encapsulated datagram.

     

       1000
       1000
       +
       + *

     

       1001
       1001
       +
       + * For example, using the initial example of underlay 10.88.3.4/16 and

     

       1002
       1002
       +
       + * overlay 99.0.0.0/8, with underlay host 10.88.3.4/16 providing overlay

     

       1003
       1003
       +
       + * subnet 99.3.4.0/24 with specfic host 99.3.4.5.  A datagram from

     

       1004
       1004
       +
       + * 99.3.4.5 to 99.6.7.8 would first have the underlay host derived portion

     

       1005
       1005
       +
       + * of the address extracted.  This is a number of bits equal to underlay

     

       1006
       1006
       +
       + * network host portion.  In the destination address, the highest order of

     

       1007
       1007
       +
       + * these bits is one bit lower than the lowest order bit from the overlay

     

       1008
       1008
       +
       + * network mask.

     

       1009
       1009
       +
       + *

     

       1010
       1010
       +
       + * Using the sample value, 99.6.7.8, the overlay mask is /8, and the

     

       1011
       1011
       +
       + * underlay mask is /16 (leaving 16 bits for the host portion).  The bits

     

       1012
       1012
       +
       + * to be shifted are the middle two octets, 0.6.7.0, as this is 99.6.7.8

     

       1013
       1013
       +
       + * ANDed with the mask 0x00ffff00 (which is 16 bits, the highest order of

     

       1014
       1014
       +
       + * which is 1 bit lower than the lowest order overlay address bit).

     

       1015
       1015
       +
         *

     

       1016
       1016
       +
       - * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       1017
       1017
       +
       - * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to

     

       1018
       1018
       +
       - * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       1019
       1019
       +
       - * overlay network 99.6.7.0/24.

     

       1020
       1020
       +
       + * These octets, 0.6.7.0, are then right shifted 8 bits, yielding 0.0.6.7.

     

       1021
       1021
       +
       + * This value is then ORed with the underlay network portion,

     

       1022
       1022
       +
       + * 10.88.0.0/16, providing 10.88.6.7 as the final underlay destination for

     

       1023
       1023
       +
       + * the encapuslated datagram.

     

       1024
       1024
       +
       + *

     

       1025
       1025
       +
       + * Another transform using the final example: overlay 100.64.0.0/10 and

     

       1026
       1026
       +
       + * underlay 10.224.220.0/24.  Consider overlay address 100.66.128.1

     

       1027
       1027
       +
       + * sending a datagram to 100.66.200.5.  In this case, 8 bits (the host

     

       1028
       1028
       +
       + * portion size of 10.224.220.0/24) beginning after the 100.64/10 overlay

     

       1029
       1029
       +
       + * prefix are masked off, yielding 0.2.192.0.  This is right shifted 14

     

       1030
       1030
       +
       + * (32 - 10 - (32 - 24), i.e., the number of bits between the overlay

     

       1031
       1031
       +
       + * network portion and the underlay host portion) bits, yielding 0.0.0.11.

     

       1032
       1032
       +
       + * This is ORed with the underlay network portion, 10.224.220.0/24, giving

     

       1033
       1033
       +
       + * the underlay destination of 10.224.220.11 for overlay destination

     

       1034
       1034
       +
       + * 100.66.200.5.

     

       1035
       1035
       +
         */

     

       1036
       1036
       +
        static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       1037
       1037
       +
        {

     

       1038
       1038
       +
       -	unsigned int overlay;

     

       1039
       1039
       +
       +	struct ip_fan_map *f_map;

     

       1040
       1040
       +
        	u32 daddr, underlay;

     

       1041
       1041
       +
        

     

       1042
       1042
       +
       +	f_map = ipip_fan_find_map(tunnel, ip_hdr(skb)->daddr);

     

       1043
       1043
       +
       +	if (!f_map)

     

       1044
       1044
       +
       +		return -ENOENT;

     

       1045
       1045
       +
       +

     

       1046
       1046
       +
        	daddr = ntohl(ip_hdr(skb)->daddr);

     

       1047
       1047
       +
       -	overlay = daddr >> 24;

     

       1048
       1048
       +
       -	underlay = tunnel->fan.map[overlay];

     

       1049
       1049
       +
       +	underlay = ntohl(f_map->underlay);

     

       1050
       1050
       +
        	if (!underlay)

     

       1051
       1051
       +
        		return -EINVAL;

     

       1052
       1052
       +
        

     

       1053
       1053
       +
        	*iph = tunnel->parms.iph;

     

       1054
       1054
       +
       -	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));

     

       1055
       1055
       +
       +	iph->daddr = htonl(underlay |

     

       1056
       1056
       +
       +			   ((daddr & ~f_map->overlay_mask) >>

     

       1057
       1057
       +
       +			    (32 - f_map->overlay_prefix -

     

       1058
       1058
       +
       +			     (32 - f_map->underlay_prefix))));

     

       1059
       1059
       +
        	return 0;

     

       1060
       1060
       +
        }

     

       1061
       1061
       +
        

     

       1062
       1062
       +
       @@ -260,7 +368,7 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       1063
       1063
       +
        	if (IS_ERR(skb))

     

       1064
       1064
       +
        		goto out;

     

       1065
       1065
       +
        

     

       1066
       1066
       +
       -	if (ipip_tunnel_is_fan(tunnel)) {

     

       1067
       1067
       +
       +	if (fan_has_map(&tunnel->fan)) {

     

       1068
       1068
       +
        		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))

     

       1069
       1069
       +
        			goto tx_error;

     

       1070
       1070
       +
        		tiph = &fiph;

     

       1071
       1071
       +
       @@ -325,6 +433,8 @@ static const struct net_device_ops ipip_netdev_ops = {

     

       1072
       1072
       +
        

     

       1073
       1073
       +
        static void ipip_tunnel_setup(struct net_device *dev)

     

       1074
       1074
       +
        {

     

       1075
       1075
       +
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       1076
       1076
       +
       +

     

       1077
       1077
       +
        	dev->netdev_ops		= &ipip_netdev_ops;

     

       1078
       1078
       +
        

     

       1079
       1079
       +
        	dev->type		= ARPHRD_TUNNEL;

     

       1080
       1080
       +
       @@ -336,6 +446,7 @@ static void ipip_tunnel_setup(struct net_device *dev)

     

       1081
       1081
       +
        	dev->features		|= IPIP_FEATURES;

     

       1082
       1082
       +
        	dev->hw_features	|= IPIP_FEATURES;

     

       1083
       1083
       +
        	ip_tunnel_setup(dev, ipip_net_id);

     

       1084
       1084
       +
       +	INIT_LIST_HEAD(&t->fan.fan_maps);

     

       1085
       1085
       +
        }

     

       1086
       1086
       +
        

     

       1087
       1087
       +
        static int ipip_tunnel_init(struct net_device *dev)

     

       1088
       1088
       +
       @@ -419,41 +530,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       1089
       1089
       +
        	return ret;

     

       1090
       1090
       +
        }

     

       1091
       1091
       +
        

     

       1092
       1092
       +
       -static void ipip_fan_free_map(struct ip_tunnel *t)

     

       1093
       1093
       +
       +static void ipip_fan_flush_map(struct ip_tunnel *t)

     

       1094
       1094
       +
        {

     

       1095
       1095
       +
       -	memset(&t->fan.map, 0, sizeof(t->fan.map));

     

       1096
       1096
       +
       +	struct ip_fan_map *fan_map;

     

       1097
       1097
       +
       +

     

       1098
       1098
       +
       +	list_for_each_entry_rcu(fan_map, &t->fan.fan_maps, list) {

     

       1099
       1099
       +
       +		list_del_rcu(&fan_map->list);

     

       1100
       1100
       +
       +		kfree_rcu(fan_map, rcu);

     

       1101
       1101
       +
       +	}

     

       1102
       1102
       +
        }

     

       1103
       1103
       +
        

     

       1104
       1104
       +
       -static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)

     

       1105
       1105
       +
       +static int ipip_fan_del_map(struct ip_tunnel *t, __be32 overlay)

     

       1106
       1106
       +
        {

     

       1107
       1107
       +
       -	u32 overlay, overlay_mask, underlay, underlay_mask;

     

       1108
       1108
       +
       +	struct ip_fan_map *fan_map;

     

       1109
       1109
       +
        

     

       1110
       1110
       +
       -	if ((map->underlay_prefix && map->underlay_prefix != 16) ||

     

       1111
       1111
       +
       -	    (map->overlay_prefix && map->overlay_prefix != 8))

     

       1112
       1112
       +
       -		return -EINVAL;

     

       1113
       1113
       +
       +	fan_map = ipip_fan_find_map(t, overlay);

     

       1114
       1114
       +
       +	if (!fan_map)

     

       1115
       1115
       +
       +		return -ENOENT;

     

       1116
       1116
       +
       +

     

       1117
       1117
       +
       +	list_del_rcu(&fan_map->list);

     

       1118
       1118
       +
       +	kfree_rcu(fan_map, rcu);

     

       1119
       1119
       +
        

     

       1120
       1120
       +
       -	overlay = ntohl(map->overlay);

     

       1121
       1121
       +
       -	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));

     

       1122
       1122
       +
       +	return 0;

     

       1123
       1123
       +
       +}

     

       1124
       1124
       +
        

     

       1125
       1125
       +
       -	underlay = ntohl(map->underlay);

     

       1126
       1126
       +
       -	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));

     

       1127
       1127
       +
       +static int ipip_fan_add_map(struct ip_tunnel *t, struct ifla_fan_map *map)

     

       1128
       1128
       +
       +{

     

       1129
       1129
       +
       +	__be32 overlay_mask, underlay_mask;

     

       1130
       1130
       +
       +	struct ip_fan_map *fan_map;

     

       1131
       1131
       +
        

     

       1132
       1132
       +
       -	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))

     

       1133
       1133
       +
       -		return -EINVAL;

     

       1134
       1134
       +
       +	overlay_mask = inet_make_mask(map->overlay_prefix);

     

       1135
       1135
       +
       +	underlay_mask = inet_make_mask(map->underlay_prefix);

     

       1136
       1136
       +
        

     

       1137
       1137
       +
       -	if (!(overlay & overlay_mask) && (underlay & underlay_mask))

     

       1138
       1138
       +
       +	if ((map->overlay & ~overlay_mask) || (map->underlay & ~underlay_mask))

     

       1139
       1139
       +
        		return -EINVAL;

     

       1140
       1140
       +
        

     

       1141
       1141
       +
       -	t->parms.i_flags |= TUNNEL_FAN;

     

       1142
       1142
       +
       +	if (!(map->overlay & overlay_mask) && (map->underlay & underlay_mask))

     

       1143
       1143
       +
       +		return -EINVAL;

     

       1144
       1144
       +
        

     

       1145
       1145
       +
       -	/* Special case: overlay 0 and underlay 0 clears all mappings */

     

       1146
       1146
       +
       -	if (!overlay && !underlay) {

     

       1147
       1147
       +
       -		ipip_fan_free_map(t);

     

       1148
       1148
       +
       +	/* Special case: overlay 0 and underlay 0: flush all mappings */

     

       1149
       1149
       +
       +	if (!map->overlay && !map->underlay) {

     

       1150
       1150
       +
       +		ipip_fan_flush_map(t);

     

       1151
       1151
       +
        		return 0;

     

       1152
       1152
       +
        	}

     

       1153
       1153
       +
       +	

     

       1154
       1154
       +
       +	/* Special case: overlay set and underlay 0: clear map for overlay */

     

       1155
       1155
       +
       +	if (!map->underlay)

     

       1156
       1156
       +
       +		return ipip_fan_del_map(t, map->overlay);

     

       1157
       1157
       +
       +

     

       1158
       1158
       +
       +	if (ipip_fan_find_map(t, map->overlay))

     

       1159
       1159
       +
       +		return -EEXIST;

     

       1160
       1160
       +
       +

     

       1161
       1161
       +
       +	fan_map = kmalloc(sizeof(*fan_map), GFP_KERNEL);

     

       1162
       1162
       +
       +	fan_map->underlay = map->underlay;

     

       1163
       1163
       +
       +	fan_map->overlay = map->overlay;

     

       1164
       1164
       +
       +	fan_map->underlay_prefix = map->underlay_prefix;

     

       1165
       1165
       +
       +	fan_map->overlay_mask = ntohl(overlay_mask);

     

       1166
       1166
       +
       +	fan_map->overlay_prefix = map->overlay_prefix;

     

       1167
       1167
       +
        

     

       1168
       1168
       +
       -	overlay >>= (32 - map->overlay_prefix);

     

       1169
       1169
       +
       -	t->fan.map[overlay] = underlay;

     

       1170
       1170
       +
       +	list_add_tail_rcu(&fan_map->list, &t->fan.fan_maps);

     

       1171
       1171
       +
        

     

       1172
       1172
       +
        	return 0;

     

       1173
       1173
       +
        }

     

       1174
       1174
       +
       @@ -462,7 +597,7 @@ static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)

     

       1175
       1175
       +
        static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       1176
       1176
       +
        			    struct ip_tunnel_parm *parms)

     

       1177
       1177
       +
        {

     

       1178
       1178
       +
       -	struct ip_tunnel_fan_map *map;

     

       1179
       1179
       +
       +	struct ifla_fan_map *map;

     

       1180
       1180
       +
        	struct nlattr *attr;

     

       1181
       1181
       +
        	int rem, rv;

     

       1182
       1182
       +
        

     

       1183
       1183
       +
       @@ -474,7 +609,7 @@ static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       1184
       1184
       +
        

     

       1185
       1185
       +
        	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {

     

       1186
       1186
       +
        		map = nla_data(attr);

     

       1187
       1187
       +
       -		rv = ipip_fan_set_map(t, map);

     

       1188
       1188
       +
       +		rv = ipip_fan_add_map(t, map);

     

       1189
       1189
       +
        		if (rv)

     

       1190
       1190
       +
        			return rv;

     

       1191
       1191
       +
        	}

     

       1192
       1192
       +
       @@ -555,7 +690,7 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       1193
       1193
       +
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       1194
       1194
       +
        		nla_total_size(2) +

     

       1195
       1195
       +
        		/* IFLA_IPTUN_FAN_MAP */

     

       1196
       1196
       +
       -		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +

     

       1197
       1197
       +
       +		nla_total_size(sizeof(struct ifla_fan_map)) * 256 +

     

       1198
       1198
       +
        		0;

     

       1199
       1199
       +
        }

     

       1200
       1200
       +
        

     

       1201
       1201
       +
       @@ -583,25 +718,22 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       1202
       1202
       +
        			tunnel->encap.flags))

     

       1203
       1203
       +
        		goto nla_put_failure;

     

       1204
       1204
       +
        

     

       1205
       1205
       +
       -	if (tunnel->parms.i_flags & TUNNEL_FAN) {

     

       1206
       1206
       +
       +	if (fan_has_map(&tunnel->fan)) {

     

       1207
       1207
       +
        		struct nlattr *fan_nest;

     

       1208
       1208
       +
       -		int i;

     

       1209
       1209
       +
       +		struct ip_fan_map *fan_map;

     

       1210
       1210
       +
        

     

       1211
       1211
       +
        		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);

     

       1212
       1212
       +
        		if (!fan_nest)

     

       1213
       1213
       +
        			goto nla_put_failure;

     

       1214
       1214
       +
       -		for (i = 0; i < 256; i++) {

     

       1215
       1215
       +
       -			if (tunnel->fan.map[i]) {

     

       1216
       1216
       +
       -				struct ip_tunnel_fan_map map;

     

       1217
       1217
       +
       -

     

       1218
       1218
       +
       -				map.underlay = htonl(tunnel->fan.map[i]);

     

       1219
       1219
       +
       -				map.underlay_prefix = 16;

     

       1220
       1220
       +
       -				map.overlay = htonl(i << 24);

     

       1221
       1221
       +
       -				map.overlay_prefix = 8;

     

       1222
       1222
       +
       -				if (nla_put(skb, IFLA_FAN_MAPPING,

     

       1223
       1223
       +
       -					    sizeof(map), &map))

     

       1224
       1224
       +
       -					goto nla_put_failure;

     

       1225
       1225
       +
       -			}

     

       1226
       1226
       +
       +		list_for_each_entry_rcu(fan_map, &tunnel->fan.fan_maps, list) {

     

       1227
       1227
       +
       +			struct ifla_fan_map map;

     

       1228
       1228
       +
       +

     

       1229
       1229
       +
       +			map.underlay = fan_map->underlay;

     

       1230
       1230
       +
       +			map.underlay_prefix = fan_map->underlay_prefix;

     

       1231
       1231
       +
       +			map.overlay = fan_map->overlay;

     

       1232
       1232
       +
       +			map.overlay_prefix = fan_map->overlay_prefix;

     

       1233
       1233
       +
       +			if (nla_put(skb, IFLA_FAN_MAPPING, sizeof(map), &map))

     

       1234
       1234
       +
       +				goto nla_put_failure;

     

       1235
       1235
       +
        		}

     

       1236
       1236
       +
        		nla_nest_end(skb, fan_nest);

     

       1237
       1237
       +
        	}

     

       1238
       1238
       +
       -- 

     

       1239
       1239
       +
       2.7.4

     

       1240
       1240
       +

-616

pkgs/os-specific/linux/kernel/ubuntu-fan-4.patch

···

       1
       1
       -
       From f3c956096902669c3529cb01d40deb0c759ed94f Mon Sep 17 00:00:00 2001

     

       2
       2
       -
       From: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       3
       3
       -
       Date: Wed, 1 Apr 2015 16:11:09 -0700

     

       4
       4
       -
       Subject: [PATCH] UBUNTU: SAUCE: fan: Proof of concept implementation (v2)

     

       5
       5
       -
       

     

       6
       6
       -
       Modification to ipip tunnel driver to accept a new netlink option,

     

       7
       7
       -
       IFLA_IPTUN_FAN_UNDERLAY, which provides a /16 network prefix and enables

     

       8
       8
       -
       TX side destination address remapping for traffic entering the tunnel

     

       9
       9
       -
       (to be encapsulated).

     

       10
       10
       -
       

     

       11
       11
       -
       For an overlay (inner) address Y.A.B.C, the transformation is F.G.A.B,

     

       12
       12
       -
       where "F" and "G" are the first two octets of the underlay network (the

     

       13
       13
       -
       network portion of a /16), "A" and "B" are the low order two octets of the

     

       14
       14
       -
       underlay network host (the host portion of a /16), and "Y" is a configured

     

       15
       15
       -
       first octet of the overlay network.

     

       16
       16
       -
       

     

       17
       17
       -
       E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       18
       18
       -
       subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to 99.6.7.8

     

       19
       19
       -
       would be directed to underlay host 10.88.6.7, which hosts overlay network

     

       20
       20
       -
       99.6.7.0/24.

     

       21
       21
       -
       

     

       22
       22
       -
       Includes net.fan.version sysctl as a sentinel for availability of the

     

       23
       23
       -
       fan functionality.

     

       24
       24
       -
       

     

       25
       25
       -
       NOTE: this requires an updated iproute2 to facilitate configuration of

     

       26
       26
       -
       the fan.

     

       27
       27
       -
       

     

       28
       28
       -
       BugLink: http://bugs.launchpad.net/bugs/1439706

     

       29
       29
       -
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       30
       30
       -
       [apw@canonical.com: move IFLA_IPTUN_FAN_UNDERLAY up to avoid clashing

     

       31
       31
       -
        with future feature additions.]

     

       32
       32
       -
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       33
       33
       -
       ---

     

       34
       34
       -
        include/net/ip_tunnels.h       |   6 +++

     

       35
       35
       -
        include/uapi/linux/if_tunnel.h |   4 ++

     

       36
       36
       -
        net/ipv4/ipip.c                | 112 +++++++++++++++++++++++++++++++++++++++--

     

       37
       37
       -
        3 files changed, 117 insertions(+), 5 deletions(-)

     

       38
       38
       -
       

     

       39
       39
       -
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       40
       40
       -
       index 25a59eb..d7eada2 100644

     

       41
       41
       -
       --- a/include/net/ip_tunnels.h

     

       42
       42
       -
       +++ b/include/net/ip_tunnels.h

     

       43
       43
       -
       @@ -51,6 +51,11 @@ struct ip_tunnel_dst {

     

       44
       44
       -
        	__be32				 saddr;

     

       45
       45
       -
        };

     

       46
       46
       -
        

     

       47
       47
       -
       +/* Underlay address prefix for ipip fan mode */

     

       48
       48
       -
       +struct ip_tunnel_fan {

     

       49
       49
       -
       +	u32			underlay;

     

       50
       50
       -
       +};

     

       51
       51
       -
       +

     

       52
       52
       -
        struct ip_tunnel {

     

       53
       53
       -
        	struct ip_tunnel __rcu	*next;

     

       54
       54
       -
        	struct hlist_node hash_node;

     

       55
       55
       -
       @@ -82,6 +87,7 @@ struct ip_tunnel {

     

       56
       56
       -
        #endif

     

       57
       57
       -
        	struct ip_tunnel_prl_entry __rcu *prl;	/* potential router list */

     

       58
       58
       -
        	unsigned int		prl_count;	/* # of entries in PRL */

     

       59
       59
       -
       +	struct ip_tunnel_fan	fan;

     

       60
       60
       -
        	int			ip_tnl_net_id;

     

       61
       61
       -
        	struct gro_cells	gro_cells;

     

       62
       62
       -
        };

     

       63
       63
       -
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       64
       64
       -
       index bd3cc11..8f7d269 100644

     

       65
       65
       -
       --- a/include/uapi/linux/if_tunnel.h

     

       66
       66
       -
       +++ b/include/uapi/linux/if_tunnel.h

     

       67
       67
       -
       @@ -57,6 +57,10 @@ enum {

     

       68
       68
       -
        	IFLA_IPTUN_ENCAP_FLAGS,

     

       69
       69
       -
        	IFLA_IPTUN_ENCAP_SPORT,

     

       70
       70
       -
        	IFLA_IPTUN_ENCAP_DPORT,

     

       71
       71
       -
       +

     

       72
       72
       -
       +	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */

     

       73
       73
       -
       +	IFLA_IPTUN_FAN_UNDERLAY=32,

     

       74
       74
       -
       +

     

       75
       75
       -
        	__IFLA_IPTUN_MAX,

     

       76
       76
       -
        };

     

       77
       77
       -
        #define IFLA_IPTUN_MAX	(__IFLA_IPTUN_MAX - 1)

     

       78
       78
       -
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       79
       79
       -
       index 40403114..e3c27cd 100644

     

       80
       80
       -
       --- a/net/ipv4/ipip.c

     

       81
       81
       -
       +++ b/net/ipv4/ipip.c

     

       82
       82
       -
       @@ -209,13 +209,38 @@ drop:

     

       83
       83
       -
        }

     

       84
       84
       -
        

     

       85
       85
       -
        /*

     

       86
       86
       -
       + * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       87
       87
       -
       + * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       88
       88
       -
       + * F.G.A.B, where "F" and "G" are the first two octets of the underlay

     

       89
       89
       -
       + * network (the network portion of a /16), "A" and "B" are the low order

     

       90
       90
       -
       + * two octets of the underlay network host (the host portion of a /16),

     

       91
       91
       -
       + * and "Y" is a configured first octet of the overlay network.

     

       92
       92
       -
       + *

     

       93
       93
       -
       + * E.g., underlay host 10.88.3.4 with an overlay of 99 would host overlay

     

       94
       94
       -
       + * subnet 99.3.4.0/24.  An overlay network datagram from 99.3.4.5 to

     

       95
       95
       -
       + * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       96
       96
       -
       + * overlay network 99.6.7.0/24.

     

       97
       97
       -
       + */

     

       98
       98
       -
       +static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       99
       99
       -
       +{

     

       100
       100
       -
       +	u32 daddr;

     

       101
       101
       -
       +

     

       102
       102
       -
       +	*iph = tunnel->parms.iph;

     

       103
       103
       -
       +

     

       104
       104
       -
       +	daddr = ntohl(ip_hdr(skb)->daddr);

     

       105
       105
       -
       +	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |

     

       106
       106
       -
       +			   ((daddr >> 8) & 0x0000ffff));

     

       107
       107
       -
       +}

     

       108
       108
       -
       +

     

       109
       109
       -
       +/*

     

       110
       110
       -
         *	This function assumes it is being called from dev_queue_xmit()

     

       111
       111
       -
         *	and that skb is filled properly by that function.

     

       112
       112
       -
         */

     

       113
       113
       -
        static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       114
       114
       -
        {

     

       115
       115
       -
        	struct ip_tunnel *tunnel = netdev_priv(dev);

     

       116
       116
       -
       -	const struct iphdr  *tiph = &tunnel->parms.iph;

     

       117
       117
       -
       +	const struct iphdr *tiph;

     

       118
       118
       -
       +	struct iphdr fiph;

     

       119
       119
       -
        

     

       120
       120
       -
        	if (unlikely(skb->protocol != htons(ETH_P_IP)))

     

       121
       121
       -
        		goto tx_error;

     

       122
       122
       -
       @@ -224,6 +249,13 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       123
       123
       -
        	if (IS_ERR(skb))

     

       124
       124
       -
        		goto out;

     

       125
       125
       -
        

     

       126
       126
       -
       +	if (tunnel->fan.underlay) {

     

       127
       127
       -
       +		ipip_build_fan_iphdr(tunnel, skb, &fiph);

     

       128
       128
       -
       +		tiph = &fiph;

     

       129
       129
       -
       +	} else {

     

       130
       130
       -
       +		tiph = &tunnel->parms.iph;

     

       131
       131
       -
       +	}

     

       132
       132
       -
       +

     

       133
       133
       -
        	skb_set_inner_ipproto(skb, IPPROTO_IPIP);

     

       134
       134
       -
        

     

       135
       135
       -
        	ip_tunnel_xmit(skb, dev, tiph, tiph->protocol);

     

       136
       136
       -
       @@ -377,21 +409,44 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       137
       137
       -
        	return ret;

     

       138
       138
       -
        }

     

       139
       139
       -
        

     

       140
       140
       -
       +static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       141
       141
       -
       +			    struct ip_tunnel_parm *parms)

     

       142
       142
       -
       +{

     

       143
       143
       -
       +	u32 net = t->fan.underlay;

     

       144
       144
       -
       +

     

       145
       145
       -
       +	if (!data[IFLA_IPTUN_FAN_UNDERLAY])

     

       146
       146
       -
       +		goto err_check;

     

       147
       147
       -
       +

     

       148
       148
       -
       +	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;

     

       149
       149
       -
       +

     

       150
       150
       -
       +err_check:

     

       151
       151
       -
       +	if (parms->iph.daddr && net)

     

       152
       152
       -
       +		return -EINVAL;

     

       153
       153
       -
       +

     

       154
       154
       -
       +	t->fan.underlay = net;

     

       155
       155
       -
       +

     

       156
       156
       -
       +	return 0;

     

       157
       157
       -
       +}

     

       158
       158
       -
       +

     

       159
       159
       -
        static int ipip_newlink(struct net *src_net, struct net_device *dev,

     

       160
       160
       -
        			struct nlattr *tb[], struct nlattr *data[])

     

       161
       161
       -
        {

     

       162
       162
       -
        	struct ip_tunnel_parm p;

     

       163
       163
       -
        	struct ip_tunnel_encap ipencap;

     

       164
       164
       -
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       165
       165
       -
       +	int err;

     

       166
       166
       -
        

     

       167
       167
       -
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       168
       168
       -
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       169
       169
       -
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       170
       170
       -
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       171
       171
       -
        

     

       172
       172
       -
        		if (err < 0)

     

       173
       173
       -
        			return err;

     

       174
       174
       -
        	}

     

       175
       175
       -
        

     

       176
       176
       -
        	ipip_netlink_parms(data, &p);

     

       177
       177
       -
       +	err = ipip_netlink_fan(data, t, &p);

     

       178
       178
       -
       +	if (err < 0)

     

       179
       179
       -
       +		return err;

     

       180
       180
       -
        	return ip_tunnel_newlink(dev, tb, &p);

     

       181
       181
       -
        }

     

       182
       182
       -
        

     

       183
       183
       -
       @@ -400,16 +455,20 @@ static int ipip_changelink(struct net_device *dev, struct nlattr *tb[],

     

       184
       184
       -
        {

     

       185
       185
       -
        	struct ip_tunnel_parm p;

     

       186
       186
       -
        	struct ip_tunnel_encap ipencap;

     

       187
       187
       -
       +	struct ip_tunnel *t = netdev_priv(dev);

     

       188
       188
       -
       +	int err;

     

       189
       189
       -
        

     

       190
       190
       -
        	if (ipip_netlink_encap_parms(data, &ipencap)) {

     

       191
       191
       -
       -		struct ip_tunnel *t = netdev_priv(dev);

     

       192
       192
       -
       -		int err = ip_tunnel_encap_setup(t, &ipencap);

     

       193
       193
       -
       +		err = ip_tunnel_encap_setup(t, &ipencap);

     

       194
       194
       -
        

     

       195
       195
       -
        		if (err < 0)

     

       196
       196
       -
        			return err;

     

       197
       197
       -
        	}

     

       198
       198
       -
        

     

       199
       199
       -
        	ipip_netlink_parms(data, &p);

     

       200
       200
       -
       +	err = ipip_netlink_fan(data, t, &p);

     

       201
       201
       -
       +	if (err < 0)

     

       202
       202
       -
       +		return err;

     

       203
       203
       -
        

     

       204
       204
       -
        	if (((dev->flags & IFF_POINTOPOINT) && !p.iph.daddr) ||

     

       205
       205
       -
        	    (!(dev->flags & IFF_POINTOPOINT) && p.iph.daddr))

     

       206
       206
       -
       @@ -441,6 +500,8 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       207
       207
       -
        		nla_total_size(2) +

     

       208
       208
       -
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       209
       209
       -
        		nla_total_size(2) +

     

       210
       210
       -
       +		/* IFLA_IPTUN_FAN_UNDERLAY */

     

       211
       211
       -
       +		nla_total_size(4) +

     

       212
       212
       -
        		0;

     

       213
       213
       -
        }

     

       214
       214
       -
        

     

       215
       215
       -
       @@ -468,6 +529,11 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       216
       216
       -
        			tunnel->encap.flags))

     

       217
       217
       -
        		goto nla_put_failure;

     

       218
       218
       -
        

     

       219
       219
       -
       +	if (tunnel->fan.underlay)

     

       220
       220
       -
       +		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,

     

       221
       221
       -
       +				 htonl(tunnel->fan.underlay)))

     

       222
       222
       -
       +			goto nla_put_failure;

     

       223
       223
       -
       +

     

       224
       224
       -
        	return 0;

     

       225
       225
       -
        

     

       226
       226
       -
        nla_put_failure:

     

       227
       227
       -
       @@ -485,6 +551,9 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {

     

       228
       228
       -
        	[IFLA_IPTUN_ENCAP_FLAGS]	= { .type = NLA_U16 },

     

       229
       229
       -
        	[IFLA_IPTUN_ENCAP_SPORT]	= { .type = NLA_U16 },

     

       230
       230
       -
        	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },

     

       231
       231
       -
       +

     

       232
       232
       -
       +	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },

     

       233
       233
       -
       +	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },

     

       234
       234
       -
        };

     

       235
       235
       -
        

     

       236
       236
       -
        static struct rtnl_link_ops ipip_link_ops __read_mostly = {

     

       237
       237
       -
       @@ -524,6 +593,23 @@ static struct pernet_operations ipip_net_ops = {

     

       238
       238
       -
        	.size = sizeof(struct ip_tunnel_net),

     

       239
       239
       -
        };

     

       240
       240
       -
        

     

       241
       241
       -
       +#ifdef CONFIG_SYSCTL

     

       242
       242
       -
       +static struct ctl_table_header *ipip_fan_header;

     

       243
       243
       -
       +static unsigned int ipip_fan_version = 1;

     

       244
       244
       -
       +

     

       245
       245
       -
       +static struct ctl_table ipip_fan_sysctls[] = {

     

       246
       246
       -
       +	{

     

       247
       247
       -
       +		.procname	= "version",

     

       248
       248
       -
       +		.data		= &ipip_fan_version,

     

       249
       249
       -
       +		.maxlen		= sizeof(ipip_fan_version),

     

       250
       250
       -
       +		.mode		= 0444,

     

       251
       251
       -
       +		.proc_handler	= proc_dointvec,

     

       252
       252
       -
       +	},

     

       253
       253
       -
       +	{},

     

       254
       254
       -
       +};

     

       255
       255
       -
       +

     

       256
       256
       -
       +#endif /* CONFIG_SYSCTL */

     

       257
       257
       -
       +

     

       258
       258
       -
        static int __init ipip_init(void)

     

       259
       259
       -
        {

     

       260
       260
       -
        	int err;

     

       261
       261
       -
       @@ -542,9 +628,22 @@ static int __init ipip_init(void)

     

       262
       262
       -
        	if (err < 0)

     

       263
       263
       -
        		goto rtnl_link_failed;

     

       264
       264
       -
        

     

       265
       265
       -
       +#ifdef CONFIG_SYSCTL

     

       266
       266
       -
       +	ipip_fan_header = register_net_sysctl(&init_net, "net/fan",

     

       267
       267
       -
       +					      ipip_fan_sysctls);

     

       268
       268
       -
       +	if (!ipip_fan_header) {

     

       269
       269
       -
       +		err = -ENOMEM;

     

       270
       270
       -
       +		goto sysctl_failed;

     

       271
       271
       -
       +	}

     

       272
       272
       -
       +#endif /* CONFIG_SYSCTL */

     

       273
       273
       -
       +

     

       274
       274
       -
        out:

     

       275
       275
       -
        	return err;

     

       276
       276
       -
        

     

       277
       277
       -
       +#ifdef CONFIG_SYSCTL

     

       278
       278
       -
       +sysctl_failed:

     

       279
       279
       -
       +	rtnl_link_unregister(&ipip_link_ops);

     

       280
       280
       -
       +#endif /* CONFIG_SYSCTL */

     

       281
       281
       -
        rtnl_link_failed:

     

       282
       282
       -
        	xfrm4_tunnel_deregister(&ipip_handler, AF_INET);

     

       283
       283
       -
        xfrm_tunnel_failed:

     

       284
       284
       -
       @@ -554,6 +653,9 @@ xfrm_tunnel_failed:

     

       285
       285
       -
        

     

       286
       286
       -
        static void __exit ipip_fini(void)

     

       287
       287
       -
        {

     

       288
       288
       -
       +#ifdef CONFIG_SYSCTL

     

       289
       289
       -
       +	unregister_net_sysctl_table(ipip_fan_header);

     

       290
       290
       -
       +#endif /* CONFIG_SYSCTL */

     

       291
       291
       -
        	rtnl_link_unregister(&ipip_link_ops);

     

       292
       292
       -
        	if (xfrm4_tunnel_deregister(&ipip_handler, AF_INET))

     

       293
       293
       -
        		pr_info("%s: can't deregister tunnel\n", __func__);

     

       294
       294
       -
       -- 

     

       295
       295
       -
       2.4.1

     

       296
       296
       -
       

     

       297
       297
       -
       From 4ea8011656dfdd76e7a2391bdad47c06f85a9d02 Mon Sep 17 00:00:00 2001

     

       298
       298
       -
       From: Andy Whitcroft <apw@canonical.com>

     

       299
       299
       -
       Date: Tue, 21 Jul 2015 16:52:10 +0100

     

       300
       300
       -
       Subject: [PATCH] UBUNTU: SAUCE: fan: tunnel multiple mapping mode (v3)

     

       301
       301
       -
       

     

       302
       302
       -
       Switch to a single tunnel for all mappings, this removes the limitations

     

       303
       303
       -
       on how many mappings each tunnel can handle, and therefore how many Fan

     

       304
       304
       -
       slices each local address may hold.

     

       305
       305
       -
       

     

       306
       306
       -
       NOTE: This introduces a new kernel netlink interface which needs updated

     

       307
       307
       -
       iproute2 support.

     

       308
       308
       -
       

     

       309
       309
       -
       BugLink: http://bugs.launchpad.net/bugs/1470091

     

       310
       310
       -
       Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>

     

       311
       311
       -
       Signed-off-by: Andy Whitcroft <apw@canonical.com>

     

       312
       312
       -
       Acked-by: Tim Gardner <tim.gardner@canonical.com>

     

       313
       313
       -
       Acked-by: Brad Figg <brad.figg@canonical.com>

     

       314
       314
       -
       Signed-off-by: Brad Figg <brad.figg@canonical.com>

     

       315
       315
       -
       ---

     

       316
       316
       -
        include/net/ip_tunnels.h       |  14 ++++-

     

       317
       317
       -
        include/uapi/linux/if_tunnel.h |  20 ++++++-

     

       318
       318
       -
        net/ipv4/ip_tunnel.c           |   7 ++-

     

       319
       319
       -
        net/ipv4/ipip.c                | 120 +++++++++++++++++++++++++++++++++--------

     

       320
       320
       -
        4 files changed, 133 insertions(+), 28 deletions(-)

     

       321
       321
       -
       

     

       322
       322
       -
       diff --git a/include/net/ip_tunnels.h b/include/net/ip_tunnels.h

     

       323
       323
       -
       index d7eada2..2f7bc8c 100644

     

       324
       324
       -
       --- a/include/net/ip_tunnels.h

     

       325
       325
       -
       +++ b/include/net/ip_tunnels.h

     

       326
       326
       -
       @@ -51,9 +51,18 @@ struct ip_tunnel_dst {

     

       327
       327
       -
        	__be32				 saddr;

     

       328
       328
       -
        };

     

       329
       329
       -
        

     

       330
       330
       -
       -/* Underlay address prefix for ipip fan mode */

     

       331
       331
       -
       +/* A fan overlay /8 (250.0.0.0/8, for example) maps to exactly one /16

     

       332
       332
       -
       + * underlay (10.88.0.0/16, for example).  Multiple local addresses within

     

       333
       333
       -
       + * the /16 may be used, but a particular overlay may not span

     

       334
       334
       -
       + * multiple underlay subnets.

     

       335
       335
       -
       + *

     

       336
       336
       -
       + * We store one underlay, indexed by the overlay's high order octet.

     

       337
       337
       -
       + */

     

       338
       338
       -
       +#define FAN_OVERLAY_CNT		256

     

       339
       339
       -
       +

     

       340
       340
       -
        struct ip_tunnel_fan {

     

       341
       341
       -
       -	u32			underlay;

     

       342
       342
       -
       +/*	u32 __rcu	*map;*/

     

       343
       343
       -
       +	u32		map[FAN_OVERLAY_CNT];

     

       344
       344
       -
        };

     

       345
       345
       -
        

     

       346
       346
       -
        struct ip_tunnel {

     

       347
       347
       -
       @@ -104,6 +113,7 @@ struct ip_tunnel {

     

       348
       348
       -
        #define TUNNEL_OAM		__cpu_to_be16(0x0200)

     

       349
       349
       -
        #define TUNNEL_CRIT_OPT		__cpu_to_be16(0x0400)

     

       350
       350
       -
        #define TUNNEL_GENEVE_OPT	__cpu_to_be16(0x0800)

     

       351
       351
       -
        #define TUNNEL_VXLAN_OPT	__cpu_to_be16(0x1000)

     

       352
       352
       -
       +#define TUNNEL_FAN		__cpu_to_be16(0x4000)

     

       353
       353
       -
        

     

       354
       354
       -
        #define TUNNEL_OPTIONS_PRESENT	(TUNNEL_GENEVE_OPT | TUNNEL_VXLAN_OPT)

     

       355
       355
       -
       diff --git a/include/uapi/linux/if_tunnel.h b/include/uapi/linux/if_tunnel.h

     

       356
       356
       -
       index 8f7d269..9625934 100644

     

       357
       357
       -
       --- a/include/uapi/linux/if_tunnel.h

     

       358
       358
       -
       +++ b/include/uapi/linux/if_tunnel.h

     

       359
       359
       -
       @@ -58,8 +58,8 @@ enum {

     

       360
       360
       -
        	IFLA_IPTUN_ENCAP_SPORT,

     

       361
       361
       -
        	IFLA_IPTUN_ENCAP_DPORT,

     

       362
       362
       -
        

     

       363
       363
       -
       -	__IFLA_IPTUN_VENDOR_BREAK,		/* Ensure new entries do not hit the below. */

     

       364
       364
       -
       -	IFLA_IPTUN_FAN_UNDERLAY=32,

     

       365
       365
       -
       +	__IFLA_IPTUN_VENDOR_BREAK, /* Ensure new entries do not hit the below. */

     

       366
       366
       -
       +	IFLA_IPTUN_FAN_MAP = 33,

     

       367
       367
       -
        

     

       368
       368
       -
        	__IFLA_IPTUN_MAX,

     

       369
       369
       -
        };

     

       370
       370
       -
       @@ -135,4 +135,20 @@ enum {

     

       371
       371
       -
        };

     

       372
       372
       -
        

     

       373
       373
       -
        #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)

     

       374
       374
       -
       +

     

       375
       375
       -
       +enum {

     

       376
       376
       -
       +	IFLA_FAN_UNSPEC,

     

       377
       377
       -
       +	IFLA_FAN_MAPPING,

     

       378
       378
       -
       +	__IFLA_FAN_MAX,

     

       379
       379
       -
       +};

     

       380
       380
       -
       +

     

       381
       381
       -
       +#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)

     

       382
       382
       -
       +

     

       383
       383
       -
       +struct ip_tunnel_fan_map {

     

       384
       384
       -
       +	__be32		underlay;

     

       385
       385
       -
       +	__be32		overlay;

     

       386
       386
       -
       +	__u16		underlay_prefix;

     

       387
       387
       -
       +	__u16		overlay_prefix;

     

       388
       388
       -
       +};

     

       389
       389
       -
       +

     

       390
       390
       -
        #endif /* _UAPI_IF_TUNNEL_H_ */

     

       391
       391
       -
       diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c

     

       392
       392
       -
       index d3e4479..60bd10f 100644

     

       393
       393
       -
       --- a/net/ipv4/ip_tunnel.c

     

       394
       394
       -
       +++ b/net/ipv4/ip_tunnel.c

     

       395
       395
       -
       @@ -1078,6 +1078,11 @@ out:

     

       396
       396
       -
        }

     

       397
       397
       -
        EXPORT_SYMBOL_GPL(ip_tunnel_newlink);

     

       398
       398
       -
        

     

       399
       399
       -
       +static int ip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       400
       400
       -
       +{

     

       401
       401
       -
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       402
       402
       -
       +}

     

       403
       403
       -
       +

     

       404
       404
       -
        int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       405
       405
       -
        			 struct ip_tunnel_parm *p)

     

       406
       406
       -
        {

     

       407
       407
       -
       @@ -1087,7 +1092,7 @@ int ip_tunnel_changelink(struct net_device *dev, struct nlattr *tb[],

     

       408
       408
       -
        	struct ip_tunnel_net *itn = net_generic(net, tunnel->ip_tnl_net_id);

     

       409
       409
       -
        

     

       410
       410
       -
        	if (dev == itn->fb_tunnel_dev)

     

       411
       411
       -
       -		return -EINVAL;

     

       412
       412
       -
       +		return ip_tunnel_is_fan(tunnel) ? 0 : -EINVAL;

     

       413
       413
       -
        

     

       414
       414
       -
        	t = ip_tunnel_find(itn, p, dev->type);

     

       415
       415
       -
        

     

       416
       416
       -
       diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c

     

       417
       417
       -
       index e3c27cd..d6ebc66 100644

     

       418
       418
       -
       --- a/net/ipv4/ipip.c

     

       419
       419
       -
       +++ b/net/ipv4/ipip.c

     

       420
       420
       -
       @@ -107,6 +107,7 @@

     

       421
       421
       -
        #include <linux/init.h>

     

       422
       422
       -
        #include <linux/netfilter_ipv4.h>

     

       423
       423
       -
        #include <linux/if_ether.h>

     

       424
       424
       -
       +#include <linux/inetdevice.h>

     

       425
       425
       -
        

     

       426
       426
       -
        #include <net/sock.h>

     

       427
       427
       -
        #include <net/ip.h>

     

       428
       428
       -
       @@ -208,6 +209,11 @@ drop:

     

       429
       429
       -
        	return 0;

     

       430
       430
       -
        }

     

       431
       431
       -
        

     

       432
       432
       -
       +static int ipip_tunnel_is_fan(struct ip_tunnel *tunnel)

     

       433
       433
       -
       +{

     

       434
       434
       -
       +	return tunnel->parms.i_flags & TUNNEL_FAN;

     

       435
       435
       -
       +}

     

       436
       436
       -
       +

     

       437
       437
       -
        /*

     

       438
       438
       -
         * Determine fan tunnel endpoint to send packet to, based on the inner IP

     

       439
       439
       -
         * address.  For an overlay (inner) address Y.A.B.C, the transformation is

     

       440
       440
       -
       @@ -221,15 +227,20 @@ drop:

     

       441
       441
       -
         * 99.6.7.8, would be directed to underlay host 10.88.6.7, which hosts

     

       442
       442
       -
         * overlay network 99.6.7.0/24.

     

       443
       443
       -
         */

     

       444
       444
       -
       -static void ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       445
       445
       -
       +static int ipip_build_fan_iphdr(struct ip_tunnel *tunnel, struct sk_buff *skb, struct iphdr *iph)

     

       446
       446
       -
        {

     

       447
       447
       -
       -	u32 daddr;

     

       448
       448
       -
       -

     

       449
       449
       -
       -	*iph = tunnel->parms.iph;

     

       450
       450
       -
       +	unsigned int overlay;

     

       451
       451
       -
       +	u32 daddr, underlay;

     

       452
       452
       -
        

     

       453
       453
       -
        	daddr = ntohl(ip_hdr(skb)->daddr);

     

       454
       454
       -
       -	iph->daddr = htonl((tunnel->fan.underlay & 0xffff0000) |

     

       455
       455
       -
       -			   ((daddr >> 8) & 0x0000ffff));

     

       456
       456
       -
       +	overlay = daddr >> 24;

     

       457
       457
       -
       +	underlay = tunnel->fan.map[overlay];

     

       458
       458
       -
       +	if (!underlay)

     

       459
       459
       -
       +		return -EINVAL;

     

       460
       460
       -
       +

     

       461
       461
       -
       +	*iph = tunnel->parms.iph;

     

       462
       462
       -
       +	iph->daddr = htonl(underlay | ((daddr >> 8) & 0x0000ffff));

     

       463
       463
       -
       +	return 0;

     

       464
       464
       -
        }

     

       465
       465
       -
        

     

       466
       466
       -
        /*

     

       467
       467
       -
       @@ -249,8 +260,9 @@ static netdev_tx_t ipip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)

     

       468
       468
       -
        	if (IS_ERR(skb))

     

       469
       469
       -
        		goto out;

     

       470
       470
       -
        

     

       471
       471
       -
       -	if (tunnel->fan.underlay) {

     

       472
       472
       -
       -		ipip_build_fan_iphdr(tunnel, skb, &fiph);

     

       473
       473
       -
       +	if (ipip_tunnel_is_fan(tunnel)) {

     

       474
       474
       -
       +		if (ipip_build_fan_iphdr(tunnel, skb, &fiph))

     

       475
       475
       -
       +			goto tx_error;

     

       476
       476
       -
        		tiph = &fiph;

     

       477
       477
       -
        	} else {

     

       478
       478
       -
        		tiph = &tunnel->parms.iph;

     

       479
       479
       -
       @@ -409,21 +421,65 @@ static bool ipip_netlink_encap_parms(struct nlattr *data[],

     

       480
       480
       -
        	return ret;

     

       481
       481
       -
        }

     

       482
       482
       -
        

     

       483
       483
       -
       +static void ipip_fan_free_map(struct ip_tunnel *t)

     

       484
       484
       -
       +{

     

       485
       485
       -
       +	memset(&t->fan.map, 0, sizeof(t->fan.map));

     

       486
       486
       -
       +}

     

       487
       487
       -
       +

     

       488
       488
       -
       +static int ipip_fan_set_map(struct ip_tunnel *t, struct ip_tunnel_fan_map *map)

     

       489
       489
       -
       +{

     

       490
       490
       -
       +	u32 overlay, overlay_mask, underlay, underlay_mask;

     

       491
       491
       -
       +

     

       492
       492
       -
       +	if ((map->underlay_prefix && map->underlay_prefix != 16) ||

     

       493
       493
       -
       +	    (map->overlay_prefix && map->overlay_prefix != 8))

     

       494
       494
       -
       +		return -EINVAL;

     

       495
       495
       -
       +

     

       496
       496
       -
       +	overlay = ntohl(map->overlay);

     

       497
       497
       -
       +	overlay_mask = ntohl(inet_make_mask(map->overlay_prefix));

     

       498
       498
       -
       +

     

       499
       499
       -
       +	underlay = ntohl(map->underlay);

     

       500
       500
       -
       +	underlay_mask = ntohl(inet_make_mask(map->underlay_prefix));

     

       501
       501
       -
       +

     

       502
       502
       -
       +	if ((overlay & ~overlay_mask) || (underlay & ~underlay_mask))

     

       503
       503
       -
       +		return -EINVAL;

     

       504
       504
       -
       +

     

       505
       505
       -
       +	if (!(overlay & overlay_mask) && (underlay & underlay_mask))

     

       506
       506
       -
       +		return -EINVAL;

     

       507
       507
       -
       +

     

       508
       508
       -
       +	t->parms.i_flags |= TUNNEL_FAN;

     

       509
       509
       -
       +

     

       510
       510
       -
       +	/* Special case: overlay 0 and underlay 0 clears all mappings */

     

       511
       511
       -
       +	if (!overlay && !underlay) {

     

       512
       512
       -
       +		ipip_fan_free_map(t);

     

       513
       513
       -
       +		return 0;

     

       514
       514
       -
       +	}

     

       515
       515
       -
       +

     

       516
       516
       -
       +	overlay >>= (32 - map->overlay_prefix);

     

       517
       517
       -
       +	t->fan.map[overlay] = underlay;

     

       518
       518
       -
       +

     

       519
       519
       -
       +	return 0;

     

       520
       520
       -
       +}

     

       521
       521
       -
       +	

     

       522
       522
       -
       +

     

       523
       523
       -
        static int ipip_netlink_fan(struct nlattr *data[], struct ip_tunnel *t,

     

       524
       524
       -
        			    struct ip_tunnel_parm *parms)

     

       525
       525
       -
        {

     

       526
       526
       -
       -	u32 net = t->fan.underlay;

     

       527
       527
       -
       -

     

       528
       528
       -
       -	if (!data[IFLA_IPTUN_FAN_UNDERLAY])

     

       529
       529
       -
       -		goto err_check;

     

       530
       530
       -
       +	struct ip_tunnel_fan_map *map;

     

       531
       531
       -
       +	struct nlattr *attr;

     

       532
       532
       -
       +	int rem, rv;

     

       533
       533
       -
        

     

       534
       534
       -
       -	net = ntohl(nla_get_be32(data[IFLA_IPTUN_FAN_UNDERLAY])) & 0xffff0000;

     

       535
       535
       -
       +	if (!data[IFLA_IPTUN_FAN_MAP])

     

       536
       536
       -
       +		return 0;

     

       537
       537
       -
        

     

       538
       538
       -
       -err_check:

     

       539
       539
       -
       -	if (parms->iph.daddr && net)

     

       540
       540
       -
       +	if (parms->iph.daddr)

     

       541
       541
       -
        		return -EINVAL;

     

       542
       542
       -
        

     

       543
       543
       -
       -	t->fan.underlay = net;

     

       544
       544
       -
       +	nla_for_each_nested(attr, data[IFLA_IPTUN_FAN_MAP], rem) {

     

       545
       545
       -
       +		map = nla_data(attr);

     

       546
       546
       -
       +		rv = ipip_fan_set_map(t, map);

     

       547
       547
       -
       +		if (rv)

     

       548
       548
       -
       +			return rv;

     

       549
       549
       -
       +	}

     

       550
       550
       -
        

     

       551
       551
       -
        	return 0;

     

       552
       552
       -
        }

     

       553
       553
       -
       @@ -500,8 +556,8 @@ static size_t ipip_get_size(const struct net_device *dev)

     

       554
       554
       -
        		nla_total_size(2) +

     

       555
       555
       -
        		/* IFLA_IPTUN_ENCAP_DPORT */

     

       556
       556
       -
        		nla_total_size(2) +

     

       557
       557
       -
       -		/* IFLA_IPTUN_FAN_UNDERLAY */

     

       558
       558
       -
       -		nla_total_size(4) +

     

       559
       559
       -
       +		/* IFLA_IPTUN_FAN_MAP */

     

       560
       560
       -
       +		nla_total_size(sizeof(struct ip_tunnel_fan_map)) * 256 +

     

       561
       561
       -
        		0;

     

       562
       562
       -
        }

     

       563
       563
       -
        

     

       564
       564
       -
       @@ -529,10 +585,28 @@ static int ipip_fill_info(struct sk_buff *skb, const struct net_device *dev)

     

       565
       565
       -
        			tunnel->encap.flags))

     

       566
       566
       -
        		goto nla_put_failure;

     

       567
       567
       -
        

     

       568
       568
       -
       -	if (tunnel->fan.underlay)

     

       569
       569
       -
       -		if (nla_put_be32(skb, IFLA_IPTUN_FAN_UNDERLAY,

     

       570
       570
       -
       -				 htonl(tunnel->fan.underlay)))

     

       571
       571
       -
       +	if (tunnel->parms.i_flags & TUNNEL_FAN) {

     

       572
       572
       -
       +		struct nlattr *fan_nest;

     

       573
       573
       -
       +		int i;

     

       574
       574
       -
       +

     

       575
       575
       -
       +		fan_nest = nla_nest_start(skb, IFLA_IPTUN_FAN_MAP);

     

       576
       576
       -
       +		if (!fan_nest)

     

       577
       577
       -
        			goto nla_put_failure;

     

       578
       578
       -
       +		for (i = 0; i < 256; i++) {

     

       579
       579
       -
       +			if (tunnel->fan.map[i]) {

     

       580
       580
       -
       +				struct ip_tunnel_fan_map map;

     

       581
       581
       -
       +

     

       582
       582
       -
       +				map.underlay = htonl(tunnel->fan.map[i]);

     

       583
       583
       -
       +				map.underlay_prefix = 16;

     

       584
       584
       -
       +				map.overlay = htonl(i << 24);

     

       585
       585
       -
       +				map.overlay_prefix = 8;

     

       586
       586
       -
       +				if (nla_put(skb, IFLA_FAN_MAPPING,

     

       587
       587
       -
       +					    sizeof(map), &map))

     

       588
       588
       -
       +					goto nla_put_failure;

     

       589
       589
       -
       +			}

     

       590
       590
       -
       +		}

     

       591
       591
       -
       +		nla_nest_end(skb, fan_nest);

     

       592
       592
       -
       +	}

     

       593
       593
       -
        

     

       594
       594
       -
        	return 0;

     

       595
       595
       -
        

     

       596
       596
       -
       @@ -553,7 +627,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {

     

       597
       597
       -
        	[IFLA_IPTUN_ENCAP_DPORT]	= { .type = NLA_U16 },

     

       598
       598
       -
        

     

       599
       599
       -
        	[__IFLA_IPTUN_VENDOR_BREAK ... IFLA_IPTUN_MAX]	= { .type = NLA_BINARY },

     

       600
       600
       -
       -	[IFLA_IPTUN_FAN_UNDERLAY]	= { .type = NLA_U32 },

     

       601
       601
       -
       +	[IFLA_IPTUN_FAN_MAP]		= { .type = NLA_NESTED },

     

       602
       602
       -
        };

     

       603
       603
       -
        

     

       604
       604
       -
        static struct rtnl_link_ops ipip_link_ops __read_mostly = {

     

       605
       605
       -
       @@ -595,7 +669,7 @@ static struct pernet_operations ipip_net_ops = {

     

       606
       606
       -
        

     

       607
       607
       -
        #ifdef CONFIG_SYSCTL

     

       608
       608
       -
        static struct ctl_table_header *ipip_fan_header;

     

       609
       609
       -
       -static unsigned int ipip_fan_version = 1;

     

       610
       610
       -
       +static unsigned int ipip_fan_version = 3;

     

       611
       611
       -
        

     

       612
       612
       -
        static struct ctl_table ipip_fan_sysctls[] = {

     

       613
       613
       -
        	{

     

       614
       614
       -
       -- 

     

       615
       615
       -
       2.4.1

     

       616
       616
       -