Commits · 7d1f88eca0ae7228bdbd971f060603b3a1270693 · Kirill Smelkov / linux

24 Sep, 2015 40 commits

ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup) · 7d1f88ec

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

7d1f88ec

ipvs: Remove net argument from ip_vs_tcp_conn_listen · 69f39093

Eric W. Biederman authored Sep 21, 2015

The argument is unnecessary and in practice confusing,
and has caused the callers to do all manner of silly things.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

69f39093

ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_reroute · a43d1a6b

Eric W. Biederman authored Sep 21, 2015

This removes the need to use the hack skb_net.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

a43d1a6b

ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6 · 7b5f689a

Eric W. Biederman authored Sep 21, 2015

This removes the need to compute ipvs with the hack "net_ipvs(skb_net(skb))"
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

7b5f689a

ipvs: Pass ipvs into ip_vs_in_icmp and ip_vs_in_icmp_v6 · 6f2bcea9

Eric W. Biederman authored Sep 21, 2015

With ipvs passed into ip_vs_in_icmp and ip_vs_in_icmp_v6
they no longer need to call the hack that is skb_net.

Additionally ipvs_in_icmp no longer needs to call dev_net(skb->dev)
and can use the ipvs->net instead.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

6f2bcea9

ipvs: Pass ipvs into ip_vs_in · 6e385bb3

Eric W. Biederman authored Sep 21, 2015

Derive ipvs from state->net in the callers of ip_vs_in and pass it
into ip_vs_out.  Removing the need to use the hack skb_net.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

6e385bb3

ipvs: Pass ipvs into ip_vs_out · 1b75097d

Eric W. Biederman authored Sep 21, 2015

Derive ipvs from state->net in the callers of ip_vs_out and pass it
into ip_vs_out.  Removing the need to use the hack skb_net.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

1b75097d

ipvs: Pass ipvs not net into sysctl_nat_icmp_send · 2300f045

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

2300f045

ipvs: Simplify ipvs and net access in ip_vs_leave · 51efbcbb

Eric W. Biederman authored Sep 21, 2015

Stop using the hack skb_net(skb) to compute the network namespace.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

51efbcbb

ipvs: Wrap sysctl_cache_bypass and remove ifdefs in ip_vs_leave · 57032948

Eric W. Biederman authored Sep 21, 2015

With sysctl_cache_bypass now a compile time constant the compiler can
figue out that it can elimiate all of the code that depends on
sysctl_cache_bypass being true.

Also remove the duplicate computation of net previously necessitated
by #ifdef CONFIG_SYSCTL
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

57032948

ipvs: Better derivation of ipvs in ip_vs_in_stats and ip_vs_out_stats · 7c08d78e

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

7c08d78e

ipvs: Pass ipvs into ensure_mtu_is adequate · 20868a40

Eric W. Biederman authored Sep 21, 2015

This allows two different ways for computing/guessing net to be
removed from ensure_mtu_is_adequate.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

20868a40

ipvs: Pass ipvs into __ip_vs_get_out_rt_v6 · f5745f8a

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

f5745f8a

ipvs: Pass ipvs into __ip_vs_get_out_rt · ecfe87b8

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

ecfe87b8

ipvs: Better derivation of ipvs in ip_vs_tunnel_xmit · 361c3f52

Eric W. Biederman authored Sep 21, 2015

Don't use "net_ipvs(skb_net(skb))" as skb_net is a bad hack.  Instead
use cp->ipvs and ipvs->net for the net.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

361c3f52

ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule · d8f44c33

Eric W. Biederman authored Sep 21, 2015

This moves the hack "net_ipvs(skb_net(skb))" up one level where it
will be easier to remove.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

d8f44c33

ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup · 2f3edc6a

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

2f3edc6a

ipvs: Pass ipvs not net into ip_vs_conn_net_flush · d889717a

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

d889717a

ipvs: Pass ipvs not net to ip_vs_conn_hashkey · 754b81a3

Eric W. Biederman authored Sep 21, 2015

Use the address of struct netns_ipvs in the hash not the address of
struct net.  Both addresses are equally valid candidates and by using
the address of struct netns_ipvs there becomes no need deal with
struct net in this part of the code.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

754b81a3

ipvs: Pass ipvs into conn_out_get · 0cf705c8

Eric W. Biederman authored Sep 21, 2015

Move the hack of relying on "net_ipvs(skb_net(skb))" to derive the
ipvs up a layer.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

0cf705c8

ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto · ab161976

Eric W. Biederman authored Sep 21, 2015

Stop relying on "net_ipvs(skb_net(skb))" to derive the ipvs as
skb_net is a hack.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

ab161976

ipvs: Pass ipvs into ip_vs_conn_fill_param_proto · f5099dd4

Eric W. Biederman authored Sep 21, 2015

Move the ugly hack net_ipvs(skb_net(skb)) up a layer in the call stack
so it is easier to remove.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

f5099dd4

ipvs: Pass ipvs not net into init_netns and exit_netns · 1281a9c2

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

1281a9c2

ipvs: Pass ipvs not net into [un]register_ip_vs_proto_netns · c70bd680

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

c70bd680

ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup · b5dd212c

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

b5dd212c

ipvs: Pass ipvs not net into ip_vs_app_inc_release · 09858708

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

09858708

ipvs: Pass ipvs not net to register_ip_vs_app and unregister_ip_vs_app · 9f8128a5

Eric W. Biederman authored Sep 21, 2015

Also move the tests for net_ipvs being NULL into __ip_vs_ftp_init
and __ip_vs_ftp_exit.  The only places where they possibly make
sense.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

9f8128a5

ipvs: Pass ipvs not net to register_ip_vs_app_inc · 3250dc9c

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

3250dc9c

ipvs: Pass ipvs not net into ip_vs_app_inc_new · a080ce38

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

a080ce38

ipvs: Pass ipvs not net into register_app and unregister_app · 19648918

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

19648918

ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup · a4dd0360

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

a4dd0360

ipvs: Pass ipvs not net to estimation_timer · 70a131a2

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

70a131a2

ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup) · 3d993766

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

3d993766

ipvs: Pass ipvs not net to ip_vs_control_net_(init|cleanup)_sysctl · 8b8237a5

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

8b8237a5

ipvs: Pass ipvs not net to ip_vs_random_drop_entry · 423b5595

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

423b5595

ipvs: Pass ipvs not net to ip_vs_start_estimator aned ip_vs_stop_estimator · 0f34d54b

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

0f34d54b

ipvs: Pass ipvs not net to ip_vs_genl_set_config · cacd1e60

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

cacd1e60

ipvs: Pass ipvs not net to ip_vs_sync_net_cleanup · ebea1f7c

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

ebea1f7c

ipvs: Pass ipvs not net to ip_vs_sync_net_init · 802cb437

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

802cb437

ipvs: Pass ipvs not net to ip_vs_proc_sync_conn · 1fc12004

Eric W. Biederman authored Sep 21, 2015

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>

1fc12004