Commits · 1fc12004d2fdb31c1b5db58d51a19bc145f6fcf7 · Kirill Smelkov / linux

24 Sep, 2015 40 commits

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

ipvs: Pass ipvs not net to ip_vs_proc_conn · 4f30665b

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>

4f30665b

ipvs: Pass ipvs not net to ip_vs_sync_conn · b61a8c1a

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>

b61a8c1a

ipvs: Pass ipvs not net to ip_vs_sync_conn_v0 · 72e9481e

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>

72e9481e

ipvs: Pass ipvs not net to ip_vs_process_message · 7d537f3a

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>

7d537f3a

ipvs: Store ipvs not net in struct ip_vs_sync_thread_data · 37b68e6d

Eric W. Biederman authored Sep 21, 2015

In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data.  So store a pointer to
struct netns_ipvs.

Update the accesses of tinfo->net to access tinfo->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>

37b68e6d

ipvs: Pass ipvs not net to make_receive_sock · fd124e2f

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>

fd124e2f

ipvs: Pass ipvs not net to make_send_sock · 68c76b6a

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>

68c76b6a

ipvs: Pass ipvs not net to stop_sync_thread · b3cf3cbf

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>

b3cf3cbf

ipvs: Pass ipvs not net to start_sync_thread · 6ac121d7

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>

6ac121d7

ipvs: Pass ipvs not net to ip_vs_genl_del_daemon · df04ffb7

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>

df04ffb7

ipvs: Pass ipvs not net to ip_vs_genl_new_daemon · d8443c5f

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>

d8443c5f

ipvs: Pass ipvs not net to ip_vs_genl_find_service · 34c2f514

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>

34c2f514

ipvs: Pass ipvs not net to ip_vs_genl_parse_service · 613fb830

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>

613fb830

ipvs: Pass ipvs not net to __ip_vs_get_timeouts · af540341

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>

af540341

ipvs: Pass ipvs not net to __ip_vs_get_dest_entries · 08fff4c3

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>

08fff4c3

ipvs: Pass ipvs not net to __ip_vs_get_service_entries · b2876b77

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>

b2876b77

ipvs: Pass ipvs not net to ip_vs_set_timeout · f1faa1e7

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>

f1faa1e7

ipvs: Pass ipvs not net to ip_vs_proto_data_get · 18d6ade6

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>

18d6ade6

ipvs: Cache ipvs in ip_vs_in_icmp and ip_vs_in_icmp_v6 · a47b4300

Eric W. Biederman authored Sep 21, 2015

Storte the value of net_ipvs in a variable named ipvs so that when
there are more users struct netns_ipvs in ip_vs_in_cmp and
ip_vs_in_icmp_v6 they won't need to compute the value again.
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>

a47b4300

ipvs: Pass ipvs not net to ip_vs_zero_all · c60856c6

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>

c60856c6

ipvs: Pass ipvs not net to ip_vs_service_net_cleanup · 56d2169b

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>

56d2169b

ipvs: Pass ipvs not net to ip_vs_flush · ef7c599d

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>

ef7c599d

ipvs: Pass ipvs not net to ip_vs_add_service · 5060bd83

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>

5060bd83

ipvs: Cache ipvs in ip_vs_genl_set_cmd · cd58278b

Eric W. Biederman authored Sep 21, 2015

Compute ipvs early in ip_vs_genl_set_cmd and use the cached value to
access ipvs->sync_state.
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>

cd58278b

ipvs: Pass ipvs not net to ip_vs_dest_trash_expire · 8e743f1b

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>

8e743f1b

ipvs: Pass ipvs not net to __ip_vs_del_dest · 79ac82e0

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>

79ac82e0

ipvs: Pass ipvs not net to ip_vs_trash_cleanup · 6c0e14f5

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>

6c0e14f5

ipvs: Pass ipvs not net to ip_vs_find_dest · dc2add6f

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>

dc2add6f

ipvs: Pass ipvs not net to ip_vs_has_real_service · 48aed1b0

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>

48aed1b0

ipvs: Pass ipvs not net to ip_vs_service_find · 0a4fd6ce

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>

0a4fd6ce

ipvs: Pass ipvs not net to __ip_vs_service_find · bb2e2a8c

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>

bb2e2a8c

ipvs: Pass ipvs not net to ip_vs_svc_hashkey · ba61f390

Eric W. Biederman authored Sep 21, 2015

Use the address of ipvs not the address of net when computing the
hash value.  This removes an unncessary dependency on struct 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>

ba61f390

ipvs: Pass ipvs not net to __ip_vs_svc_fwm_find · 1ed8b947

Eric W. Biederman authored Sep 21, 2015

ipvs is what the code actually wants to use.
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>

1ed8b947

ipvs: Pass ipvs not net to ip_vs_svc_fwm_hashkey · f6510b24

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>

f6510b24

ipvs: Store ipvs not net in struct ip_vs_service · 3109d2f2

Eric W. Biederman authored Sep 21, 2015

In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data.  So store a pointer to
struct netns_ipvs.

Update the accesses of param->net to access param->ipvs->net instead.

In functions where we are searching for an svc and filtering by net
filter by ipvs 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>

3109d2f2

ipvs: Pass ipvs not net to ip_vs_fill_conn · 19913dec

Eric W. Biederman authored Sep 21, 2015

ipvs is what is actually desired so change the parameter and the modify
the callers to pass struct netns_ipvs.
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>

19913dec

ipvs: Store ipvs not net in struct ip_vs_conn_param · e64e2b46

Eric W. Biederman authored Sep 21, 2015

In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data.  So store a pointer to
struct netns_ipvs.

Update the accesses of param->net to access param->ipvs->net instead.

When lookup up struct ip_vs_conn in a hash table replace comparisons
of cp->net with comparisons of cp->ipvs which is possible
now that ipvs is present in ip_vs_conn_param.
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>

e64e2b46

ipvs: Store ipvs not net in struct ip_vs_conn · 58dbc6f2

Eric W. Biederman authored Sep 21, 2015

In practice struct netns_ipvs is as meaningful as struct net and more
useful as it holds the ipvs specific data.  So store a pointer to
struct netns_ipvs.

Update the accesses of conn->net to access conn->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>

58dbc6f2

ipvs: Use state->net in the ipvs forward functions · d484fc38

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>

d484fc38