Second Round of IPVS Updates for v4.4
Subsystems (5)
Simon Horman
maintainerHi Pablo,
please consider these bug fixes and extensive clean-ups of IPVS from Eric Biederman for v4.4.
His excellent description of the changes, which is part of an even larger set of clean-up work, is as follows:
I am gradually working my way through the netfilter stack passing struct down into the netfilter hooks and from the netfilter hooks and from there down into the functions that actually care. This removes the need for netfilter functions to guess how to figure out how to compute which network namespace they are in and instead provides a simple and reliable method to do so.
The cleanups stand on their own but this is part of a larger effort to have routes with an output device that is not in the current network namespace.
The IPVS code has been a bit more of a challenge than most. Just passing struct net through to where it is needed did not feel clean to me. The practical issue is that the ipvs code in most places actually wants struct netns_ipvs and not struct net.
So as part of this process I have turned the relationship between struct net and the structs netns_ipvs, ip_vs_conn_param, ip_vs_conn, and ip_vs_service inside out. I have modified the ipvs functions to take a struct netns_ipvs not a struct net. The net is code with fewer conversions from one type of structure to another. I did wind up adding a struct netns_ipvs parameter to quite a few functions that did not have it before so I could pass the structure down from the netfilter hooks to where it is actually needed to avoid guessing.
I have broken up the work in a bunch of small patches so there is at least a chance and reviewing that each step I took is correct. The series compiles at each step so bisecting it should not be a problem if something weird comes up.
The first two changes in this series are actually bug fixes. The first is a compile fix for a bug in sctp that came in, in the last round of ipvs changes merged into nf-next. The second fixes an older bug where in pathological circumstances the wrong network namespace could be used when a proc file is written to.
The rest of the patchset is a bunch of boring changes getting pushing struct netns_ipvs (and by extension ipvs->net) where it needs to be. Either by replacing struct net pointers or adding new struct netns_ipvs pointers. With a handful of other minor cleanups (like removing skb_net).
I have decided include the bug fixes in this pull request. Patch one relates to a bug that was added to nf-next recently and is thus not applicable to nf . Patch two could arguably be promoted to a fix for v4.3 and stable though it does not appear to be severe enough to warrant that course of action; let me know if you would like me to reconsider.
The following changes since commit 227b9e8708b14a8a26ef67bbbe19b13626df4a35:
usbnet: remove invalid check (2015-09-22 16:14:32 -0700)
are available in the git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git tags/ipvs2-for-v4.4
for you to fetch changes up to 57781c1ceead5a3c1cd3ae11834226ef1de21cb5:
ipvs: Pass ipvs into ip_vs_gather_frags (2015-09-24 09:34:43 +0900)
----------------------------------------------------------------
Eric W. Biederman (84):
ipvs: Hoist computation of ipvs earlier in sctp_conn_schedule
ipvs: Don't use current in proc_do_defense_mode
ipvs: Use state->net in the ipvs forward functions
ipvs: Store ipvs not net in struct ip_vs_conn
ipvs: Store ipvs not net in struct ip_vs_conn_param
ipvs: Pass ipvs not net to ip_vs_fill_conn
ipvs: Store ipvs not net in struct ip_vs_service
ipvs: Pass ipvs not net to ip_vs_svc_fwm_hashkey
ipvs: Pass ipvs not net to __ip_vs_svc_fwm_find
ipvs: Pass ipvs not net to ip_vs_svc_hashkey
ipvs: Pass ipvs not net to __ip_vs_service_find
ipvs: Pass ipvs not net to ip_vs_service_find
ipvs: Pass ipvs not net to ip_vs_has_real_service
ipvs: Pass ipvs not net to ip_vs_find_dest
ipvs: Pass ipvs not net to ip_vs_trash_cleanup
ipvs: Pass ipvs not net to __ip_vs_del_dest
ipvs: Pass ipvs not net to ip_vs_dest_trash_expire
ipvs: Cache ipvs in ip_vs_genl_set_cmd
ipvs: Pass ipvs not net to ip_vs_add_service
ipvs: Pass ipvs not net to ip_vs_flush
ipvs: Pass ipvs not net to ip_vs_service_net_cleanup
ipvs: Pass ipvs not net to ip_vs_zero_all
ipvs: Cache ipvs in ip_vs_in_icmp and ip_vs_in_icmp_v6
ipvs: Pass ipvs not net to ip_vs_proto_data_get
ipvs: Pass ipvs not net to ip_vs_set_timeout
ipvs: Pass ipvs not net to __ip_vs_get_service_entries
ipvs: Pass ipvs not net to __ip_vs_get_dest_entries
ipvs: Pass ipvs not net to __ip_vs_get_timeouts
ipvs: Pass ipvs not net to ip_vs_genl_parse_service
ipvs: Pass ipvs not net to ip_vs_genl_find_service
ipvs: Pass ipvs not net to ip_vs_genl_new_daemon
ipvs: Pass ipvs not net to ip_vs_genl_del_daemon
ipvs: Pass ipvs not net to start_sync_thread
ipvs: Pass ipvs not net to stop_sync_thread
ipvs: Pass ipvs not net to make_send_sock
ipvs: Pass ipvs not net to make_receive_sock
ipvs: Store ipvs not net in struct ip_vs_sync_thread_data
ipvs: Pass ipvs not net to ip_vs_process_message
ipvs: Pass ipvs not net to ip_vs_sync_conn_v0
ipvs: Pass ipvs not net to ip_vs_sync_conn
ipvs: Pass ipvs not net to ip_vs_proc_conn
ipvs: Pass ipvs not net to ip_vs_proc_sync_conn
ipvs: Pass ipvs not net to ip_vs_sync_net_init
ipvs: Pass ipvs not net to ip_vs_sync_net_cleanup
ipvs: Pass ipvs not net to ip_vs_genl_set_config
ipvs: Pass ipvs not net to ip_vs_start_estimator aned ip_vs_stop_estimator
ipvs: Pass ipvs not net to ip_vs_random_drop_entry
ipvs: Pass ipvs not net to ip_vs_control_net_(init|cleanup)_sysctl
ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)
ipvs: Pass ipvs not net to estimation_timer
ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup
ipvs: Pass ipvs not net into register_app and unregister_app
ipvs: Pass ipvs not net into ip_vs_app_inc_new
ipvs: Pass ipvs not net to register_ip_vs_app_inc
ipvs: Pass ipvs not net to register_ip_vs_app and unregister_ip_vs_app
ipvs: Pass ipvs not net into ip_vs_app_inc_release
ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup
ipvs: Pass ipvs not net into [un]register_ip_vs_proto_netns
ipvs: Pass ipvs not net into init_netns and exit_netns
ipvs: Pass ipvs into ip_vs_conn_fill_param_proto
ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto
ipvs: Pass ipvs into conn_out_get
ipvs: Pass ipvs not net to ip_vs_conn_hashkey
ipvs: Pass ipvs not net into ip_vs_conn_net_flush
ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup
ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule
ipvs: Better derivation of ipvs in ip_vs_tunnel_xmit
ipvs: Pass ipvs into __ip_vs_get_out_rt
ipvs: Pass ipvs into __ip_vs_get_out_rt_v6
ipvs: Pass ipvs into ensure_mtu_is adequate
ipvs: Better derivation of ipvs in ip_vs_in_stats and ip_vs_out_stats
ipvs: Wrap sysctl_cache_bypass and remove ifdefs in ip_vs_leave
ipvs: Simplify ipvs and net access in ip_vs_leave
ipvs: Pass ipvs not net into sysctl_nat_icmp_send
ipvs: Pass ipvs into ip_vs_out
ipvs: Pass ipvs into ip_vs_in
ipvs: Pass ipvs into ip_vs_in_icmp and ip_vs_in_icmp_v6
ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6
ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_reroute
ipvs: Remove net argument from ip_vs_tcp_conn_listen
ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)
ipvs: Remove skb_net
ipvs: Remove skb_sknet
ipvs: Pass ipvs into ip_vs_gather_frags
include/net/ip_vs.h | 179 +++++++-------------- net/netfilter/ipvs/ip_vs_app.c | 36 ++--- net/netfilter/ipvs/ip_vs_conn.c | 76 ++++----- net/netfilter/ipvs/ip_vs_core.c | 228 ++++++++++++-------------- net/netfilter/ipvs/ip_vs_ctl.c | 276 ++++++++++++++++---------------- net/netfilter/ipvs/ip_vs_est.c | 20 +-- net/netfilter/ipvs/ip_vs_ftp.c | 27 ++-- net/netfilter/ipvs/ip_vs_lblc.c | 3 +- net/netfilter/ipvs/ip_vs_lblcr.c | 3 +- net/netfilter/ipvs/ip_vs_nfct.c | 5 +- net/netfilter/ipvs/ip_vs_proto.c | 33 ++-- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 19 ++- net/netfilter/ipvs/ip_vs_proto_sctp.c | 28 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 33 ++-- net/netfilter/ipvs/ip_vs_proto_udp.c | 28 ++-- net/netfilter/ipvs/ip_vs_sync.c | 87 +++++----- net/netfilter/ipvs/ip_vs_xmit.c | 55 ++++--- net/netfilter/xt_ipvs.c | 3 +- 18 files changed, 501 insertions(+), 638 deletions(-)
Simon Horman
maintainerPATCH 1/84 ipvs: Hoist computation of ipvs earlier in sctp_conn_schedule
From: "Eric W. Biederman" <[email protected]>
The addition of sysctl_sloppy_sctp in sctp_conn_schedule resulted in a use of ipvs before it was computed. Hoist the computation of ipvs earlier to avoid this problem.
--- net/netfilter/ipvs/ip_vs_proto_sctp.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_proto_sctp.c +3 -2
@@ -20,6 +20,9 @@ sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,sctp_sctphdr_t *sh, _sctph;__be16 _ports[2 ], *ports =NULL ; + net =skb_net (skb); + ipvs =net_ipvs (net); +if (likely (!ip_vs_iph_icmp (iph))) { sh =skb_header_pointer (skb, iph->len,sizeof (_sctph), &_sctph);if (sh) {
@@ -40,8 +43,6 @@ sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,return 0 ; } - net =skb_net (skb); - ipvs =net_ipvs (net);rcu_read_lock ();if (likely (!ip_vs_iph_inverse (iph))) svc = ip_vs_service_find(net, af, skb->mark, iph->protocol,
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 2/84 ipvs: Don't use current in proc_do_defense_mode
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Instead store ipvs in extra2 so that proc_do_defense_mode can easily find the ipvs that it's value is associated with.
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +6 -2
@@ -1615,7 +1615,7 @@ static int proc_do_defense_mode(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { - struct net *net = current->nsproxy->net_ns; + struct netns_ipvs *ipvs = table->extra2;int *valp = table->data;int val = *valp;int rc;
@@ -1626,7 +1626,7 @@ proc_do_defense_mode(struct ctl_table *table, int write,/* Restore the correct value */ *valp = val; }else { -update_defense_level (net_ipvs (net)); +update_defense_level (ipvs); } }return rc;
@@ -3866,6 +3866,10 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) }else tbl = vs_vars;/* Initialize sysctl defaults */ +for (idx =0 ; idx <ARRAY_SIZE (vs_vars); idx++) { +if (tbl[idx].proc_handler == proc_do_defense_mode) + tbl[idx].extra2 = ipvs; + } idx =0 ; ipvs->sysctl_amemthresh =1024 ; tbl[idx++].data = &ipvs->sysctl_amemthresh;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 3/84 ipvs: Use state->net in the ipvs forward functions
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +2 -6
@@ -1905,15 +1905,13 @@ ip_vs_forward_icmp(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) {int r; -struct net *net;struct netns_ipvs *ipvs;if (ip_hdr (skb)->protocol !=IPPROTO_ICMP )return NF_ACCEPT ;/* ipvs enabled in this netns ? */ - net =skb_net (skb); - ipvs =net_ipvs (net); + ipvs =net_ipvs (state->net);if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable))return NF_ACCEPT ;
@@ -1926,7 +1924,6 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) {int r; -struct net *net;struct netns_ipvs *ipvs;struct ip_vs_iphdr iphdr;
@@ -1935,8 +1932,7 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb,return NF_ACCEPT ;/* ipvs enabled in this netns ? */ - net =skb_net (skb); - ipvs =net_ipvs (net); + ipvs =net_ipvs (state->net);if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable))return NF_ACCEPT ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 4/84 ipvs: Store ipvs not net in struct ip_vs_conn
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- include/net/ip_vs.h | 31 +------------------------------ net/netfilter/ipvs/ip_vs_conn.c | 30 +++++++++++++++--------------- net/netfilter/ipvs/ip_vs_ftp.c | 6 +++--- net/netfilter/ipvs/ip_vs_nfct.c | 3 +-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- net/netfilter/ipvs/ip_vs_proto_udp.c | 2 +- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 8 files changed, 25 insertions(+), 55 deletions(-)
include/net/ip_vs.h +1 -30
@@ -572,9 +572,7 @@ struct ip_vs_conn {volatile __u32 flags;/* status flags */ __u16 protocol;/* Which protocol (TCP/UDP) */ __u16 daf;/* Address family of the dest */ -#ifdef CONFIG_NET_NS -struct net *net;/* Name space */ -#endif +struct netns_ipvs *ipvs;/* counter and timer */ atomic_t refcnt;/* reference count */
@@ -621,33 +619,6 @@ struct ip_vs_conn {struct rcu_head rcu_head; }; -/* To save some memory in conn table when name space is disabled. */ -static inline struct net *ip_vs_conn_net (const struct ip_vs_conn *cp) -{ -#ifdef CONFIG_NET_NS -return cp->net; -#else -return &init_net; -#endif -} - -static inline void ip_vs_conn_net_set (struct ip_vs_conn *cp,struct net *net) -{ -#ifdef CONFIG_NET_NS - cp->net = net; -#endif -} - -static inline int ip_vs_conn_net_eq (const struct ip_vs_conn *cp, -struct net *net) -{ -#ifdef CONFIG_NET_NS -return cp->net == net; -#else -return 1 ; -#endif -} -/* Extended internal versions of struct ip_vs_service_user and ip_vs_dest_user * for IPv6 support. *
net/netfilter/ipvs/ip_vs_conn.c +15 -15
@@ -148,7 +148,7 @@ static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp) {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (ip_vs_conn_net (cp), cp->af, cp->protocol, +ip_vs_conn_fill_param (cp->ipvs->net, cp->af, cp->protocol, &cp->caddr, cp->cport,NULL ,0 , &p);if (cp->pe) {
@@ -279,7 +279,7 @@ __ip_vs_conn_in_get(const struct ip_vs_conn_param *p)ip_vs_addr_equal (p->af, p->vaddr, &cp->vaddr) && ((!p->cport) ^ (!(cp->flags &IP_VS_CONN_F_NO_CPORT ))) && p->protocol == cp->protocol && - ip_vs_conn_net_eq(cp, p->net)) { + net_eq(cp->ipvs->net, p->net)) { if (!__ip_vs_conn_get(cp)) continue;/* HIT */
@@ -359,7 +359,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[hash], c_list) {if (unlikely (p->pe_data && p->pe->ct_match)) { -if (!ip_vs_conn_net_eq (cp, p->net)) +if (!net_eq (cp->ipvs->net, p->net))continue ;if (p->pe == cp->pe && p->pe->ct_match (p, cp)) {if (__ip_vs_conn_get (cp))
@@ -377,7 +377,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p) p->vport == cp->vport && p->cport == cp->cport && cp->flags & IP_VS_CONN_F_TEMPLATE && p->protocol == cp->protocol && - ip_vs_conn_net_eq(cp, p->net)) { + net_eq(cp->ipvs->net, p->net)) {if (__ip_vs_conn_get (cp)) goto out; }
@@ -418,7 +418,7 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p)ip_vs_addr_equal (p->af, p->vaddr, &cp->caddr) &&ip_vs_addr_equal (p->af, p->caddr, &cp->daddr) && p->protocol == cp->protocol && - ip_vs_conn_net_eq(cp, p->net)) { + net_eq(cp->ipvs->net, p->net)) { if (!__ip_vs_conn_get(cp)) continue;/* HIT */
@@ -638,7 +638,7 @@ void ip_vs_try_bind_dest(struct ip_vs_conn *cp)* so we can make the assumption that the svc_af is the same as the * dest_af */ - dest =ip_vs_find_dest (ip_vs_conn_net (cp), cp->af, cp->af, &cp->daddr, + dest =ip_vs_find_dest (cp->ipvs->net, cp->af, cp->af, &cp->daddr, cp->dport, &cp->vaddr, cp->vport, cp->protocol, cp->fwmark, cp->flags);if (dest) {
@@ -668,7 +668,7 @@ void ip_vs_try_bind_dest(struct ip_vs_conn *cp)#endif ip_vs_bind_xmit (cp); - pd =ip_vs_proto_data_get (ip_vs_conn_net (cp), cp->protocol); + pd =ip_vs_proto_data_get (cp->ipvs->net, cp->protocol);if (pd &&atomic_read (&pd->appcnt))ip_vs_bind_app (cp, pd->pp); }
@@ -746,7 +746,7 @@ static int expire_quiescent_template(struct netns_ipvs *ipvs,int ip_vs_check_template (struct ip_vs_conn *ct) {struct ip_vs_dest *dest = ct->dest; -struct netns_ipvs *ipvs =net_ipvs (ip_vs_conn_net (ct)); +struct netns_ipvs *ipvs = ct->ipvs;/* * Checking the dest server status.
@@ -800,8 +800,8 @@ static void ip_vs_conn_rcu_free(struct rcu_head *head)static void ip_vs_conn_expire (unsigned long data) {struct ip_vs_conn *cp = (struct ip_vs_conn *)data; -struct net *net =ip_vs_conn_net (cp); -struct netns_ipvs *ipvs =net_ipvs (net); +struct netns_ipvs *ipvs = cp->ipvs; +struct net *net = ipvs->net;/* * do I control anybody?
@@ -887,7 +887,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,INIT_HLIST_NODE (&cp->c_list);setup_timer (&cp->timer, ip_vs_conn_expire, (unsigned long )cp); -ip_vs_conn_net_set (cp, p->net); + cp->ipvs = ipvs; cp->af = p->af; cp->daf = dest_af; cp->protocol = p->protocol;
@@ -1061,7 +1061,7 @@ static int ip_vs_conn_seq_show(struct seq_file *seq, void *v)size_t len =0 ;char dbuf[IP_VS_ADDRSTRLEN ]; -if (!ip_vs_conn_net_eq (cp, net)) +if (!net_eq (cp->ipvs->net, net))return 0 ;if (cp->pe_data) { pe_data[0 ] =' ' ;
@@ -1146,7 +1146,7 @@ static int ip_vs_conn_sync_seq_show(struct seq_file *seq, void *v)const struct ip_vs_conn *cp = v;struct net *net =seq_file_net (seq); -if (!ip_vs_conn_net_eq (cp, net)) +if (!net_eq (cp->ipvs->net, net))return 0 ;#ifdef CONFIG_IP_VS_IPV6
@@ -1256,7 +1256,7 @@ void ip_vs_random_dropentry(struct net *net)if (cp->flags &IP_VS_CONN_F_TEMPLATE )/* connection template */ continue ; -if (!ip_vs_conn_net_eq (cp, net)) +if (!net_eq (cp->ipvs->net, net))continue ;if (cp->protocol ==IPPROTO_TCP ) {switch (cp->state) {
@@ -1319,7 +1319,7 @@ flush_again:for (idx =0 ; idx < ip_vs_conn_tab_size; idx++) {hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[idx], c_list) { -if (!ip_vs_conn_net_eq (cp, net)) +if (cp->ipvs != ipvs)continue ;IP_VS_DBG (4 ,"del connection\n" );ip_vs_conn_expire_now (cp);
net/netfilter/ipvs/ip_vs_ftp.c +3 -3
@@ -223,14 +223,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,*/ {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (ip_vs_conn_net (cp),AF_INET , +ip_vs_conn_fill_param (cp->ipvs->net,AF_INET , iph->protocol, &from, port, &cp->caddr,0 , &p); n_cp =ip_vs_conn_out_get (&p); }if (!n_cp) {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (ip_vs_conn_net (cp), +ip_vs_conn_fill_param (cp->ipvs->net,AF_INET ,IPPROTO_TCP , &cp->caddr,0 , &cp->vaddr, port, &p);/* As above, this is ipv4 only */
@@ -392,7 +392,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (ip_vs_conn_net (cp),AF_INET , +ip_vs_conn_fill_param (cp->ipvs->net,AF_INET , iph->protocol, &to, port, &cp->vaddr,htons (ntohs (cp->vport)-1 ), &p); n_cp =ip_vs_conn_in_get (&p);
net/netfilter/ipvs/ip_vs_nfct.c +1 -2
@@ -274,8 +274,7 @@ void ip_vs_conn_drop_conntrack(struct ip_vs_conn *cp)" for conn " FMT_CONN "\n" , __func__, ARG_TUPLE(&tuple), ARG_CONN(cp)); - h =nf_conntrack_find_get (ip_vs_conn_net (cp), &nf_ct_zone_dflt, - &tuple); + h =nf_conntrack_find_get (cp->ipvs->net, &nf_ct_zone_dflt, &tuple);if (h) { ct =nf_ct_tuplehash_to_ctrack (h);/* Show what happens instead of calling nf_ct_kill() */
net/netfilter/ipvs/ip_vs_proto_sctp.c +1 -1
@@ -521,7 +521,7 @@ static void sctp_unregister_app(struct net *net, struct ip_vs_app *inc)static int sctp_app_conn_bind (struct ip_vs_conn *cp) { -struct netns_ipvs *ipvs =net_ipvs (ip_vs_conn_net (cp)); +struct netns_ipvs *ipvs = cp->ipvs;int hash;struct ip_vs_app *inc;int result =0 ;
net/netfilter/ipvs/ip_vs_proto_tcp.c +1 -1
@@ -633,7 +633,7 @@ tcp_unregister_app(struct net *net, struct ip_vs_app *inc)static int tcp_app_conn_bind (struct ip_vs_conn *cp) { -struct netns_ipvs *ipvs =net_ipvs (ip_vs_conn_net (cp)); +struct netns_ipvs *ipvs = cp->ipvs;int hash;struct ip_vs_app *inc;int result =0 ;
net/netfilter/ipvs/ip_vs_proto_udp.c +1 -1
@@ -400,7 +400,7 @@ udp_unregister_app(struct net *net, struct ip_vs_app *inc)static int udp_app_conn_bind (struct ip_vs_conn *cp) { -struct netns_ipvs *ipvs =net_ipvs (ip_vs_conn_net (cp)); +struct netns_ipvs *ipvs = cp->ipvs;int hash;struct ip_vs_app *inc;int result =0 ;
net/netfilter/ipvs/ip_vs_xmit.c +2 -2
@@ -574,7 +574,7 @@ static inline int ip_vs_nat_send_or_cont(int pf, struct sk_buff *skb,skb_forward_csum (skb);if (!skb->sk)skb_sender_cpu_clear (skb); -NF_HOOK (pf,NF_INET_LOCAL_OUT ,ip_vs_conn_net (cp),NULL , skb, +NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output_okfn); }else ret =NF_ACCEPT ;
@@ -596,7 +596,7 @@ static inline int ip_vs_send_or_cont(int pf, struct sk_buff *skb,skb_forward_csum (skb);if (!skb->sk)skb_sender_cpu_clear (skb); -NF_HOOK (pf,NF_INET_LOCAL_OUT ,ip_vs_conn_net (cp),NULL , skb, +NF_HOOK (pf,NF_INET_LOCAL_OUT , cp->ipvs->net,NULL , skb,NULL ,skb_dst (skb)->dev, dst_output_okfn); }else ret =NF_ACCEPT ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 5/84 ipvs: Store ipvs not net in struct ip_vs_conn_param
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_conn.c | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-)
include/net/ip_vs.h +2 -2
@@ -545,7 +545,7 @@ struct ip_vs_proto_data *ip_vs_proto_data_get(struct net *net, unsigned short proto);struct ip_vs_conn_param { -struct net *net; +struct netns_ipvs *ipvs;const union nf_inet_addr *caddr;const union nf_inet_addr *vaddr;__be16 cport;
@@ -1208,7 +1208,7 @@ static inline void ip_vs_conn_fill_param(struct net *net, int af, int protocol,__be16 vport, struct ip_vs_conn_param *p) { - p->net = net; + p->ipvs = net_ipvs(net); p->af = af; p->protocol = protocol; p->caddr = caddr;
net/netfilter/ipvs/ip_vs_conn.c +7 -7
@@ -141,7 +141,7 @@ static unsigned int ip_vs_conn_hashkey_param(const struct ip_vs_conn_param *p, port = p->vport; } -return ip_vs_conn_hashkey (p->net, p->af, p->protocol, addr, port); +return ip_vs_conn_hashkey (p->ipvs->net, p->af, p->protocol, addr, port); }static unsigned int ip_vs_conn_hashkey_conn (const struct ip_vs_conn *cp)
@@ -279,7 +279,7 @@ __ip_vs_conn_in_get(const struct ip_vs_conn_param *p)ip_vs_addr_equal (p->af, p->vaddr, &cp->vaddr) && ((!p->cport) ^ (!(cp->flags &IP_VS_CONN_F_NO_CPORT ))) && p->protocol == cp->protocol && - net_eq(cp->ipvs->net, p->net)) { + cp->ipvs == p->ipvs) { if (!__ip_vs_conn_get(cp)) continue;/* HIT */
@@ -359,7 +359,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p)hlist_for_each_entry_rcu (cp, &ip_vs_conn_tab[hash], c_list) {if (unlikely (p->pe_data && p->pe->ct_match)) { -if (!net_eq (cp->ipvs->net, p->net)) +if (cp->ipvs != p->ipvs)continue ;if (p->pe == cp->pe && p->pe->ct_match (p, cp)) {if (__ip_vs_conn_get (cp))
@@ -377,7 +377,7 @@ struct ip_vs_conn *ip_vs_ct_in_get(const struct ip_vs_conn_param *p) p->vport == cp->vport && p->cport == cp->cport && cp->flags & IP_VS_CONN_F_TEMPLATE && p->protocol == cp->protocol && - net_eq(cp->ipvs->net, p->net)) { + cp->ipvs == p->ipvs) {if (__ip_vs_conn_get (cp)) goto out; }
@@ -418,7 +418,7 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p) ip_vs_addr_equal(p->af, p->vaddr, &cp->caddr) && ip_vs_addr_equal(p->af, p->caddr, &cp->daddr) && p->protocol == cp->protocol && - net_eq(cp->ipvs->net, p->net)) { + cp->ipvs == p->ipvs) {if (!__ip_vs_conn_get (cp))continue ;/* HIT */
@@ -875,8 +875,8 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af, struct ip_vs_dest *dest, __u32 fwmark) {struct ip_vs_conn *cp; -struct netns_ipvs *ipvs =net_ipvs (p->net); -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (p->net, +struct netns_ipvs *ipvs = p->ipvs; +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (p->ipvs->net, p->protocol); cp =kmem_cache_alloc (ip_vs_conn_cachep,GFP_ATOMIC );
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 6/84 ipvs: Pass ipvs not net to ip_vs_fill_conn
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
ipvs is what is actually desired so change the parameter and the modify the callers to pass struct netns_ipvs.
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_conn.c | 8 ++++---- net/netfilter/ipvs/ip_vs_core.c | 8 ++++---- net/netfilter/ipvs/ip_vs_ftp.c | 6 +++--- net/netfilter/ipvs/ip_vs_nfct.c | 2 +- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 14 +++++++------- net/netfilter/ipvs/ip_vs_sync.c | 16 ++++++++-------- 7 files changed, 29 insertions(+), 29 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1201,14 +1201,14 @@ enum { IP_VS_DIR_LAST, }; -static inline void ip_vs_conn_fill_param (struct net *net,int af,int protocol, +static inline void ip_vs_conn_fill_param (struct netns_ipvs *ipvs,int af,int protocol,const union nf_inet_addr *caddr,__be16 cport,const union nf_inet_addr *vaddr,__be16 vport,struct ip_vs_conn_param *p) { - p->ipvs =net_ipvs (net); + p->ipvs = ipvs; p->af = af; p->protocol = protocol; p->caddr = caddr;
net/netfilter/ipvs/ip_vs_conn.c +4 -4
@@ -148,7 +148,7 @@ static unsigned int ip_vs_conn_hashkey_conn(const struct ip_vs_conn *cp) {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (cp->ipvs->net, cp->af, cp->protocol, +ip_vs_conn_fill_param (cp->ipvs, cp->af, cp->protocol, &cp->caddr, cp->cport,NULL ,0 , &p);if (cp->pe) {
@@ -319,17 +319,17 @@ ip_vs_conn_fill_param_proto(int af, const struct sk_buff *skb, struct ip_vs_conn_param *p) {__be16 _ports[2 ], *pptr; -struct net *net =skb_net (skb); +struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); pptr =frag_safe_skb_hp (skb, iph->len,sizeof (_ports), _ports, iph);if (pptr ==NULL )return 1 ;if (likely (!ip_vs_iph_inverse (iph))) -ip_vs_conn_fill_param (net, af, iph->protocol, &iph->saddr, +ip_vs_conn_fill_param (ipvs, af, iph->protocol, &iph->saddr, pptr[0 ], &iph->daddr, pptr[1 ], p);else -ip_vs_conn_fill_param (net, af, iph->protocol, &iph->daddr, +ip_vs_conn_fill_param (ipvs, af, iph->protocol, &iph->daddr, pptr[1 ], &iph->saddr, pptr[0 ], p);return 0 ; }
net/netfilter/ipvs/ip_vs_core.c +4 -4
@@ -215,7 +215,7 @@ ip_vs_conn_fill_param_persist(const struct ip_vs_service *svc, const union nf_inet_addr *vaddr, __be16 vport, struct ip_vs_conn_param *p) { - ip_vs_conn_fill_param(svc->net, svc->af, protocol, caddr, cport, vaddr, + ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, protocol, caddr, cport, vaddr,vport ,p ); p->pe =rcu_dereference (svc->pe);if (p->pe && p->pe->fill_param)
@@ -376,7 +376,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,/* * Create a new connection according to the template */ -ip_vs_conn_fill_param (svc->net, svc->af, iph->protocol, src_addr, +ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, src_addr, src_port, dst_addr, dst_port, ¶m); cp = ip_vs_conn_new(¶m, dest->af, &dest->addr, dport, flags, dest,
@@ -524,7 +524,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (svc->net, svc->af, iph->protocol, +ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, caddr, cport, vaddr, vport, &p); cp = ip_vs_conn_new(&p, dest->af, &dest->addr, dest->port ? dest->port : vport,
@@ -600,7 +600,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,IP_VS_DBG (6 ,"%s(): create a cache_bypass entry\n" , __func__); {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (svc->net, svc->af, iph->protocol, +ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, &iph->saddr, pptr[0 ], &iph->daddr, pptr[1 ], &p); cp = ip_vs_conn_new(&p, svc->af, &daddr, 0,
net/netfilter/ipvs/ip_vs_ftp.c +3 -3
@@ -223,14 +223,14 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,*/ {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (cp->ipvs->net,AF_INET , +ip_vs_conn_fill_param (cp->ipvs,AF_INET , iph->protocol, &from, port, &cp->caddr,0 , &p); n_cp =ip_vs_conn_out_get (&p); }if (!n_cp) {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (cp->ipvs->net, +ip_vs_conn_fill_param (cp->ipvs,AF_INET ,IPPROTO_TCP , &cp->caddr,0 , &cp->vaddr, port, &p);/* As above, this is ipv4 only */
@@ -392,7 +392,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp, {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (cp->ipvs->net,AF_INET , +ip_vs_conn_fill_param (cp->ipvs,AF_INET , iph->protocol, &to, port, &cp->vaddr,htons (ntohs (cp->vport)-1 ), &p); n_cp =ip_vs_conn_in_get (&p);
net/netfilter/ipvs/ip_vs_nfct.c +1 -1
@@ -161,7 +161,7 @@ static void ip_vs_nfct_expect_callback(struct nf_conn *ct,/* RS->CLIENT */ orig = &ct->tuplehash[IP_CT_DIR_ORIGINAL ].tuple; -ip_vs_conn_fill_param (net, exp->tuple.src.l3num, orig->dst.protonum, +ip_vs_conn_fill_param (net_ipvs (net), exp->tuple.src.l3num, orig->dst.protonum, &orig->src.u3, orig->src.u.tcp.port, &orig->dst.u3, orig->dst.u.tcp.port, &p); cp =ip_vs_conn_out_get (&p);
net/netfilter/ipvs/ip_vs_proto_ah_esp.c +7 -7
@@ -41,16 +41,16 @@ struct isakmp_hdr {#define PORT_ISAKMP 500static void -ah_esp_conn_fill_param_proto (struct net *net,int af, +ah_esp_conn_fill_param_proto (struct netns_ipvs *ipvs,int af,const struct ip_vs_iphdr *iph,struct ip_vs_conn_param *p) {if (likely (!ip_vs_iph_inverse (iph))) -ip_vs_conn_fill_param (net, af,IPPROTO_UDP , +ip_vs_conn_fill_param (ipvs, af,IPPROTO_UDP , &iph->saddr,htons (PORT_ISAKMP ), &iph->daddr,htons (PORT_ISAKMP ), p);else -ip_vs_conn_fill_param (net, af,IPPROTO_UDP , +ip_vs_conn_fill_param (ipvs, af,IPPROTO_UDP , &iph->daddr,htons (PORT_ISAKMP ), &iph->saddr,htons (PORT_ISAKMP ), p); }
@@ -61,9 +61,9 @@ ah_esp_conn_in_get(int af, const struct sk_buff *skb, {struct ip_vs_conn *cp;struct ip_vs_conn_param p; -struct net *net =skb_net (skb); +struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); -ah_esp_conn_fill_param_proto (net, af, iph, &p); +ah_esp_conn_fill_param_proto (ipvs, af, iph, &p); cp =ip_vs_conn_in_get (&p);if (!cp) {/*
@@ -88,9 +88,9 @@ ah_esp_conn_out_get(int af, const struct sk_buff *skb, {struct ip_vs_conn *cp;struct ip_vs_conn_param p; -struct net *net =skb_net (skb); +struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); -ah_esp_conn_fill_param_proto (net, af, iph, &p); +ah_esp_conn_fill_param_proto (ipvs, af, iph, &p); cp =ip_vs_conn_out_get (&p);if (!cp) { IP_VS_DBG_BUF(12, "Unknown ISAKMP entry for inout packet "
net/netfilter/ipvs/ip_vs_sync.c +8 -8
@@ -784,21 +784,21 @@ control:* fill_param used by version 1 */ static inline int -ip_vs_conn_fill_param_sync (struct net *net,int af,union ip_vs_sync_conn *sc, +ip_vs_conn_fill_param_sync (struct netns_ipvs *ipvs,int af,union ip_vs_sync_conn *sc,struct ip_vs_conn_param *p,__u8 *pe_data,unsigned int pe_data_len,__u8 *pe_name,unsigned int pe_name_len) {#ifdef CONFIG_IP_VS_IPV6 if (af ==AF_INET6 ) -ip_vs_conn_fill_param (net, af, sc->v6.protocol, +ip_vs_conn_fill_param (ipvs, af, sc->v6.protocol, (const union nf_inet_addr *)&sc->v6.caddr, sc->v6.cport, (const union nf_inet_addr *)&sc->v6.vaddr, sc->v6.vport, p); else#endif - ip_vs_conn_fill_param(net, af, sc->v4.protocol, + ip_vs_conn_fill_param(ipvs, af, sc->v4.protocol, (const union nf_inet_addr *)&sc->v4.caddr, sc->v4.cport, (const union nf_inet_addr *)&sc->v4.vaddr,
@@ -953,7 +953,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,/* * Process received multicast message for Version 0 */ -static void ip_vs_process_message_v0 (struct net *net,const char *buffer, +static void ip_vs_process_message_v0 (struct netns_ipvs *ipvs,const char *buffer,const size_t buflen) {struct ip_vs_sync_mesg_v0 *m = (struct ip_vs_sync_mesg_v0 *)buffer;
@@ -1009,14 +1009,14 @@ static void ip_vs_process_message_v0(struct net *net, const char *buffer, } } -ip_vs_conn_fill_param (net,AF_INET , s->protocol, +ip_vs_conn_fill_param (ipvs,AF_INET , s->protocol, (const union nf_inet_addr *)&s->caddr, s->cport, (const union nf_inet_addr *)&s->vaddr, s->vport, ¶m);/* Send timeout as Zero */ -ip_vs_proc_conn (net, ¶m, flags, state, s->protocol,AF_INET , +ip_vs_proc_conn (ipvs->net, ¶m, flags, state, s->protocol,AF_INET , (union nf_inet_addr *)&s->daddr, s->dport,0 ,0 , opt); }
@@ -1171,7 +1171,7 @@ static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end) state =0 ; } } -if (ip_vs_conn_fill_param_sync (net, af, s, ¶m, pe_data, +if (ip_vs_conn_fill_param_sync (net_ipvs (net), af, s, ¶m, pe_data, pe_data_len, pe_name, pe_name_len)) { retc =50 ; goto out;
@@ -1268,7 +1268,7 @@ static void ip_vs_process_message(struct net *net, __u8 *buffer, } }else {/* Old type of message */ -ip_vs_process_message_v0 (net, buffer, buflen); +ip_vs_process_message_v0 (ipvs, buffer, buflen);return ; } }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 7/84 ipvs: Store ipvs not net in struct ip_vs_service
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 10 +++---- net/netfilter/ipvs/ip_vs_ctl.c | 64 ++++++++++++++++++++++------------------ net/netfilter/ipvs/ip_vs_lblc.c | 3 +- net/netfilter/ipvs/ip_vs_lblcr.c | 3 +- 5 files changed, 43 insertions(+), 39 deletions(-)
include/net/ip_vs.h +1 -1
@@ -678,7 +678,7 @@ struct ip_vs_service {unsigned int flags;/* service status flags */ unsigned int timeout;/* persistent timeout in ticks */ __be32 netmask;/* grouping granularity, mask/plen */ -struct net *net; +struct netns_ipvs *ipvs;struct list_head destinations;/* real server d-linked list */ __u32 num_dests;/* number of servers */
net/netfilter/ipvs/ip_vs_core.c +5 -5
@@ -179,7 +179,7 @@ ip_vs_out_stats(struct ip_vs_conn *cp, struct sk_buff *skb)static inline void ip_vs_conn_stats (struct ip_vs_conn *cp,struct ip_vs_service *svc) { -struct netns_ipvs *ipvs =net_ipvs (svc->net); +struct netns_ipvs *ipvs = svc->ipvs;struct ip_vs_cpu_stats *s; s =this_cpu_ptr (cp->dest->stats.cpustats);
@@ -215,7 +215,7 @@ ip_vs_conn_fill_param_persist(const struct ip_vs_service *svc, const union nf_inet_addr *vaddr, __be16 vport, struct ip_vs_conn_param *p) { - ip_vs_conn_fill_param(net_ipvs(svc->net), svc->af, protocol, caddr, cport, vaddr, + ip_vs_conn_fill_param(svc->ipvs, svc->af, protocol, caddr, cport, vaddr,vport ,p ); p->pe =rcu_dereference (svc->pe);if (p->pe && p->pe->fill_param)
@@ -376,7 +376,7 @@ ip_vs_sched_persist(struct ip_vs_service *svc,/* * Create a new connection according to the template */ -ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, src_addr, +ip_vs_conn_fill_param (svc->ipvs, svc->af, iph->protocol, src_addr, src_port, dst_addr, dst_port, ¶m); cp = ip_vs_conn_new(¶m, dest->af, &dest->addr, dport, flags, dest,
@@ -524,7 +524,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb, {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, +ip_vs_conn_fill_param (svc->ipvs, svc->af, iph->protocol, caddr, cport, vaddr, vport, &p); cp = ip_vs_conn_new(&p, dest->af, &dest->addr, dest->port ? dest->port : vport,
@@ -600,7 +600,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,IP_VS_DBG (6 ,"%s(): create a cache_bypass entry\n" , __func__); {struct ip_vs_conn_param p; -ip_vs_conn_fill_param (net_ipvs (svc->net), svc->af, iph->protocol, +ip_vs_conn_fill_param (svc->ipvs, svc->af, iph->protocol, &iph->saddr, pptr[0 ], &iph->daddr, pptr[1 ], &p); cp = ip_vs_conn_new(&p, svc->af, &daddr, 0,
net/netfilter/ipvs/ip_vs_ctl.c +35 -29
267 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_lblc.c +1 -2
@@ -250,8 +250,7 @@ static void ip_vs_lblc_flush(struct ip_vs_service *svc)static int sysctl_lblc_expiration (struct ip_vs_service *svc) {#ifdef CONFIG_SYSCTL -struct netns_ipvs *ipvs =net_ipvs (svc->net); -return ipvs->sysctl_lblc_expiration; +return svc->ipvs->sysctl_lblc_expiration;#else return DEFAULT_EXPIRATION ;#endif
net/netfilter/ipvs/ip_vs_lblcr.c +1 -2
@@ -415,8 +415,7 @@ static void ip_vs_lblcr_flush(struct ip_vs_service *svc)static int sysctl_lblcr_expiration (struct ip_vs_service *svc) {#ifdef CONFIG_SYSCTL -struct netns_ipvs *ipvs =net_ipvs (svc->net); -return ipvs->sysctl_lblcr_expiration; +return svc->ipvs->sysctl_lblcr_expiration;#else return DEFAULT_EXPIRATION ;#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 8/84 ipvs: Pass ipvs not net to ip_vs_svc_fwm_hashkey
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -285,9 +285,9 @@ ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto,/* * Returns hash value of fwmark for virtual service lookup */ -static inline unsigned int ip_vs_svc_fwm_hashkey (struct net *net,__u32 fwmark) +static inline unsigned int ip_vs_svc_fwm_hashkey (struct netns_ipvs *ipvs,__u32 fwmark) { -return (((size_t )net>>8 ) ^ fwmark) &IP_VS_SVC_TAB_MASK ; +return (((size_t )ipvs>>8 ) ^ fwmark) &IP_VS_SVC_TAB_MASK ; }/*
@@ -316,7 +316,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc)/* * Hash it by fwmark in svc_fwm_table */ - hash =ip_vs_svc_fwm_hashkey (svc->ipvs->net, svc->fwmark); + hash =ip_vs_svc_fwm_hashkey (svc->ipvs, svc->fwmark);hlist_add_head_rcu (&svc->f_list, &ip_vs_svc_fwm_table[hash]); }
@@ -393,7 +393,7 @@ __ip_vs_svc_fwm_find(struct net *net, int af, __u32 fwmark)struct ip_vs_service *svc;/* Check for fwmark addressed entries */ - hash =ip_vs_svc_fwm_hashkey (net, fwmark); + hash =ip_vs_svc_fwm_hashkey (ipvs, fwmark);hlist_for_each_entry_rcu (svc, &ip_vs_svc_fwm_table[hash], f_list) { if (svc->fwmark == fwmark && svc->af == af
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 9/84 ipvs: Pass ipvs not net to __ip_vs_svc_fwm_find
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
ipvs is what the code actually wants to use.
--- net/netfilter/ipvs/ip_vs_ctl.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +8 -7
@@ -386,9 +386,8 @@ __ip_vs_service_find(struct net *net, int af, __u16 protocol,* Get service by {fwmark} in the service table. */ static inline struct ip_vs_service * -__ip_vs_svc_fwm_find (struct net *net,int af,__u32 fwmark) +__ip_vs_svc_fwm_find (struct netns_ipvs *ipvs,int af,__u32 fwmark) { -struct netns_ipvs *ipvs =net_ipvs (net);unsigned int hash;struct ip_vs_service *svc;
@@ -418,7 +417,7 @@ ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,* Check the table hashed by fwmark first */ if (fwmark) { - svc =__ip_vs_svc_fwm_find (net, af, fwmark); + svc =__ip_vs_svc_fwm_find (ipvs, af, fwmark);if (svc) goto out; }
@@ -2415,7 +2414,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) svc =__ip_vs_service_find (net, usvc.af, usvc.protocol, &usvc.addr, usvc.port); else - svc =__ip_vs_svc_fwm_find (net, usvc.af, usvc.fwmark); + svc =__ip_vs_svc_fwm_find (ipvs, usvc.af, usvc.fwmark);rcu_read_unlock (); if (cmd != IP_VS_SO_SET_ADD
@@ -2543,13 +2542,14 @@ static inline int __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get, struct ip_vs_get_dests __user *uptr) { + struct netns_ipvs *ipvs = net_ipvs(net);struct ip_vs_service *svc;union nf_inet_addr addr = { .ip = get->addr };int ret =0 ;rcu_read_lock ();if (get->fwmark) - svc =__ip_vs_svc_fwm_find (net,AF_INET , get->fwmark); + svc =__ip_vs_svc_fwm_find (ipvs,AF_INET , get->fwmark);else svc =__ip_vs_service_find (net,AF_INET , get->protocol, &addr, get->port);
@@ -2743,7 +2743,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) addr.ip = entry->addr;rcu_read_lock ();if (entry->fwmark) - svc =__ip_vs_svc_fwm_find (net,AF_INET , entry->fwmark); + svc =__ip_vs_svc_fwm_find (ipvs,AF_INET , entry->fwmark);else svc = __ip_vs_service_find(net, AF_INET, entry->protocol, &addr,
@@ -3051,6 +3051,7 @@ static int ip_vs_genl_parse_service(struct net *net, struct nlattr *nla, int full_entry, struct ip_vs_service **ret_svc) { + struct netns_ipvs *ipvs = net_ipvs(net);struct nlattr *attrs[IPVS_SVC_ATTR_MAX +1 ];struct nlattr *nla_af, *nla_port, *nla_fwmark, *nla_protocol, *nla_addr;struct ip_vs_service *svc;
@@ -3091,7 +3092,7 @@ static int ip_vs_genl_parse_service(struct net *net,rcu_read_lock ();if (usvc->fwmark) - svc =__ip_vs_svc_fwm_find (net, usvc->af, usvc->fwmark); + svc =__ip_vs_svc_fwm_find (ipvs, usvc->af, usvc->fwmark);else svc =__ip_vs_service_find (net, usvc->af, usvc->protocol, &usvc->addr, usvc->port);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 10/84 ipvs: Pass ipvs not net to ip_vs_svc_hashkey
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Use the address of ipvs not the address of net when computing the hash value. This removes an unncessary dependency on struct net.
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -263,7 +263,7 @@ static struct hlist_head ip_vs_svc_fwm_table[IP_VS_SVC_TAB_SIZE];* Returns hash value for virtual service */ static inline unsigned int -ip_vs_svc_hashkey (struct net *net,int af,unsigned int proto, +ip_vs_svc_hashkey (struct netns_ipvs *ipvs,int af,unsigned int proto,const union nf_inet_addr *addr,__be16 port) { registerunsigned int porth =ntohs (port);
@@ -276,7 +276,7 @@ ip_vs_svc_hashkey(struct net *net, int af, unsigned int proto, addr->ip6[2 ]^addr->ip6[3 ];#endif ahash =ntohl (addr_fold); - ahash ^= ((size_t ) net >>8 ); + ahash ^= ((size_t ) ipvs >>8 );return (proto ^ ahash ^ (porth >>IP_VS_SVC_TAB_BITS ) ^ porth) &IP_VS_SVC_TAB_MASK ;
@@ -309,7 +309,7 @@ static int ip_vs_svc_hash(struct ip_vs_service *svc)/* * Hash it by <netns,protocol,addr,port> in ip_vs_svc_table */ - hash =ip_vs_svc_hashkey (svc->ipvs->net, svc->af, svc->protocol, + hash =ip_vs_svc_hashkey (svc->ipvs, svc->af, svc->protocol, &svc->addr, svc->port);hlist_add_head_rcu (&svc->s_list, &ip_vs_svc_table[hash]); }else {
@@ -365,7 +365,7 @@ __ip_vs_service_find(struct net *net, int af, __u16 protocol,struct ip_vs_service *svc;/* Check for "full" addressed entries */ - hash =ip_vs_svc_hashkey (net, af, protocol, vaddr, vport); + hash =ip_vs_svc_hashkey (ipvs, af, protocol, vaddr, vport);hlist_for_each_entry_rcu (svc, &ip_vs_svc_table[hash], s_list) { if ((svc->af == af)
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 11/84 ipvs: Pass ipvs not net to __ip_vs_service_find
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +8 -9
@@ -357,10 +357,9 @@ static int ip_vs_svc_unhash(struct ip_vs_service *svc)* Get service by {netns, proto,addr,port} in the service table. */ static inline struct ip_vs_service * -__ip_vs_service_find (struct net *net,int af,__u16 protocol, +__ip_vs_service_find (struct netns_ipvs *ipvs,int af,__u16 protocol,const union nf_inet_addr *vaddr,__be16 vport) { -struct netns_ipvs *ipvs =net_ipvs (net);unsigned int hash;struct ip_vs_service *svc;
@@ -426,7 +425,7 @@ ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,* Check the table hashed by <protocol,addr,port> * for "full" addressed entries */ - svc =__ip_vs_service_find (net, af, protocol, vaddr, vport); + svc =__ip_vs_service_find (ipvs, af, protocol, vaddr, vport);if (svc ==NULL && protocol == IPPROTO_TCP
@@ -436,7 +435,7 @@ ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,* Check if ftp service entry exists, the packet * might belong to FTP data connections. */ - svc =__ip_vs_service_find (net, af, protocol, vaddr,FTPPORT ); + svc =__ip_vs_service_find (ipvs, af, protocol, vaddr,FTPPORT ); } if (svc == NULL
@@ -444,7 +443,7 @@ ip_vs_service_find(struct net *net, int af, __u32 fwmark, __u16 protocol,/* * Check if the catch-all port (port zero) exists */ - svc =__ip_vs_service_find (net, af, protocol, vaddr,0 ); + svc =__ip_vs_service_find (ipvs, af, protocol, vaddr,0 ); } out:
@@ -2411,7 +2410,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)/* Lookup the exact service by <protocol, addr, port> or fwmark */ rcu_read_lock ();if (usvc.fwmark ==0 ) - svc =__ip_vs_service_find (net, usvc.af, usvc.protocol, + svc =__ip_vs_service_find (ipvs, usvc.af, usvc.protocol, &usvc.addr, usvc.port);else svc =__ip_vs_svc_fwm_find (ipvs, usvc.af, usvc.fwmark);
@@ -2551,7 +2550,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,if (get->fwmark) svc =__ip_vs_svc_fwm_find (ipvs,AF_INET , get->fwmark);else - svc =__ip_vs_service_find (net,AF_INET , get->protocol, &addr, + svc =__ip_vs_service_find (ipvs,AF_INET , get->protocol, &addr, get->port);rcu_read_unlock ();
@@ -2745,7 +2744,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)if (entry->fwmark) svc =__ip_vs_svc_fwm_find (ipvs,AF_INET , entry->fwmark);else - svc =__ip_vs_service_find (net,AF_INET , + svc =__ip_vs_service_find (ipvs,AF_INET , entry->protocol, &addr, entry->port);rcu_read_unlock ();
@@ -3094,7 +3093,7 @@ static int ip_vs_genl_parse_service(struct net *net,if (usvc->fwmark) svc =__ip_vs_svc_fwm_find (ipvs, usvc->af, usvc->fwmark);else - svc =__ip_vs_service_find (net, usvc->af, usvc->protocol, + svc =__ip_vs_service_find (ipvs, usvc->af, usvc->protocol, &usvc->addr, usvc->port);rcu_read_unlock (); *ret_svc = svc;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 12/84 ipvs: Pass ipvs not net to ip_vs_service_find
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_udp.c | 6 ++++-- 5 files changed, 11 insertions(+), 10 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1410,7 +1410,7 @@ extern struct ip_vs_stats ip_vs_stats;extern int sysctl_ip_vs_sync_ver;struct ip_vs_service * -ip_vs_service_find (struct net *net,int af,__u32 fwmark,__u16 protocol, +ip_vs_service_find (struct netns_ipvs *ipvs,int af,__u32 fwmark,__u16 protocol,const union nf_inet_addr *vaddr,__be16 vport); bool ip_vs_has_real_service(struct net *net, int af, __u16 protocol,
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -406,11 +406,10 @@ __ip_vs_svc_fwm_find(struct netns_ipvs *ipvs, int af, __u32 fwmark)/* Find service, called under RCU lock */ struct ip_vs_service * -ip_vs_service_find (struct net *net,int af,__u32 fwmark,__u16 protocol, +ip_vs_service_find (struct netns_ipvs *ipvs,int af,__u32 fwmark,__u16 protocol,const union nf_inet_addr *vaddr,__be16 vport) {struct ip_vs_service *svc; -struct netns_ipvs *ipvs =net_ipvs (net);/* * Check the table hashed by fwmark first
@@ -612,7 +611,7 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int svc_af, int dest_af,struct ip_vs_service *svc;__be16 port = dport; - svc =ip_vs_service_find (net, svc_af, fwmark, protocol, vaddr, vport); + svc =ip_vs_service_find (net_ipvs (net), svc_af, fwmark, protocol, vaddr, vport);if (!svc)return NULL ;if (fwmark && (flags &IP_VS_CONN_F_FWD_MASK ) !=IP_VS_CONN_F_MASQ )
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -2
@@ -45,10 +45,10 @@ sctp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,rcu_read_lock ();if (likely (!ip_vs_iph_inverse (iph))) - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->daddr, ports[1 ]);else - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->saddr, ports[0 ]);if (svc) {int ignored;
net/netfilter/ipvs/ip_vs_proto_tcp.c +2 -2
@@ -70,10 +70,10 @@ tcp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,rcu_read_lock ();if (likely (!ip_vs_iph_inverse (iph))) - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->daddr, ports[1 ]);else - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->saddr, ports[0 ]);if (svc) {
net/netfilter/ipvs/ip_vs_proto_udp.c +4 -2
@@ -34,6 +34,7 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, struct ip_vs_iphdr *iph) {struct net *net; +struct netns_ipvs *ipvs;struct ip_vs_service *svc;struct udphdr _udph, *uh;__be16 _ports[2 ], *ports =NULL ;
@@ -54,12 +55,13 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd, } net =skb_net (skb); + ipvs =net_ipvs (net);rcu_read_lock ();if (likely (!ip_vs_iph_inverse (iph))) - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->daddr, ports[1 ]);else - svc =ip_vs_service_find (net, af, skb->mark, iph->protocol, + svc =ip_vs_service_find (ipvs, af, skb->mark, iph->protocol, &iph->saddr, ports[0 ]);if (svc) {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 13/84 ipvs: Pass ipvs not net to ip_vs_has_real_service
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 6 ++++-- net/netfilter/ipvs/ip_vs_ctl.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1413,7 +1413,7 @@ struct ip_vs_service * ip_vs_service_find(struct netns_ipvs *ipvs, int af, __u32 fwmark, __u16 protocol, const union nf_inet_addr *vaddr, __be16 vport); -bool ip_vs_has_real_service (struct net *net,int af,__u16 protocol, +bool ip_vs_has_real_service (struct netns_ipvs *ipvs,int af,__u16 protocol,const union nf_inet_addr *daddr,__be16 dport);int ip_vs_use_count_inc (void );
net/netfilter/ipvs/ip_vs_core.c +4 -2
@@ -1186,6 +1186,7 @@ static unsigned int ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) { struct net *net = NULL; +struct netns_ipvs *ipvs;struct ip_vs_iphdr iph;struct ip_vs_protocol *pp;struct ip_vs_proto_data *pd;
@@ -1211,7 +1212,8 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)return NF_ACCEPT ; net =skb_net (skb); -if (!net_ipvs (net)->enable) + ipvs =net_ipvs (net); +if (!ipvs->enable)return NF_ACCEPT ;ip_vs_fill_iph_skb (af, skb, false, &iph);
@@ -1269,7 +1271,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af) sizeof(_ports), _ports, &iph);if (pptr ==NULL )return NF_ACCEPT ;/* Not for me */ -if (ip_vs_has_real_service (net, af, iph.protocol, &iph.saddr, +if (ip_vs_has_real_service (ipvs, af, iph.protocol, &iph.saddr, pptr[0 ])) {/* * Notify the real server: there is no
net/netfilter/ipvs/ip_vs_ctl.c +1 -2
@@ -542,10 +542,9 @@ static void ip_vs_rs_unhash(struct ip_vs_dest *dest) }/* Check if real service by <proto,addr,port> is present */ -bool ip_vs_has_real_service (struct net *net,int af,__u16 protocol, +bool ip_vs_has_real_service (struct netns_ipvs *ipvs,int af,__u16 protocol,const union nf_inet_addr *daddr,__be16 dport) { -struct netns_ipvs *ipvs =net_ipvs (net);unsigned int hash;struct ip_vs_dest *dest;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 14/84 ipvs: Pass ipvs not net to ip_vs_find_dest
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_sync.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1423,7 +1423,7 @@ void ip_vs_unregister_nl_ioctl(void);int ip_vs_control_init (void );void ip_vs_control_cleanup (void );struct ip_vs_dest * -ip_vs_find_dest (struct net *net,int svc_af,int dest_af, +ip_vs_find_dest (struct netns_ipvs *ipvs,int svc_af,int dest_af,const union nf_inet_addr *daddr,__be16 dport,const union nf_inet_addr *vaddr,__be16 vport,__u16 protocol,__u32 fwmark,__u32 flags);
net/netfilter/ipvs/ip_vs_conn.c +1 -1
@@ -638,7 +638,7 @@ void ip_vs_try_bind_dest(struct ip_vs_conn *cp)* so we can make the assumption that the svc_af is the same as the * dest_af */ - dest =ip_vs_find_dest (cp->ipvs->net, cp->af, cp->af, &cp->daddr, + dest =ip_vs_find_dest (cp->ipvs, cp->af, cp->af, &cp->daddr, cp->dport, &cp->vaddr, cp->vport, cp->protocol, cp->fwmark, cp->flags);if (dest) {
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -599,7 +599,7 @@ ip_vs_lookup_dest(struct ip_vs_service *svc, int dest_af,* on the backup. * Called under RCU lock, no refcnt is returned. */ -struct ip_vs_dest *ip_vs_find_dest(struct net *net, int svc_af, int dest_af, +struct ip_vs_dest *ip_vs_find_dest(struct netns_ipvs *ipvs, int svc_af, int dest_af, const union nf_inet_addr *daddr, __be16 dport, const union nf_inet_addr *vaddr,
@@ -610,7 +610,7 @@ struct ip_vs_dest *ip_vs_find_dest(struct net *net, int svc_af, int dest_af,struct ip_vs_service *svc;__be16 port = dport; - svc =ip_vs_service_find (net_ipvs (net), svc_af, fwmark, protocol, vaddr, vport); + svc =ip_vs_service_find (ipvs, svc_af, fwmark, protocol, vaddr, vport);if (!svc)return NULL ;if (fwmark && (flags &IP_VS_CONN_F_FWD_MASK ) !=IP_VS_CONN_F_MASQ )
net/netfilter/ipvs/ip_vs_sync.c +1 -1
@@ -904,7 +904,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,* with synchronization, so we can make the assumption that * the svc_af is the same as the dest_af */ - dest =ip_vs_find_dest (net, type, type, daddr, dport, + dest =ip_vs_find_dest (ipvs, type, type, daddr, dport, param->vaddr, param->vport, protocol, fwmark, flags);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 15/84 ipvs: Pass ipvs not net to ip_vs_trash_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -713,10 +713,9 @@ static void ip_vs_dest_free(struct ip_vs_dest *dest)* are expired, and the refcnt of each destination in the trash must * be 0, so we simply release them here. */ -static void ip_vs_trash_cleanup (struct net *net) +static void ip_vs_trash_cleanup (struct netns_ipvs *ipvs) {struct ip_vs_dest *dest, *nxt; -struct netns_ipvs *ipvs =net_ipvs (net);del_timer_sync (&ipvs->dest_trash_timer);/* No need to use dest_trash_lock */
@@ -4005,7 +4004,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net) {struct netns_ipvs *ipvs =net_ipvs (net); -ip_vs_trash_cleanup (net); +ip_vs_trash_cleanup (ipvs);ip_vs_control_net_cleanup_sysctl (net);remove_proc_entry ("ip_vs_stats_percpu" , net->proc_net);remove_proc_entry ("ip_vs_stats" , net->proc_net);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 16/84 ipvs: Pass ipvs not net to __ip_vs_del_dest
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -6
@@ -1033,12 +1033,10 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)/* * Delete a destination (must be already unlinked from the service) */ -static void __ip_vs_del_dest (struct net *net,struct ip_vs_dest *dest, +static void __ip_vs_del_dest (struct netns_ipvs *ipvs,struct ip_vs_dest *dest,bool cleanup) { -struct netns_ipvs *ipvs =net_ipvs (net); - -ip_vs_stop_estimator (net, &dest->stats); +ip_vs_stop_estimator (ipvs->net, &dest->stats);/* * Remove it from the d-linked list with the real services.
@@ -1117,7 +1115,7 @@ ip_vs_del_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)/* * Delete the destination */ -__ip_vs_del_dest (svc->ipvs->net, dest, false); +__ip_vs_del_dest (svc->ipvs, dest, false);LeaveFunction (2 );
@@ -1402,7 +1400,7 @@ static void __ip_vs_del_service(struct ip_vs_service *svc, bool cleanup)*/ list_for_each_entry_safe (dest, nxt, &svc->destinations, n_list) {__ip_vs_unlink_dest (svc, dest,0 ); -__ip_vs_del_dest (svc->ipvs->net, dest, cleanup); +__ip_vs_del_dest (svc->ipvs, dest, cleanup); }/*
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 17/84 ipvs: Pass ipvs not net to ip_vs_dest_trash_expire
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -1124,8 +1124,7 @@ ip_vs_del_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)static void ip_vs_dest_trash_expire (unsigned long data) { -struct net *net = (struct net *) data; -struct netns_ipvs *ipvs =net_ipvs (net); +struct netns_ipvs *ipvs = (struct netns_ipvs *)data;struct ip_vs_dest *dest, *next;unsigned long now = jiffies;
@@ -3966,7 +3965,7 @@ int __net_init ip_vs_control_net_init(struct net *net)INIT_LIST_HEAD (&ipvs->dest_trash);spin_lock_init (&ipvs->dest_trash_lock);setup_timer (&ipvs->dest_trash_timer, ip_vs_dest_trash_expire, - (unsigned long ) net); + (unsigned long ) ipvs);atomic_set (&ipvs->ftpsvc_counter,0 );atomic_set (&ipvs->nullsvc_counter,0 );
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 18/84 ipvs: Cache ipvs in ip_vs_genl_set_cmd
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Compute ipvs early in ip_vs_genl_set_cmd and use the cached value to access ipvs->sync_state.
--- net/netfilter/ipvs/ip_vs_ctl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
net/netfilter/ipvs/ip_vs_ctl.c +3 -1
@@ -3516,8 +3516,10 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)int ret =0 , cmd;int need_full_svc =0 , need_full_dest =0 ;struct net *net; +struct netns_ipvs *ipvs; net =skb_sknet (skb); + ipvs =net_ipvs (net); cmd = info->genlhdr->cmd;mutex_lock (&__ip_vs_mutex);
@@ -3579,7 +3581,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)/* The synchronization protocol is incompatible * with mixed family services */ -if (net_ipvs (net)->sync_state) { +if (ipvs->sync_state) { ret = -EINVAL ; goto out; }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 19/84 ipvs: Pass ipvs not net to ip_vs_add_service
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -5
@@ -1157,14 +1157,13 @@ static void ip_vs_dest_trash_expire(unsigned long data)* Add a service into the service hash table */ static int -ip_vs_add_service (struct net *net,struct ip_vs_service_user_kern *u, +ip_vs_add_service (struct netns_ipvs *ipvs,struct ip_vs_service_user_kern *u,struct ip_vs_service **svc_p) {int ret =0 , i;struct ip_vs_scheduler *sched =NULL ;struct ip_vs_pe *pe =NULL ;struct ip_vs_service *svc =NULL ; -struct netns_ipvs *ipvs =net_ipvs (net);/* increase the module use count */ ip_vs_use_count_inc ();
@@ -1255,7 +1254,7 @@ ip_vs_add_service(struct net *net, struct ip_vs_service_user_kern *u,else if (svc->port ==0 )atomic_inc (&ipvs->nullsvc_counter); -ip_vs_start_estimator (net, &svc->stats); +ip_vs_start_estimator (ipvs->net, &svc->stats);/* Count only IPv4 services for old get/setsockopt interface */ if (svc->af ==AF_INET )
@@ -2421,7 +2420,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (svc !=NULL ) ret = -EEXIST ;else - ret =ip_vs_add_service (net, &usvc, &svc); + ret =ip_vs_add_service (ipvs, &usvc, &svc);break ;case IP_VS_SO_SET_EDIT : ret =ip_vs_edit_service (svc, &usvc);
@@ -3601,7 +3600,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)switch (cmd) {case IPVS_CMD_NEW_SERVICE :if (svc ==NULL ) - ret =ip_vs_add_service (net, &usvc, &svc); + ret =ip_vs_add_service (ipvs, &usvc, &svc);else ret = -EEXIST ;break ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 20/84 ipvs: Pass ipvs not net to ip_vs_flush
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +5 -5
@@ -1449,9 +1449,8 @@ static int ip_vs_del_service(struct ip_vs_service *svc)/* * Flush all the virtual services */ -static int ip_vs_flush (struct net *net,bool cleanup) +static int ip_vs_flush (struct netns_ipvs *ipvs,bool cleanup) { -struct netns_ipvs *ipvs =net_ipvs (net);int idx;struct ip_vs_service *svc;struct hlist_node *n;
@@ -1487,10 +1486,11 @@ static int ip_vs_flush(struct net *net, bool cleanup)*/ void ip_vs_service_net_cleanup (struct net *net) { +struct netns_ipvs *ipvs =net_ipvs (net);EnterFunction (2 );/* Check for "full" addressed entries */ mutex_lock (&__ip_vs_mutex); -ip_vs_flush (net, true); +ip_vs_flush (ipvs, true);mutex_unlock (&__ip_vs_mutex);LeaveFunction (2 ); }
@@ -2366,7 +2366,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)mutex_lock (&__ip_vs_mutex);if (cmd ==IP_VS_SO_SET_FLUSH ) {/* Flush the virtual service */ - ret =ip_vs_flush (net, false); + ret =ip_vs_flush (ipvs, false); goto out_unlock; }else if (cmd ==IP_VS_SO_SET_TIMEOUT ) {/* Set timeout values for (tcp tcpfin udp) */
@@ -3524,7 +3524,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)mutex_lock (&__ip_vs_mutex);if (cmd ==IPVS_CMD_FLUSH ) { - ret =ip_vs_flush (net, false); + ret =ip_vs_flush (ipvs, false); goto out; }else if (cmd ==IPVS_CMD_SET_CONFIG ) { ret =ip_vs_genl_set_config (net, info->attrs);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 21/84 ipvs: Pass ipvs not net to ip_vs_service_net_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 6 ++++-- net/netfilter/ipvs/ip_vs_ctl.c | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1335,7 +1335,7 @@ void ip_vs_protocol_net_cleanup(struct net *net);void ip_vs_control_net_cleanup (struct net *net);void ip_vs_estimator_net_cleanup (struct net *net);void ip_vs_sync_net_cleanup (struct net *net); -void ip_vs_service_net_cleanup (struct net *net); +void ip_vs_service_net_cleanup (struct netns_ipvs *ipvs);/* IPVS application functions * (from ip_vs_app.c)
net/netfilter/ipvs/ip_vs_core.c +4 -2
@@ -2110,13 +2110,15 @@ estimator_fail: static void __net_exit __ip_vs_cleanup(struct net *net) { -ip_vs_service_net_cleanup (net);/* ip_vs_flush() with locks */ +struct netns_ipvs *ipvs =net_ipvs (net); + +ip_vs_service_net_cleanup (ipvs);/* ip_vs_flush() with locks */ ip_vs_conn_net_cleanup (net);ip_vs_app_net_cleanup (net);ip_vs_protocol_net_cleanup (net);ip_vs_control_net_cleanup (net);ip_vs_estimator_net_cleanup (net); -IP_VS_DBG (2 ,"ipvs netns %d released\n" ,net_ipvs (net)->gen); +IP_VS_DBG (2 ,"ipvs netns %d released\n" , ipvs->gen); net->ipvs =NULL ; }
net/netfilter/ipvs/ip_vs_ctl.c +1 -2
@@ -1484,9 +1484,8 @@ static int ip_vs_flush(struct netns_ipvs *ipvs, bool cleanup)* Delete service by {netns} in the service table. * Called by __ip_vs_cleanup() */ -void ip_vs_service_net_cleanup (struct net *net) +void ip_vs_service_net_cleanup (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net);EnterFunction (2 );/* Check for "full" addressed entries */ mutex_lock (&__ip_vs_mutex);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 22/84 ipvs: Pass ipvs not net to ip_vs_zero_all
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +3 -4
@@ -1576,9 +1576,8 @@ static int ip_vs_zero_service(struct ip_vs_service *svc)return 0 ; } -static int ip_vs_zero_all (struct net *net) +static int ip_vs_zero_all (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net);int idx;struct ip_vs_service *svc;
@@ -2384,7 +2383,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)if (cmd ==IP_VS_SO_SET_ZERO ) {/* if no service address is set, zero counters in all */ if (!usvc.fwmark && !usvc.addr.ip && !usvc.port) { - ret =ip_vs_zero_all (net); + ret =ip_vs_zero_all (ipvs); goto out_unlock; } }
@@ -3530,7 +3529,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) goto out; }else if (cmd ==IPVS_CMD_ZERO && !info->attrs[IPVS_CMD_ATTR_SERVICE ]) { - ret =ip_vs_zero_all (net); + ret =ip_vs_zero_all (ipvs); goto out; }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 23/84 ipvs: Cache ipvs in ip_vs_in_icmp and ip_vs_in_icmp_v6
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +6 -2
@@ -1403,6 +1403,7 @@ static int ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) { struct net *net = NULL; +struct netns_ipvs *ipvs;struct iphdr *iph;struct icmphdr _icmph, *ic;struct iphdr _ciph, *cih;/* The ip header contained within the ICMP */
@@ -1452,6 +1453,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)return NF_ACCEPT ;/* The packet looks wrong, ignore */ net =skb_net (skb); + ipvs =net_ipvs (net);/* Special case for errors for IPIP packets */ ipip = false;
@@ -1493,7 +1495,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)if (!cp) {int v; -if (!sysctl_schedule_icmp (net_ipvs (net))) +if (!sysctl_schedule_icmp (ipvs))return NF_ACCEPT ;if (!ip_vs_try_to_schedule (AF_INET , skb, pd, &v, &cp, &ciph))
@@ -1589,6 +1591,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, unsigned int hooknum, struct ip_vs_iphdr *iph) { struct net *net = NULL; +struct netns_ipvs *ipvs;struct icmp6hdr _icmph, *ic;struct ip_vs_iphdr ciph = {.flags =0 , .fragoffs =0 };/*Contained IP */ struct ip_vs_conn *cp;
@@ -1629,6 +1632,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,return NF_ACCEPT ; net =skb_net (skb); + ipvs =net_ipvs (net); pd =ip_vs_proto_data_get (net, ciph.protocol);if (!pd)return NF_ACCEPT ;
@@ -1649,7 +1653,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,if (!cp) {int v; -if (!sysctl_schedule_icmp (net_ipvs (net))) +if (!sysctl_schedule_icmp (ipvs))return NF_ACCEPT ;if (!ip_vs_try_to_schedule (AF_INET6 , skb, pd, &v, &cp, &ciph))
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 24/84 ipvs: Pass ipvs not net to ip_vs_proto_data_get
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 8 ++++---- net/netfilter/ipvs/ip_vs_ctl.c | 12 +++++++----- net/netfilter/ipvs/ip_vs_proto.c | 12 ++---------- net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_tcp.c | 6 +++--- net/netfilter/ipvs/ip_vs_proto_udp.c | 4 ++-- net/netfilter/ipvs/ip_vs_sync.c | 2 +- 9 files changed, 24 insertions(+), 30 deletions(-)
include/net/ip_vs.h +1 -1
@@ -541,7 +541,7 @@ struct ip_vs_proto_data { };struct ip_vs_protocol *ip_vs_proto_get (unsigned short proto); -struct ip_vs_proto_data *ip_vs_proto_data_get (struct net *net, +struct ip_vs_proto_data *ip_vs_proto_data_get (struct netns_ipvs *ipvs,unsigned short proto);struct ip_vs_conn_param {
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -668,7 +668,7 @@ void ip_vs_try_bind_dest(struct ip_vs_conn *cp)#endif ip_vs_bind_xmit (cp); - pd =ip_vs_proto_data_get (cp->ipvs->net, cp->protocol); + pd =ip_vs_proto_data_get (cp->ipvs, cp->protocol);if (pd &&atomic_read (&pd->appcnt))ip_vs_bind_app (cp, pd->pp); }
@@ -876,7 +876,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af, {struct ip_vs_conn *cp;struct netns_ipvs *ipvs = p->ipvs; -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (p->ipvs->net, +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (p->ipvs, p->protocol); cp =kmem_cache_alloc (ip_vs_conn_cachep,GFP_ATOMIC );
net/netfilter/ipvs/ip_vs_core.c +4 -4
@@ -1237,7 +1237,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)return verdict; } - pd =ip_vs_proto_data_get (net, iph.protocol); + pd =ip_vs_proto_data_get (ipvs, iph.protocol);if (unlikely (!pd))return NF_ACCEPT ; pp = pd->pp;
@@ -1470,7 +1470,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) ipip = true; } - pd =ip_vs_proto_data_get (net, cih->protocol); + pd =ip_vs_proto_data_get (ipvs, cih->protocol);if (!pd)return NF_ACCEPT ; pp = pd->pp;
@@ -1633,7 +1633,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related, net =skb_net (skb); ipvs =net_ipvs (net); - pd =ip_vs_proto_data_get (net, ciph.protocol); + pd =ip_vs_proto_data_get (ipvs, ciph.protocol);if (!pd)return NF_ACCEPT ; pp = pd->pp;
@@ -1765,7 +1765,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) }/* Protocol supported? */ - pd =ip_vs_proto_data_get (net, iph.protocol); + pd =ip_vs_proto_data_get (ipvs, iph.protocol);if (unlikely (!pd)) {/* The only way we'll see this packet again is if it's * encapsulated, so mark it with ipvs_property=1 so we
net/netfilter/ipvs/ip_vs_ctl.c +7 -5
@@ -2205,6 +2205,7 @@ static const struct file_operations ip_vs_stats_percpu_fops = {static int ip_vs_set_timeout (struct net *net,struct ip_vs_timeout_user *u) {#if defined(CONFIG_IP_VS_PROTO_TCP ) || defined(CONFIG_IP_VS_PROTO_UDP ) +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd;#endif
@@ -2215,13 +2216,13 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u)#ifdef CONFIG_IP_VS_PROTO_TCP if (u->tcp_timeout) { - pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); + pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP ); pd->timeout_table[IP_VS_TCP_S_ESTABLISHED ] = u->tcp_timeout *HZ ; }if (u->tcp_fin_timeout) { - pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); + pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP ); pd->timeout_table[IP_VS_TCP_S_FIN_WAIT ] = u->tcp_fin_timeout *HZ ; }
@@ -2229,7 +2230,7 @@ static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u)#ifdef CONFIG_IP_VS_PROTO_UDP if (u->udp_timeout) { - pd =ip_vs_proto_data_get (net,IPPROTO_UDP ); + pd =ip_vs_proto_data_get (ipvs,IPPROTO_UDP ); pd->timeout_table[IP_VS_UDP_S_NORMAL ] = u->udp_timeout *HZ ; }
@@ -2589,18 +2590,19 @@ static inline void __ip_vs_get_timeouts(struct net *net, struct ip_vs_timeout_user *u) {#if defined(CONFIG_IP_VS_PROTO_TCP ) || defined(CONFIG_IP_VS_PROTO_UDP ) +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd;#endif memset (u,0 ,sizeof (*u));#ifdef CONFIG_IP_VS_PROTO_TCP - pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); + pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP ); u->tcp_timeout = pd->timeout_table[IP_VS_TCP_S_ESTABLISHED ] /HZ ; u->tcp_fin_timeout = pd->timeout_table[IP_VS_TCP_S_FIN_WAIT ] /HZ ;#endif #ifdef CONFIG_IP_VS_PROTO_UDP - pd =ip_vs_proto_data_get (net,IPPROTO_UDP ); + pd =ip_vs_proto_data_get (ipvs,IPPROTO_UDP ); u->udp_timeout = pd->timeout_table[IP_VS_UDP_S_NORMAL ] /HZ ;#endif
net/netfilter/ipvs/ip_vs_proto.c +2 -10
@@ -156,8 +156,8 @@ EXPORT_SYMBOL(ip_vs_proto_get);/* * get ip_vs_protocol object data by netns and proto */ -static struct ip_vs_proto_data * -__ipvs_proto_data_get (struct netns_ipvs *ipvs,unsigned short proto) +struct ip_vs_proto_data * +ip_vs_proto_data_get (struct netns_ipvs *ipvs,unsigned short proto) {struct ip_vs_proto_data *pd;unsigned int hash =IP_VS_PROTO_HASH (proto);
@@ -169,14 +169,6 @@ __ipvs_proto_data_get(struct netns_ipvs *ipvs, unsigned short proto)return NULL ; } - -struct ip_vs_proto_data * -ip_vs_proto_data_get (struct net *net,unsigned short proto) -{ -struct netns_ipvs *ipvs =net_ipvs (net); - -return __ipvs_proto_data_get (ipvs, proto); -}EXPORT_SYMBOL (ip_vs_proto_data_get);/*
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -2
@@ -494,7 +494,7 @@ static int sctp_register_app(struct net *net, struct ip_vs_app *inc)__be16 port = inc->port;int ret =0 ;struct netns_ipvs *ipvs =net_ipvs (net); -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_SCTP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_SCTP ); hash =sctp_app_hashkey (port);
@@ -513,7 +513,7 @@ out:static void sctp_unregister_app (struct net *net,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_SCTP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_SCTP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
net/netfilter/ipvs/ip_vs_proto_tcp.c +3 -3
@@ -602,7 +602,7 @@ static int tcp_register_app(struct net *net, struct ip_vs_app *inc)__be16 port = inc->port;int ret =0 ;struct netns_ipvs *ipvs =net_ipvs (net); -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP ); hash =tcp_app_hashkey (port);
@@ -623,7 +623,7 @@ static int tcp_register_app(struct net *net, struct ip_vs_app *inc)static void tcp_unregister_app (struct net *net,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_TCP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
@@ -679,7 +679,7 @@ tcp_app_conn_bind(struct ip_vs_conn *cp)*/ void ip_vs_tcp_conn_listen (struct net *net,struct ip_vs_conn *cp) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_TCP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_TCP );spin_lock_bh (&cp->lock); cp->state =IP_VS_TCP_S_LISTEN ;
net/netfilter/ipvs/ip_vs_proto_udp.c +2 -2
@@ -372,7 +372,7 @@ static int udp_register_app(struct net *net, struct ip_vs_app *inc)__be16 port = inc->port;int ret =0 ;struct netns_ipvs *ipvs =net_ipvs (net); -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_UDP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_UDP ); hash =udp_app_hashkey (port);
@@ -393,7 +393,7 @@ static int udp_register_app(struct net *net, struct ip_vs_app *inc)static void udp_unregister_app (struct net *net,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net,IPPROTO_UDP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_UDP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
net/netfilter/ipvs/ip_vs_sync.c +1 -1
@@ -941,7 +941,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, }else {struct ip_vs_proto_data *pd; - pd =ip_vs_proto_data_get (net, protocol); + pd =ip_vs_proto_data_get (ipvs, protocol);if (!(flags &IP_VS_CONN_F_TEMPLATE ) && pd && pd->timeout_table) cp->timeout = pd->timeout_table[state];else
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 25/84 ipvs: Pass ipvs not net to ip_vs_set_timeout
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -2202,10 +2202,9 @@ static const struct file_operations ip_vs_stats_percpu_fops = {/* * Set timeout values for tcp tcpfin udp in the timeout_table. */ -static int ip_vs_set_timeout (struct net *net,struct ip_vs_timeout_user *u) +static int ip_vs_set_timeout (struct netns_ipvs *ipvs,struct ip_vs_timeout_user *u) {#if defined(CONFIG_IP_VS_PROTO_TCP ) || defined(CONFIG_IP_VS_PROTO_UDP ) -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd;#endif
@@ -2369,7 +2368,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) goto out_unlock; }else if (cmd ==IP_VS_SO_SET_TIMEOUT ) {/* Set timeout values for (tcp tcpfin udp) */ - ret =ip_vs_set_timeout (net, (struct ip_vs_timeout_user *)arg); + ret =ip_vs_set_timeout (ipvs, (struct ip_vs_timeout_user *)arg); goto out_unlock; }
@@ -3461,6 +3460,7 @@ static int ip_vs_genl_del_daemon(struct net *net, struct nlattr **attrs)static int ip_vs_genl_set_config (struct net *net,struct nlattr **attrs) { +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_timeout_user t;__ip_vs_get_timeouts (net, &t);
@@ -3475,7 +3475,7 @@ static int ip_vs_genl_set_config(struct net *net, struct nlattr **attrs)if (attrs[IPVS_CMD_ATTR_TIMEOUT_UDP ]) t.udp_timeout =nla_get_u32 (attrs[IPVS_CMD_ATTR_TIMEOUT_UDP ]); -return ip_vs_set_timeout (net, &t); +return ip_vs_set_timeout (ipvs, &t); }static int ip_vs_genl_set_daemon (struct sk_buff *skb,struct genl_info *info)
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 26/84 ipvs: Pass ipvs not net to __ip_vs_get_service_entries
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -2477,11 +2477,10 @@ ip_vs_copy_service(struct ip_vs_service_entry *dst, struct ip_vs_service *src) }static inline int -__ip_vs_get_service_entries (struct net *net, +__ip_vs_get_service_entries (struct netns_ipvs *ipvs,const struct ip_vs_get_services *get,struct ip_vs_get_services __user *uptr) { -struct netns_ipvs *ipvs =net_ipvs (net);int idx, count=0 ;struct ip_vs_service *svc;struct ip_vs_service_entry entry;
@@ -2720,7 +2719,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) ret = -EINVAL ; goto out; } - ret =__ip_vs_get_service_entries (net, get, user); + ret =__ip_vs_get_service_entries (ipvs, get, user); }break ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 27/84 ipvs: Pass ipvs not net to __ip_vs_get_dest_entries
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -2528,10 +2528,9 @@ out: }static inline int -__ip_vs_get_dest_entries (struct net *net,const struct ip_vs_get_dests *get, +__ip_vs_get_dest_entries (struct netns_ipvs *ipvs,const struct ip_vs_get_dests *get,struct ip_vs_get_dests __user *uptr) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_service *svc;union nf_inet_addr addr = { .ip = get->addr };int ret =0 ;
@@ -2761,7 +2760,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) ret = -EINVAL ; goto out; } - ret =__ip_vs_get_dest_entries (net, get, user); + ret =__ip_vs_get_dest_entries (ipvs, get, user); }break ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 28/84 ipvs: Pass ipvs not net to __ip_vs_get_timeouts
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +6 -5
@@ -2584,10 +2584,9 @@ __ip_vs_get_dest_entries(struct netns_ipvs *ipvs, const struct ip_vs_get_dests * }static inline void -__ip_vs_get_timeouts (struct net *net,struct ip_vs_timeout_user *u) +__ip_vs_get_timeouts (struct netns_ipvs *ipvs,struct ip_vs_timeout_user *u) {#if defined(CONFIG_IP_VS_PROTO_TCP ) || defined(CONFIG_IP_VS_PROTO_UDP ) -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd;#endif
@@ -2768,7 +2767,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) {struct ip_vs_timeout_user t; -__ip_vs_get_timeouts (net, &t); +__ip_vs_get_timeouts (ipvs, &t);if (copy_to_user (user, &t,sizeof (t)) !=0 ) ret = -EFAULT ; }
@@ -3461,7 +3460,7 @@ static int ip_vs_genl_set_config(struct net *net, struct nlattr **attrs)struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_timeout_user t; -__ip_vs_get_timeouts (net, &t); +__ip_vs_get_timeouts (ipvs, &t);if (attrs[IPVS_CMD_ATTR_TIMEOUT_TCP ]) t.tcp_timeout =nla_get_u32 (attrs[IPVS_CMD_ATTR_TIMEOUT_TCP ]);
@@ -3637,8 +3636,10 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info)void *reply;int ret, cmd, reply_cmd;struct net *net; +struct netns_ipvs *ipvs; net =skb_sknet (skb); + ipvs =net_ipvs (net); cmd = info->genlhdr->cmd;if (cmd ==IPVS_CMD_GET_SERVICE )
@@ -3688,7 +3689,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info) {struct ip_vs_timeout_user t; -__ip_vs_get_timeouts (net, &t); +__ip_vs_get_timeouts (ipvs, &t);#ifdef CONFIG_IP_VS_PROTO_TCP if (nla_put_u32(msg, IPVS_CMD_ATTR_TIMEOUT_TCP, t.tcp_timeout) ||
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 29/84 ipvs: Pass ipvs not net to ip_vs_genl_parse_service
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -3034,12 +3034,11 @@ nla_put_failure:return skb->len; } -static int ip_vs_genl_parse_service (struct net *net, +static int ip_vs_genl_parse_service (struct netns_ipvs *ipvs,struct ip_vs_service_user_kern *usvc,struct nlattr *nla,int full_entry,struct ip_vs_service **ret_svc) { -struct netns_ipvs *ipvs =net_ipvs (net);struct nlattr *attrs[IPVS_SVC_ATTR_MAX +1 ];struct nlattr *nla_af, *nla_port, *nla_fwmark, *nla_protocol, *nla_addr;struct ip_vs_service *svc;
@@ -3123,11 +3122,12 @@ static int ip_vs_genl_parse_service(struct net *net,static struct ip_vs_service *ip_vs_genl_find_service (struct net *net,struct nlattr *nla) { +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_service_user_kern usvc;struct ip_vs_service *svc;int ret; - ret =ip_vs_genl_parse_service (net, &usvc, nla,0 , &svc); + ret =ip_vs_genl_parse_service (ipvs, &usvc, nla,0 , &svc);return ret ?ERR_PTR (ret) : svc; }
@@ -3538,7 +3538,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)if (cmd ==IPVS_CMD_NEW_SERVICE || cmd ==IPVS_CMD_SET_SERVICE ) need_full_svc =1 ; - ret =ip_vs_genl_parse_service (net, &usvc, + ret =ip_vs_genl_parse_service (ipvs, &usvc, info->attrs[IPVS_CMD_ATTR_SERVICE ], need_full_svc, &svc);if (ret)
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 30/84 ipvs: Pass ipvs not net to ip_vs_genl_find_service
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -3119,10 +3119,9 @@ static int ip_vs_genl_parse_service(struct netns_ipvs *ipvs,return 0 ; } -static struct ip_vs_service *ip_vs_genl_find_service (struct net *net, +static struct ip_vs_service *ip_vs_genl_find_service (struct netns_ipvs *ipvs,struct nlattr *nla) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_service_user_kern usvc;struct ip_vs_service *svc;int ret;
@@ -3203,6 +3202,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,struct ip_vs_dest *dest;struct nlattr *attrs[IPVS_CMD_ATTR_MAX +1 ];struct net *net =skb_sknet (skb); +struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&__ip_vs_mutex);
@@ -3212,7 +3212,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb, goto out_err; - svc =ip_vs_genl_find_service (net, attrs[IPVS_CMD_ATTR_SERVICE ]); + svc =ip_vs_genl_find_service (ipvs, attrs[IPVS_CMD_ATTR_SERVICE ]);if (IS_ERR (svc) || svc ==NULL ) goto out_err;
@@ -3668,7 +3668,7 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info) {struct ip_vs_service *svc; - svc =ip_vs_genl_find_service (net, + svc =ip_vs_genl_find_service (ipvs, info->attrs[IPVS_CMD_ATTR_SERVICE ]);if (IS_ERR (svc)) { ret =PTR_ERR (svc);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 31/84 ipvs: Pass ipvs not net to ip_vs_genl_new_daemon
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +3 -4
@@ -3374,9 +3374,8 @@ nla_put_failure:return skb->len; } -static int ip_vs_genl_new_daemon (struct net *net,struct nlattr **attrs) +static int ip_vs_genl_new_daemon (struct netns_ipvs *ipvs,struct nlattr **attrs) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ipvs_sync_daemon_cfg c;struct nlattr *a;int ret;
@@ -3433,7 +3432,7 @@ static int ip_vs_genl_new_daemon(struct net *net, struct nlattr **attrs)rtnl_lock ();mutex_lock (&ipvs->sync_mutex); - ret =start_sync_thread (net, &c, + ret =start_sync_thread (ipvs->net, &c,nla_get_u32 (attrs[IPVS_DAEMON_ATTR_STATE ]));mutex_unlock (&ipvs->sync_mutex);rtnl_unlock ();
@@ -3495,7 +3494,7 @@ static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info) goto out;if (cmd ==IPVS_CMD_NEW_DAEMON ) - ret =ip_vs_genl_new_daemon (net, daemon_attrs); + ret =ip_vs_genl_new_daemon (ipvs, daemon_attrs);else ret =ip_vs_genl_del_daemon (net, daemon_attrs); }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 32/84 ipvs: Pass ipvs not net to ip_vs_genl_del_daemon
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +3 -4
@@ -3439,16 +3439,15 @@ static int ip_vs_genl_new_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)return ret; } -static int ip_vs_genl_del_daemon (struct net *net,struct nlattr **attrs) +static int ip_vs_genl_del_daemon (struct netns_ipvs *ipvs,struct nlattr **attrs) { -struct netns_ipvs *ipvs =net_ipvs (net);int ret;if (!attrs[IPVS_DAEMON_ATTR_STATE ])return -EINVAL ;mutex_lock (&ipvs->sync_mutex); - ret =stop_sync_thread (net, + ret =stop_sync_thread (ipvs->net,nla_get_u32 (attrs[IPVS_DAEMON_ATTR_STATE ]));mutex_unlock (&ipvs->sync_mutex);return ret;
@@ -3496,7 +3495,7 @@ static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info)if (cmd ==IPVS_CMD_NEW_DAEMON ) ret =ip_vs_genl_new_daemon (ipvs, daemon_attrs);else - ret =ip_vs_genl_del_daemon (net, daemon_attrs); + ret =ip_vs_genl_del_daemon (ipvs, daemon_attrs); } out:
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 33/84 ipvs: Pass ipvs not net to start_sync_thread
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_sync.c | 11 +++++------ 3 files changed, 8 insertions(+), 9 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1449,7 +1449,7 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest)/* IPVS sync daemon data and function prototypes * (from ip_vs_sync.c) */ -int start_sync_thread (struct net *net,struct ipvs_sync_daemon_cfg *cfg, +int start_sync_thread (struct netns_ipvs *ipvs,struct ipvs_sync_daemon_cfg *cfg,int state);int stop_sync_thread (struct net *net,int state);void ip_vs_sync_conn (struct net *net,struct ip_vs_conn *cp,int pkts);
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -2350,7 +2350,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) cfg.syncid = dm->syncid;rtnl_lock ();mutex_lock (&ipvs->sync_mutex); - ret =start_sync_thread (net, &cfg, dm->state); + ret =start_sync_thread (ipvs, &cfg, dm->state);mutex_unlock (&ipvs->sync_mutex);rtnl_unlock (); }else {
@@ -3432,7 +3432,7 @@ static int ip_vs_genl_new_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)rtnl_lock ();mutex_lock (&ipvs->sync_mutex); - ret =start_sync_thread (ipvs->net, &c, + ret =start_sync_thread (ipvs, &c,nla_get_u32 (attrs[IPVS_DAEMON_ATTR_STATE ]));mutex_unlock (&ipvs->sync_mutex);rtnl_unlock ();
net/netfilter/ipvs/ip_vs_sync.c +5 -6
@@ -1778,13 +1778,12 @@ static int sync_thread_backup(void *data) } -int start_sync_thread (struct net *net,struct ipvs_sync_daemon_cfg *c, +int start_sync_thread (struct netns_ipvs *ipvs,struct ipvs_sync_daemon_cfg *c,int state) {struct ip_vs_sync_thread_data *tinfo;struct task_struct **array =NULL , *task;struct socket *sock; -struct netns_ipvs *ipvs =net_ipvs (net);struct net_device *dev;char *name;int (*threadfn)(void *data);
@@ -1811,7 +1810,7 @@ int start_sync_thread(struct net *net, struct ipvs_sync_daemon_cfg *c,if (!c->mcast_ttl) c->mcast_ttl =1 ; - dev =__dev_get_by_name (net, c->mcast_ifn); + dev =__dev_get_by_name (ipvs->net, c->mcast_ifn);if (!dev) {pr_err ("Unknown mcast interface: %s\n" , c->mcast_ifn);return -ENODEV ;
@@ -1873,9 +1872,9 @@ int start_sync_thread(struct net *net, struct ipvs_sync_daemon_cfg *c, tinfo =NULL ;for (id =0 ; id < count; id++) {if (state ==IP_VS_STATE_MASTER ) - sock =make_send_sock (net, id); + sock =make_send_sock (ipvs->net, id);else - sock =make_receive_sock (net, id); + sock =make_receive_sock (ipvs->net, id);if (IS_ERR (sock)) { result =PTR_ERR (sock); goto outtinfo;
@@ -1883,7 +1882,7 @@ int start_sync_thread(struct net *net, struct ipvs_sync_daemon_cfg *c, tinfo =kmalloc (sizeof (*tinfo),GFP_KERNEL );if (!tinfo) goto outsocket; - tinfo->net = net; + tinfo->net = ipvs->net; tinfo->sock = sock;if (state ==IP_VS_STATE_BACKUP ) { tinfo->buf = kmalloc(ipvs->bcfg.sync_maxlen,
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 34/84 ipvs: Pass ipvs not net to stop_sync_thread
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 ++-- net/netfilter/ipvs/ip_vs_sync.c | 7 +++---- 3 files changed, 6 insertions(+), 7 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1451,7 +1451,7 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest)*/ int start_sync_thread (struct netns_ipvs *ipvs,struct ipvs_sync_daemon_cfg *cfg,int state); -int stop_sync_thread (struct net *net,int state); +int stop_sync_thread (struct netns_ipvs *ipvs,int state);void ip_vs_sync_conn (struct net *net,struct ip_vs_conn *cp,int pkts);/* IPVS rate estimator prototypes (from ip_vs_est.c) */
net/netfilter/ipvs/ip_vs_ctl.c +2 -2
@@ -2355,7 +2355,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len)rtnl_unlock (); }else {mutex_lock (&ipvs->sync_mutex); - ret =stop_sync_thread (net, dm->state); + ret =stop_sync_thread (ipvs, dm->state);mutex_unlock (&ipvs->sync_mutex); } goto out_dec;
@@ -3447,7 +3447,7 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)return -EINVAL ;mutex_lock (&ipvs->sync_mutex); - ret =stop_sync_thread (ipvs->net, + ret =stop_sync_thread (ipvs,nla_get_u32 (attrs[IPVS_DAEMON_ATTR_STATE ]));mutex_unlock (&ipvs->sync_mutex);return ret;
net/netfilter/ipvs/ip_vs_sync.c +3 -4
@@ -1946,9 +1946,8 @@ out: } -int stop_sync_thread (struct net *net,int state) +int stop_sync_thread (struct netns_ipvs *ipvs,int state) { -struct netns_ipvs *ipvs =net_ipvs (net);struct task_struct **array;int id;int retc = -EINVAL ;
@@ -2030,11 +2029,11 @@ void ip_vs_sync_net_cleanup(struct net *net)struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&ipvs->sync_mutex); - retc =stop_sync_thread (net,IP_VS_STATE_MASTER ); + retc =stop_sync_thread (ipvs,IP_VS_STATE_MASTER );if (retc && retc != -ESRCH )pr_err ("Failed to stop Master Daemon\n" ); - retc =stop_sync_thread (net,IP_VS_STATE_BACKUP ); + retc =stop_sync_thread (ipvs,IP_VS_STATE_BACKUP );if (retc && retc != -ESRCH )pr_err ("Failed to stop Backup Daemon\n" );mutex_unlock (&ipvs->sync_mutex);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 35/84 ipvs: Pass ipvs not net to make_send_sock
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +3 -4
@@ -1493,16 +1493,15 @@ static void get_mcast_sockaddr(union ipvs_sockaddr *sa, int *salen,/* * Set up sending multicast socket over UDP */ -static struct socket *make_send_sock (struct net *net,int id) +static struct socket *make_send_sock (struct netns_ipvs *ipvs,int id) { -struct netns_ipvs *ipvs =net_ipvs (net);/* multicast addr */ union ipvs_sockaddr mcast_addr;struct socket *sock;int result, salen;/* First create a socket */ - result =sock_create_kern (net, ipvs->mcfg.mcast_af,SOCK_DGRAM , + result =sock_create_kern (ipvs->net, ipvs->mcfg.mcast_af,SOCK_DGRAM ,IPPROTO_UDP , &sock);if (result <0 ) {pr_err ("Error during creation of socket; terminating\n" );
@@ -1872,7 +1871,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c, tinfo =NULL ;for (id =0 ; id < count; id++) {if (state ==IP_VS_STATE_MASTER ) - sock =make_send_sock (ipvs->net, id); + sock =make_send_sock (ipvs, id);else sock =make_receive_sock (ipvs->net, id);if (IS_ERR (sock)) {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 36/84 ipvs: Pass ipvs not net to make_receive_sock
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +3 -4
@@ -1549,16 +1549,15 @@ error:/* * Set up receiving multicast socket over UDP */ -static struct socket *make_receive_sock (struct net *net,int id) +static struct socket *make_receive_sock (struct netns_ipvs *ipvs,int id) { -struct netns_ipvs *ipvs =net_ipvs (net);/* multicast addr */ union ipvs_sockaddr mcast_addr;struct socket *sock;int result, salen;/* First create a socket */ - result =sock_create_kern (net, ipvs->bcfg.mcast_af,SOCK_DGRAM , + result =sock_create_kern (ipvs->net, ipvs->bcfg.mcast_af,SOCK_DGRAM ,IPPROTO_UDP , &sock);if (result <0 ) {pr_err ("Error during creation of socket; terminating\n" );
@@ -1873,7 +1872,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c,if (state ==IP_VS_STATE_MASTER ) sock =make_send_sock (ipvs, id);else - sock =make_receive_sock (ipvs->net, id); + sock =make_receive_sock (ipvs, id);if (IS_ERR (sock)) { result =PTR_ERR (sock); goto outtinfo;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 37/84 ipvs: Store ipvs not net in struct ip_vs_sync_thread_data
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_sync.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +5 -5
@@ -193,7 +193,7 @@ union ip_vs_sync_conn {#define IPVS_OPT_F_PARAM (1 << (IPVS_OPT_PARAM-1))struct ip_vs_sync_thread_data { -struct net *net; +struct netns_ipvs *ipvs;struct socket *sock;char *buf;int id;
@@ -1685,7 +1685,7 @@ next_sync_buff(struct netns_ipvs *ipvs, struct ipvs_master_sync_state *ms)static int sync_thread_master (void *data) {struct ip_vs_sync_thread_data *tinfo = data; -struct netns_ipvs *ipvs =net_ipvs (tinfo->net); +struct netns_ipvs *ipvs = tinfo->ipvs;struct ipvs_master_sync_state *ms = &ipvs->ms[tinfo->id];struct sock *sk = tinfo->sock->sk;struct ip_vs_sync_buff *sb;
@@ -1741,7 +1741,7 @@ done:static int sync_thread_backup (void *data) {struct ip_vs_sync_thread_data *tinfo = data; -struct netns_ipvs *ipvs =net_ipvs (tinfo->net); +struct netns_ipvs *ipvs = tinfo->ipvs;int len; pr_info("sync thread started: state = BACKUP, mcast_ifn = %s, "
@@ -1763,7 +1763,7 @@ static int sync_thread_backup(void *data)break ; } -ip_vs_process_message (tinfo->net, tinfo->buf, len); +ip_vs_process_message (ipvs->net, tinfo->buf, len); } }
@@ -1880,7 +1880,7 @@ int start_sync_thread(struct netns_ipvs *ipvs, struct ipvs_sync_daemon_cfg *c, tinfo =kmalloc (sizeof (*tinfo),GFP_KERNEL );if (!tinfo) goto outsocket; - tinfo->net = ipvs->net; + tinfo->ipvs = ipvs; tinfo->sock = sock;if (state ==IP_VS_STATE_BACKUP ) { tinfo->buf = kmalloc(ipvs->bcfg.sync_maxlen,
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 38/84 ipvs: Pass ipvs not net to ip_vs_process_message
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +3 -4
@@ -1204,10 +1204,9 @@ out:* ip_vs_conn entries. * Handles Version 0 & 1 */ -static void ip_vs_process_message (struct net *net,__u8 *buffer, +static void ip_vs_process_message (struct netns_ipvs *ipvs,__u8 *buffer,const size_t buflen) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_sync_mesg *m2 = (struct ip_vs_sync_mesg *)buffer;__u8 *p, *msg_end;int i, nr_conns;
@@ -1257,7 +1256,7 @@ static void ip_vs_process_message(struct net *net, __u8 *buffer,return ; }/* Process a single sync_conn */ - retc =ip_vs_proc_sync_conn (net, p, msg_end); + retc =ip_vs_proc_sync_conn (ipvs->net, p, msg_end);if (retc <0 ) {IP_VS_ERR_RL ("BACKUP, Dropping buffer, Err: %d in decoding\n" , retc);
@@ -1763,7 +1762,7 @@ static int sync_thread_backup(void *data)break ; } -ip_vs_process_message (ipvs->net, tinfo->buf, len); +ip_vs_process_message (ipvs, tinfo->buf, len); } }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 39/84 ipvs: Pass ipvs not net to ip_vs_sync_conn_v0
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +3 -4
@@ -533,10 +533,9 @@ set:* Version 0 , could be switched in by sys_ctl. * Add an ip_vs_conn information into the current sync_buff. */ -static void ip_vs_sync_conn_v0 (struct net *net,struct ip_vs_conn *cp, +static void ip_vs_sync_conn_v0 (struct netns_ipvs *ipvs,struct ip_vs_conn *cp,int pkts) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_sync_mesg_v0 *m;struct ip_vs_sync_conn_v0 *s;struct ip_vs_sync_buff *buff;
@@ -615,7 +614,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp, pkts =atomic_add_return (1 , &cp->in_pkts); else pkts =sysctl_sync_threshold (ipvs); -ip_vs_sync_conn (net, cp, pkts); +ip_vs_sync_conn (ipvs->net, cp, pkts); } }
@@ -637,7 +636,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp, int pkts)/* Handle old version of the protocol */ if (sysctl_sync_ver (ipvs) ==0 ) { -ip_vs_sync_conn_v0 (net, cp, pkts); +ip_vs_sync_conn_v0 (ipvs, cp, pkts);return ; }/* Do not sync ONE PACKET */
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 40/84 ipvs: Pass ipvs not net to ip_vs_sync_conn
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 3 +-- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1452,7 +1452,7 @@ static inline void ip_vs_dest_put_and_free(struct ip_vs_dest *dest)int start_sync_thread (struct netns_ipvs *ipvs,struct ipvs_sync_daemon_cfg *cfg,int state);int stop_sync_thread (struct netns_ipvs *ipvs,int state); -void ip_vs_sync_conn (struct net *net,struct ip_vs_conn *cp,int pkts); +void ip_vs_sync_conn (struct netns_ipvs *ipvs,struct ip_vs_conn *cp,int pkts);/* IPVS rate estimator prototypes (from ip_vs_est.c) */ void ip_vs_start_estimator (struct net *net,struct ip_vs_stats *stats);
net/netfilter/ipvs/ip_vs_conn.c +1 -2
@@ -801,7 +801,6 @@ static void ip_vs_conn_expire(unsigned long data) {struct ip_vs_conn *cp = (struct ip_vs_conn *)data;struct netns_ipvs *ipvs = cp->ipvs; -struct net *net = ipvs->net;/* * do I control anybody?
@@ -847,7 +846,7 @@ static void ip_vs_conn_expire(unsigned long data) cp->timeout =60 *HZ ;if (ipvs->sync_state &IP_VS_STATE_MASTER ) -ip_vs_sync_conn (net, cp,sysctl_sync_threshold (ipvs)); +ip_vs_sync_conn (ipvs, cp,sysctl_sync_threshold (ipvs));ip_vs_conn_put (cp); }
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -1842,7 +1842,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af) pkts =atomic_add_return (1 , &cp->in_pkts);if (ipvs->sync_state &IP_VS_STATE_MASTER ) -ip_vs_sync_conn (net, cp, pkts); +ip_vs_sync_conn (ipvs, cp, pkts);ip_vs_conn_put (cp);return ret;
net/netfilter/ipvs/ip_vs_sync.c +2 -3
@@ -614,7 +614,7 @@ static void ip_vs_sync_conn_v0(struct netns_ipvs *ipvs, struct ip_vs_conn *cp, pkts =atomic_add_return (1 , &cp->in_pkts); else pkts =sysctl_sync_threshold (ipvs); -ip_vs_sync_conn (ipvs->net, cp, pkts); +ip_vs_sync_conn (ipvs, cp, pkts); } }
@@ -623,9 +623,8 @@ static void ip_vs_sync_conn_v0(struct netns_ipvs *ipvs, struct ip_vs_conn *cp,* Called by ip_vs_in. * Sending Version 1 messages */ -void ip_vs_sync_conn (struct net *net,struct ip_vs_conn *cp,int pkts) +void ip_vs_sync_conn (struct netns_ipvs *ipvs,struct ip_vs_conn *cp,int pkts) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_sync_mesg *m;union ip_vs_sync_conn *s;struct ip_vs_sync_buff *buff;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 41/84 ipvs: Pass ipvs not net to ip_vs_proc_conn
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +6 -6
@@ -835,7 +835,7 @@ ip_vs_conn_fill_param_sync(struct netns_ipvs *ipvs, int af, union ip_vs_sync_con* Param: ... * timeout is in sec. */ -static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, +static void ip_vs_proc_conn(struct netns_ipvs *ipvs, struct ip_vs_conn_param *param, unsigned int flags, unsigned int state, unsigned int protocol, unsigned int type, const union nf_inet_addr *daddr, __be16 dport,
@@ -844,7 +844,6 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param, {struct ip_vs_dest *dest;struct ip_vs_conn *cp; -struct netns_ipvs *ipvs =net_ipvs (net);if (!(flags &IP_VS_CONN_F_TEMPLATE )) { cp =ip_vs_conn_in_get (param);
@@ -1014,7 +1013,7 @@ static void ip_vs_process_message_v0(struct netns_ipvs *ipvs, const char *buffer s->vport, ¶m);/* Send timeout as Zero */ -ip_vs_proc_conn (ipvs->net, ¶m, flags, state, s->protocol,AF_INET , +ip_vs_proc_conn (ipvs, ¶m, flags, state, s->protocol,AF_INET , (union nf_inet_addr *)&s->daddr, s->dport,0 ,0 , opt); }
@@ -1067,6 +1066,7 @@ static int ip_vs_proc_str(__u8 *p, unsigned int plen, unsigned int *data_len,*/ static inline int ip_vs_proc_sync_conn (struct net *net,__u8 *p,__u8 *msg_end) { +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_sync_conn_options opt;union ip_vs_sync_conn *s;struct ip_vs_protocol *pp;
@@ -1169,21 +1169,21 @@ static inline int ip_vs_proc_sync_conn(struct net *net, __u8 *p, __u8 *msg_end) state =0 ; } } -if (ip_vs_conn_fill_param_sync (net_ipvs (net), af, s, ¶m, pe_data, +if (ip_vs_conn_fill_param_sync (ipvs, af, s, ¶m, pe_data, pe_data_len, pe_name, pe_name_len)) { retc =50 ; goto out; }/* If only IPv4, just silent skip IPv6 */ if (af ==AF_INET ) -ip_vs_proc_conn (net, ¶m, flags, state, s->v4.protocol, af, +ip_vs_proc_conn (ipvs, ¶m, flags, state, s->v4.protocol, af, (union nf_inet_addr *)&s->v4.daddr, s->v4.dport,ntohl (s->v4.timeout),ntohl (s->v4.fwmark), (opt_flags &IPVS_OPT_F_SEQ_DATA ? &opt :NULL ) );#ifdef CONFIG_IP_VS_IPV6 else - ip_vs_proc_conn(net, ¶m, flags, state, s->v6.protocol, af, + ip_vs_proc_conn(ipvs, ¶m, flags, state, s->v6.protocol, af, (union nf_inet_addr *)&s->v6.daddr, s->v6.dport,ntohl (s->v6.timeout),ntohl (s->v6.fwmark), (opt_flags &IPVS_OPT_F_SEQ_DATA ? &opt :NULL )
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 42/84 ipvs: Pass ipvs not net to ip_vs_proc_sync_conn
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_sync.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_sync.c +2 -3
@@ -1064,9 +1064,8 @@ static int ip_vs_proc_str(__u8 *p, unsigned int plen, unsigned int *data_len,/* * Process a Version 1 sync. connection */ -static inline int ip_vs_proc_sync_conn (struct net *net,__u8 *p,__u8 *msg_end) +static inline int ip_vs_proc_sync_conn (struct netns_ipvs *ipvs,__u8 *p,__u8 *msg_end) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_sync_conn_options opt;union ip_vs_sync_conn *s;struct ip_vs_protocol *pp;
@@ -1254,7 +1253,7 @@ static void ip_vs_process_message(struct netns_ipvs *ipvs, __u8 *buffer,return ; }/* Process a single sync_conn */ - retc =ip_vs_proc_sync_conn (ipvs->net, p, msg_end); + retc =ip_vs_proc_sync_conn (ipvs, p, msg_end);if (retc <0 ) {IP_VS_ERR_RL ("BACKUP, Dropping buffer, Err: %d in decoding\n" , retc);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 43/84 ipvs: Pass ipvs not net to ip_vs_sync_net_init
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1328,7 +1328,7 @@ int ip_vs_control_net_init(struct net *net);int ip_vs_protocol_net_init (struct net *net);int ip_vs_app_net_init (struct net *net);int ip_vs_conn_net_init (struct net *net); -int ip_vs_sync_net_init (struct net *net); +int ip_vs_sync_net_init (struct netns_ipvs *ipvs);void ip_vs_conn_net_cleanup (struct net *net);void ip_vs_app_net_cleanup (struct net *net);void ip_vs_protocol_net_cleanup (struct net *net);
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -2087,7 +2087,7 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_conn_net_init (net) <0 ) goto conn_fail; -if (ip_vs_sync_net_init (net) <0 ) +if (ip_vs_sync_net_init (ipvs) <0 ) goto sync_fail; printk(KERN_INFO "IPVS: Creating netns size=%zu id=%d\n",
net/netfilter/ipvs/ip_vs_sync.c +1 -2
@@ -2007,10 +2007,8 @@ int stop_sync_thread(struct netns_ipvs *ipvs, int state)/* * Initialize data struct for each netns */ -int __net_init ip_vs_sync_net_init (struct net *net) +int __net_init ip_vs_sync_net_init (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net);
Simon Horman
maintainerPATCH 44/84 ipvs: Pass ipvs not net to ip_vs_sync_net_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_core.c | 5 +++-- net/netfilter/ipvs/ip_vs_sync.c | 3 +-- 3 files changed, 5 insertions(+), 5 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1334,7 +1334,7 @@ void ip_vs_app_net_cleanup(struct net *net);void ip_vs_protocol_net_cleanup (struct net *net);void ip_vs_control_net_cleanup (struct net *net);void ip_vs_estimator_net_cleanup (struct net *net); -void ip_vs_sync_net_cleanup (struct net *net); +void ip_vs_sync_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_service_net_cleanup (struct netns_ipvs *ipvs);/* IPVS application functions
net/netfilter/ipvs/ip_vs_core.c +3 -2
@@ -2128,10 +2128,11 @@ static void __net_exit __ip_vs_cleanup(struct net *net) static void __net_exit __ip_vs_dev_cleanup(struct net *net) { +struct netns_ipvs *ipvs =net_ipvs (net);EnterFunction (2 ); -net_ipvs (net)->enable =0 ;/* Disable packet reception */ + ipvs->enable =0 ;/* Disable packet reception */ smp_wmb (); -ip_vs_sync_net_cleanup (net); +ip_vs_sync_net_cleanup (ipvs);LeaveFunction (2 ); }
net/netfilter/ipvs/ip_vs_sync.c +1 -2
@@ -2015,10 +2015,9 @@ int __net_init ip_vs_sync_net_init(struct netns_ipvs *ipvs)return 0 ; } -void ip_vs_sync_net_cleanup (struct net *net) +void ip_vs_sync_net_cleanup (struct netns_ipvs *ipvs) {int retc; -struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&ipvs->sync_mutex); retc =stop_sync_thread (ipvs,IP_VS_STATE_MASTER );
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 45/84 ipvs: Pass ipvs not net to ip_vs_genl_set_config
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +2 -3
@@ -3453,9 +3453,8 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)return ret; } -static int ip_vs_genl_set_config (struct net *net,struct nlattr **attrs) +static int ip_vs_genl_set_config (struct netns_ipvs *ipvs,struct nlattr **attrs) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_timeout_user t;__ip_vs_get_timeouts (ipvs, &t);
@@ -3522,7 +3521,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) ret =ip_vs_flush (ipvs, false); goto out; }else if (cmd ==IPVS_CMD_SET_CONFIG ) { - ret =ip_vs_genl_set_config (net, info->attrs); + ret =ip_vs_genl_set_config (ipvs, info->attrs); goto out; }else if (cmd ==IPVS_CMD_ZERO && !info->attrs[IPVS_CMD_ATTR_SERVICE ]) {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 46/84 ipvs: Pass ipvs not net to ip_vs_start_estimator aned ip_vs_stop_estimator
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_ctl.c | 12 ++++++------ net/netfilter/ipvs/ip_vs_est.c | 6 ++---- 3 files changed, 10 insertions(+), 12 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1455,8 +1455,8 @@ int stop_sync_thread(struct netns_ipvs *ipvs, int state);void ip_vs_sync_conn (struct netns_ipvs *ipvs,struct ip_vs_conn *cp,int pkts);/* IPVS rate estimator prototypes (from ip_vs_est.c) */ -void ip_vs_start_estimator (struct net *net,struct ip_vs_stats *stats); -void ip_vs_stop_estimator (struct net *net,struct ip_vs_stats *stats); +void ip_vs_start_estimator (struct netns_ipvs *ipvs,struct ip_vs_stats *stats); +void ip_vs_stop_estimator (struct netns_ipvs *ipvs,struct ip_vs_stats *stats);void ip_vs_zero_estimator (struct ip_vs_stats *stats);void ip_vs_read_estimator (struct ip_vs_kstats *dst,struct ip_vs_stats *stats);
net/netfilter/ipvs/ip_vs_ctl.c +6 -6
@@ -840,7 +840,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,spin_unlock_bh (&dest->dst_lock);if (add) { -ip_vs_start_estimator (svc->ipvs->net, &dest->stats); +ip_vs_start_estimator (svc->ipvs, &dest->stats);list_add_rcu (&dest->n_list, &svc->destinations); svc->num_dests++; sched =rcu_dereference_protected (svc->scheduler,1 );
@@ -1036,7 +1036,7 @@ ip_vs_edit_dest(struct ip_vs_service *svc, struct ip_vs_dest_user_kern *udest)static void __ip_vs_del_dest (struct netns_ipvs *ipvs,struct ip_vs_dest *dest,bool cleanup) { -ip_vs_stop_estimator (ipvs->net, &dest->stats); +ip_vs_stop_estimator (ipvs, &dest->stats);/* * Remove it from the d-linked list with the real services.
@@ -1254,7 +1254,7 @@ ip_vs_add_service(struct netns_ipvs *ipvs, struct ip_vs_service_user_kern *u,else if (svc->port ==0 )atomic_inc (&ipvs->nullsvc_counter); -ip_vs_start_estimator (ipvs->net, &svc->stats); +ip_vs_start_estimator (ipvs, &svc->stats);/* Count only IPv4 services for old get/setsockopt interface */ if (svc->af ==AF_INET )
@@ -1382,7 +1382,7 @@ static void __ip_vs_del_service(struct ip_vs_service *svc, bool cleanup)if (svc->af ==AF_INET ) ipvs->num_services--; -ip_vs_stop_estimator (svc->ipvs->net, &svc->stats); +ip_vs_stop_estimator (svc->ipvs, &svc->stats);/* Unbind scheduler */ old_sched =rcu_dereference_protected (svc->scheduler,1 );
@@ -3917,7 +3917,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)kfree (tbl);return -ENOMEM ; } -ip_vs_start_estimator (net, &ipvs->tot_stats); +ip_vs_start_estimator (ipvs, &ipvs->tot_stats); ipvs->sysctl_tbl = tbl;/* Schedule defense work */ INIT_DELAYED_WORK (&ipvs->defense_work, defense_work_handler);
@@ -3933,7 +3933,7 @@ static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net)cancel_delayed_work_sync (&ipvs->defense_work);cancel_work_sync (&ipvs->defense_work.work);unregister_net_sysctl_table (ipvs->sysctl_hdr); -ip_vs_stop_estimator (net, &ipvs->tot_stats); +ip_vs_stop_estimator (ipvs, &ipvs->tot_stats);if (!net_eq (net, &init_net))kfree (ipvs->sysctl_tbl);
net/netfilter/ipvs/ip_vs_est.c +2 -4
@@ -140,9 +140,8 @@ static void estimation_timer(unsigned long arg)mod_timer (&ipvs->est_timer, jiffies +2 *HZ ); } -void ip_vs_start_estimator (struct net *net,struct ip_vs_stats *stats) +void ip_vs_start_estimator (struct netns_ipvs *ipvs,struct ip_vs_stats *stats) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_estimator *est = &stats->est;INIT_LIST_HEAD (&est->list);
@@ -152,9 +151,8 @@ void ip_vs_start_estimator(struct net *net, struct ip_vs_stats *stats)spin_unlock_bh (&ipvs->est_lock); } -void ip_vs_stop_estimator (struct net *net,struct ip_vs_stats *stats) +void ip_vs_stop_estimator (struct netns_ipvs *ipvs,struct ip_vs_stats *stats) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_estimator *est = &stats->est;spin_lock_bh (&ipvs->est_lock);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 47/84 ipvs: Pass ipvs not net to ip_vs_random_drop_entry
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_ctl.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1258,7 +1258,7 @@ const char *ip_vs_state_name(__u16 proto, int state);void ip_vs_tcp_conn_listen (struct net *net,struct ip_vs_conn *cp);int ip_vs_check_template (struct ip_vs_conn *ct); -void ip_vs_random_dropentry (struct net *net); +void ip_vs_random_dropentry (struct netns_ipvs *ipvs);int ip_vs_conn_init (void );void ip_vs_conn_cleanup (void );
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -1239,7 +1239,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp) }/* Called from keventd and must protect itself from softirqs */ -void ip_vs_random_dropentry (struct net *net) +void ip_vs_random_dropentry (struct netns_ipvs *ipvs) {int idx;struct ip_vs_conn *cp, *cp_c;
@@ -1255,7 +1255,7 @@ void ip_vs_random_dropentry(struct net *net)if (cp->flags &IP_VS_CONN_F_TEMPLATE )/* connection template */ continue ; -if (!net_eq (cp->ipvs->net, net)) +if (cp->ipvs != ipvs)continue ;if (cp->protocol ==IPPROTO_TCP ) {switch (cp->state) {
net/netfilter/ipvs/ip_vs_ctl.c +1 -1
@@ -228,7 +228,7 @@ static void defense_work_handler(struct work_struct *work)update_defense_level (ipvs);if (atomic_read (&ipvs->dropentry)) -ip_vs_random_dropentry (ipvs->net); +ip_vs_random_dropentry (ipvs); schedule_delayed_work(&ipvs->defense_work, DEFENSE_TIMER_PERIOD); }#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 48/84 ipvs: Pass ipvs not net to ip_vs_control_net_(init|cleanup)_sysctl
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_ctl.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_ctl.c +8 -8
@@ -3841,10 +3841,10 @@ static void ip_vs_genl_unregister(void)* per netns intit/exit func. */ #ifdef CONFIG_SYSCTL -static int __net_init ip_vs_control_net_init_sysctl (struct net *net) +static int __net_init ip_vs_control_net_init_sysctl (struct netns_ipvs *ipvs) { +struct net *net = ipvs->net;int idx; -struct netns_ipvs *ipvs =net_ipvs (net);struct ctl_table *tbl;atomic_set (&ipvs->dropentry,0 );
@@ -3926,9 +3926,9 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)return 0 ; } -static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) +static void __net_exit ip_vs_control_net_cleanup_sysctl(struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;cancel_delayed_work_sync (&ipvs->defense_work);cancel_work_sync (&ipvs->defense_work.work);
@@ -3941,8 +3941,8 @@ static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net)#else -static int __net_init ip_vs_control_net_init_sysctl (struct net *net) {return 0 ; } -static void __net_exit ip_vs_control_net_cleanup_sysctl(struct net *net) { } +static int __net_init ip_vs_control_net_init_sysctl (struct netns_ipvs *ipvs) {return 0 ; } +static void __net_exit ip_vs_control_net_cleanup_sysctl(struct netns_ipvs *ipvs) { }#endif
@@ -3984,7 +3984,7 @@ int __net_init ip_vs_control_net_init(struct net *net)proc_create ("ip_vs_stats_percpu" ,0 , net->proc_net, &ip_vs_stats_percpu_fops); -if (ip_vs_control_net_init_sysctl (net)) +if (ip_vs_control_net_init_sysctl (ipvs)) goto err;return 0 ;
@@ -3999,7 +3999,7 @@ void __net_exit ip_vs_control_net_cleanup(struct net *net)struct netns_ipvs *ipvs =net_ipvs (net);ip_vs_trash_cleanup (ipvs); -ip_vs_control_net_cleanup_sysctl (net); +ip_vs_control_net_cleanup_sysctl (ipvs);remove_proc_entry ("ip_vs_stats_percpu" , net->proc_net);remove_proc_entry ("ip_vs_stats" , net->proc_net);remove_proc_entry ("ip_vs" , net->proc_net);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 49/84 ipvs: Pass ipvs not net into ip_vs_control_net_(init|cleanup)
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_ctl.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1324,7 +1324,7 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)/* IPVS netns init & cleanup functions */ int ip_vs_estimator_net_init (struct net *net); -int ip_vs_control_net_init (struct net *net); +int ip_vs_control_net_init (struct netns_ipvs *ipvs);int ip_vs_protocol_net_init (struct net *net);int ip_vs_app_net_init (struct net *net);int ip_vs_conn_net_init (struct net *net);
@@ -1332,7 +1332,7 @@ int ip_vs_sync_net_init(struct netns_ipvs *ipvs);void ip_vs_conn_net_cleanup (struct net *net);void ip_vs_app_net_cleanup (struct net *net);void ip_vs_protocol_net_cleanup (struct net *net); -void ip_vs_control_net_cleanup (struct net *net); +void ip_vs_control_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_estimator_net_cleanup (struct net *net);void ip_vs_sync_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_service_net_cleanup (struct netns_ipvs *ipvs);
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -2075,7 +2075,7 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_estimator_net_init (net) <0 ) goto estimator_fail; -if (ip_vs_control_net_init (net) <0 ) +if (ip_vs_control_net_init (ipvs) <0 ) goto control_fail;if (ip_vs_protocol_net_init (net) <0 )
@@ -2104,7 +2104,7 @@ conn_fail: app_fail:ip_vs_protocol_net_cleanup (net); protocol_fail: -ip_vs_control_net_cleanup (net); +ip_vs_control_net_cleanup (ipvs); control_fail:ip_vs_estimator_net_cleanup (net); estimator_fail:
@@ -2120,7 +2120,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)ip_vs_conn_net_cleanup (net);ip_vs_app_net_cleanup (net);ip_vs_protocol_net_cleanup (net); -ip_vs_control_net_cleanup (net); +ip_vs_control_net_cleanup (ipvs);ip_vs_estimator_net_cleanup (net);IP_VS_DBG (2 ,"ipvs netns %d released\n" , ipvs->gen); net->ipvs =NULL ;
net/netfilter/ipvs/ip_vs_ctl.c +4 -4
@@ -3950,10 +3950,10 @@ static struct notifier_block ip_vs_dst_notifier = { .notifier_call = ip_vs_dst_event, }; -int __net_init ip_vs_control_net_init (struct net *net) +int __net_init ip_vs_control_net_init (struct netns_ipvs *ipvs) { +struct net *net = ipvs->net;int i, idx; -struct netns_ipvs *ipvs =net_ipvs (net);/* Initialize rs_table */ for (idx =0 ; idx <IP_VS_RTAB_SIZE ; idx++)
@@ -3994,9 +3994,9 @@ err:return -ENOMEM ; } -void __net_exit ip_vs_control_net_cleanup(struct net *net) +void __net_exit ip_vs_control_net_cleanup(struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;ip_vs_trash_cleanup (ipvs);ip_vs_control_net_cleanup_sysctl (ipvs);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 50/84 ipvs: Pass ipvs not net to estimation_timer
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_est.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_est.c +2 -4
@@ -102,10 +102,8 @@ static void estimation_timer(unsigned long arg)struct ip_vs_estimator *e;struct ip_vs_stats *s;u64 rate; -struct net *net = (struct net *)arg; -struct netns_ipvs *ipvs; +struct netns_ipvs *ipvs = (struct netns_ipvs *)arg; - ipvs =net_ipvs (net);spin_lock (&ipvs->est_lock);list_for_each_entry (e, &ipvs->est_list, list) { s = container_of(e, struct ip_vs_stats, est);
@@ -196,7 +194,7 @@ int __net_init ip_vs_estimator_net_init(struct net *net)INIT_LIST_HEAD (&ipvs->est_list);spin_lock_init (&ipvs->est_lock); -setup_timer (&ipvs->est_timer, estimation_timer, (unsigned long )net); +setup_timer (&ipvs->est_timer, estimation_timer, (unsigned long )ipvs);mod_timer (&ipvs->est_timer, jiffies +2 *HZ );return 0 ; }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 51/84 ipvs: Pass ipvs not net to ip_vs_estimator_net_init and ip_vs_estimator_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_est.c | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1323,7 +1323,7 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp) }/* IPVS netns init & cleanup functions */ -int ip_vs_estimator_net_init (struct net *net); +int ip_vs_estimator_net_init (struct netns_ipvs *ipvs);int ip_vs_control_net_init (struct netns_ipvs *ipvs);int ip_vs_protocol_net_init (struct net *net);int ip_vs_app_net_init (struct net *net);
@@ -1333,7 +1333,7 @@ void ip_vs_conn_net_cleanup(struct net *net);void ip_vs_app_net_cleanup (struct net *net);void ip_vs_protocol_net_cleanup (struct net *net);void ip_vs_control_net_cleanup (struct netns_ipvs *ipvs); -void ip_vs_estimator_net_cleanup (struct net *net); +void ip_vs_estimator_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_sync_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_service_net_cleanup (struct netns_ipvs *ipvs);
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -2072,7 +2072,7 @@ static int __net_init __ip_vs_init(struct net *net)atomic_inc (&ipvs_netns_cnt); net->ipvs = ipvs; -if (ip_vs_estimator_net_init (net) <0 ) +if (ip_vs_estimator_net_init (ipvs) <0 ) goto estimator_fail;if (ip_vs_control_net_init (ipvs) <0 )
@@ -2106,7 +2106,7 @@ app_fail: protocol_fail:ip_vs_control_net_cleanup (ipvs); control_fail: -ip_vs_estimator_net_cleanup (net); +ip_vs_estimator_net_cleanup (ipvs); estimator_fail: net->ipvs =NULL ;return -ENOMEM ;
@@ -2121,7 +2121,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)ip_vs_app_net_cleanup (net);ip_vs_protocol_net_cleanup (net);ip_vs_control_net_cleanup (ipvs); -ip_vs_estimator_net_cleanup (net); +ip_vs_estimator_net_cleanup (ipvs);IP_VS_DBG (2 ,"ipvs netns %d released\n" , ipvs->gen); net->ipvs =NULL ; }
net/netfilter/ipvs/ip_vs_est.c +3 -5
@@ -188,10 +188,8 @@ void ip_vs_read_estimator(struct ip_vs_kstats *dst, struct ip_vs_stats *stats) dst->outbps = (e->outbps +0xF ) >>5 ; } -int __net_init ip_vs_estimator_net_init (struct net *net) +int __net_init ip_vs_estimator_net_init (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); -INIT_LIST_HEAD (&ipvs->est_list);spin_lock_init (&ipvs->est_lock);setup_timer (&ipvs->est_timer, estimation_timer, (unsigned long )ipvs);
@@ -199,7 +197,7 @@ int __net_init ip_vs_estimator_net_init(struct net *net)return 0 ; } -void __net_exit ip_vs_estimator_net_cleanup(struct net *net) +void __net_exit ip_vs_estimator_net_cleanup(struct netns_ipvs *ipvs) { -del_timer_sync (&net_ipvs (net)->est_timer); +del_timer_sync (&ipvs->est_timer); }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 52/84 ipvs: Pass ipvs not net into register_app and unregister_app
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_app.c | 6 ++++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 7 +++---- net/netfilter/ipvs/ip_vs_proto_tcp.c | 7 +++---- net/netfilter/ipvs/ip_vs_proto_udp.c | 7 +++---- 5 files changed, 15 insertions(+), 16 deletions(-)
include/net/ip_vs.h +2 -2
@@ -517,9 +517,9 @@ struct ip_vs_protocol {const struct sk_buff *skb, struct ip_vs_proto_data *pd); -int (*register_app)(struct net *net,struct ip_vs_app *inc); +int (*register_app)(struct netns_ipvs *ipvs,struct ip_vs_app *inc); -void (*unregister_app)(struct net *net,struct ip_vs_app *inc); +void (*unregister_app)(struct netns_ipvs *ipvs,struct ip_vs_app *inc);int (*app_conn_bind)(struct ip_vs_conn *cp);
net/netfilter/ipvs/ip_vs_app.c +4 -2
@@ -78,6 +78,7 @@ static int ip_vs_app_inc_new(struct net *net, struct ip_vs_app *app, __u16 proto, __u16 port) { + struct netns_ipvs *ipvs = net_ipvs(net);struct ip_vs_protocol *pp;struct ip_vs_app *inc;int ret;
@@ -107,7 +108,7 @@ ip_vs_app_inc_new(struct net *net, struct ip_vs_app *app, __u16 proto, } } - ret = pp->register_app (net, inc); + ret = pp->register_app (ipvs, inc);if (ret) goto out;
@@ -129,13 +130,14 @@ ip_vs_app_inc_new(struct net *net, struct ip_vs_app *app, __u16 proto,static void ip_vs_app_inc_release (struct net *net,struct ip_vs_app *inc) { +struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_protocol *pp;if (!(pp =ip_vs_proto_get (inc->protocol)))return ;if (pp->unregister_app) - pp->unregister_app (net, inc); + pp->unregister_app (ipvs, inc);IP_VS_DBG (9 ,"%s App %s:%u unregistered\n" , pp->name, inc->name,ntohs (inc->port));
net/netfilter/ipvs/ip_vs_proto_sctp.c +3 -4
@@ -487,13 +487,12 @@ static inline __u16 sctp_app_hashkey(__be16 port) &SCTP_APP_TAB_MASK ; } -static int sctp_register_app (struct net *net,struct ip_vs_app *inc) +static int sctp_register_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) {struct ip_vs_app *i;__u16 hash;__be16 port = inc->port;int ret =0 ; -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_SCTP ); hash =sctp_app_hashkey (port);
@@ -511,9 +510,9 @@ out:return ret; } -static void sctp_unregister_app (struct net *net,struct ip_vs_app *inc) +static void sctp_unregister_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_SCTP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_SCTP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
net/netfilter/ipvs/ip_vs_proto_tcp.c +3 -4
@@ -595,13 +595,12 @@ static inline __u16 tcp_app_hashkey(__be16 port) } -static int tcp_register_app (struct net *net,struct ip_vs_app *inc) +static int tcp_register_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) {struct ip_vs_app *i;__u16 hash;__be16 port = inc->port;int ret =0 ; -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP ); hash =tcp_app_hashkey (port);
@@ -621,9 +620,9 @@ static int tcp_register_app(struct net *net, struct ip_vs_app *inc)static void -tcp_unregister_app (struct net *net,struct ip_vs_app *inc) +tcp_unregister_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_TCP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_TCP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
net/netfilter/ipvs/ip_vs_proto_udp.c +3 -4
@@ -365,13 +365,12 @@ static inline __u16 udp_app_hashkey(__be16 port) } -static int udp_register_app (struct net *net,struct ip_vs_app *inc) +static int udp_register_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) {struct ip_vs_app *i;__u16 hash;__be16 port = inc->port;int ret =0 ; -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_UDP ); hash =udp_app_hashkey (port);
@@ -391,9 +390,9 @@ static int udp_register_app(struct net *net, struct ip_vs_app *inc)static void -udp_unregister_app (struct net *net,struct ip_vs_app *inc) +udp_unregister_app (struct netns_ipvs *ipvs,struct ip_vs_app *inc) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_UDP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (ipvs,IPPROTO_UDP );atomic_dec (&pd->appcnt);list_del_rcu (&inc->p_list);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 53/84 ipvs: Pass ipvs not net into ip_vs_app_inc_new
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_app.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_app.c +3 -3
@@ -75,10 +75,9 @@ static void ip_vs_app_inc_rcu_free(struct rcu_head *head)* Allocate/initialize app incarnation and register it in proto apps. */ static int -ip_vs_app_inc_new (struct net *net,struct ip_vs_app *app,__u16 proto, +ip_vs_app_inc_new (struct netns_ipvs *ipvs,struct ip_vs_app *app,__u16 proto,__u16 port) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_protocol *pp;struct ip_vs_app *inc;int ret;
@@ -180,11 +179,12 @@ int register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app, __u16 proto, __u16 port) { + struct netns_ipvs *ipvs = net_ipvs(net);int result;mutex_lock (&__ip_vs_app_mutex); - result =ip_vs_app_inc_new (net, app, proto, port); + result =ip_vs_app_inc_new (ipvs, app, proto, port);mutex_unlock (&__ip_vs_app_mutex);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 54/84 ipvs: Pass ipvs not net to register_ip_vs_app_inc
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_app.c | 3 +-- net/netfilter/ipvs/ip_vs_ftp.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1345,7 +1345,7 @@ struct ip_vs_app *register_ip_vs_app(struct net *net, struct ip_vs_app *app);void unregister_ip_vs_app (struct net *net,struct ip_vs_app *app);int ip_vs_bind_app (struct ip_vs_conn *cp,struct ip_vs_protocol *pp);void ip_vs_unbind_app (struct ip_vs_conn *cp); -int register_ip_vs_app_inc (struct net *net,struct ip_vs_app *app,__u16 proto, +int register_ip_vs_app_inc (struct netns_ipvs *ipvs,struct ip_vs_app *app,__u16 proto,__u16 port);int ip_vs_app_inc_get (struct ip_vs_app *inc);void ip_vs_app_inc_put (struct ip_vs_app *inc);
net/netfilter/ipvs/ip_vs_app.c +1 -2
@@ -176,10 +176,9 @@ void ip_vs_app_inc_put(struct ip_vs_app *inc)* Register an application incarnation in protocol applications */ int -register_ip_vs_app_inc (struct net *net,struct ip_vs_app *app,__u16 proto, +register_ip_vs_app_inc (struct netns_ipvs *ipvs,struct ip_vs_app *app,__u16 proto,__u16 port) { -struct netns_ipvs *ipvs =net_ipvs (net);int result;mutex_lock (&__ip_vs_app_mutex);
net/netfilter/ipvs/ip_vs_ftp.c +1 -1
@@ -454,7 +454,7 @@ static int __net_init __ip_vs_ftp_init(struct net *net)for (i =0 ; i < ports_count; i++) {if (!ports[i])continue ; - ret =register_ip_vs_app_inc (net, app, app->protocol, ports[i]); + ret =register_ip_vs_app_inc (ipvs, app, app->protocol, ports[i]);if (ret) goto err_unreg; pr_info("%s: loaded support on port[%d] = %d\n",
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 55/84 ipvs: Pass ipvs not net to register_ip_vs_app and unregister_ip_vs_app
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_app.c | 17 ++++++----------- net/netfilter/ipvs/ip_vs_ftp.c | 11 ++++++++--- 3 files changed, 16 insertions(+), 16 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1341,8 +1341,8 @@ void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs);* (from ip_vs_app.c) */ #define IP_VS_APP_MAX_PORTS 8 -struct ip_vs_app *register_ip_vs_app (struct net *net,struct ip_vs_app *app); -void unregister_ip_vs_app (struct net *net,struct ip_vs_app *app); +struct ip_vs_app *register_ip_vs_app (struct netns_ipvs *ipvs,struct ip_vs_app *app); +void unregister_ip_vs_app (struct netns_ipvs *ipvs,struct ip_vs_app *app);int ip_vs_bind_app (struct ip_vs_conn *cp,struct ip_vs_protocol *pp);void ip_vs_unbind_app (struct ip_vs_conn *cp); int register_ip_vs_app_inc(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,
net/netfilter/ipvs/ip_vs_app.c +6 -11
@@ -192,15 +192,11 @@ register_ip_vs_app_inc(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 pro/* Register application for netns */ -struct ip_vs_app *register_ip_vs_app (struct net *net,struct ip_vs_app *app) +struct ip_vs_app *register_ip_vs_app (struct netns_ipvs *ipvs,struct ip_vs_app *app) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_app *a;int err =0 ; -if (!ipvs) -return ERR_PTR (-ENOENT ); -mutex_lock (&__ip_vs_app_mutex);list_for_each_entry (a, &ipvs->app_list, a_list) {
@@ -231,13 +227,10 @@ out_unlock:* We are sure there are no app incarnations attached to services * Caller should use synchronize_rcu() or rcu_barrier() */ -void unregister_ip_vs_app (struct net *net,struct ip_vs_app *app) +void unregister_ip_vs_app (struct netns_ipvs *ipvs,struct ip_vs_app *app) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_app *a, *anxt, *inc, *nxt; - -if (!ipvs) -return ; +struct net *net = ipvs->net;mutex_lock (&__ip_vs_app_mutex);
@@ -623,6 +616,8 @@ int __net_init ip_vs_app_net_init(struct net *net) void __net_exit ip_vs_app_net_cleanup(struct net *net) { -unregister_ip_vs_app (net,NULL /* all */ ); +struct netns_ipvs *ipvs =net_ipvs (net); + +unregister_ip_vs_app (ipvs,NULL /* all */ );remove_proc_entry ("ip_vs_app" , net->proc_net); }
net/netfilter/ipvs/ip_vs_ftp.c +8 -3
@@ -447,7 +447,7 @@ static int __net_init __ip_vs_ftp_init(struct net *net)if (!ipvs)return -ENOENT ; - app =register_ip_vs_app (net, &ip_vs_ftp); + app =register_ip_vs_app (ipvs, &ip_vs_ftp);if (IS_ERR (app))return PTR_ERR (app);
@@ -463,7 +463,7 @@ static int __net_init __ip_vs_ftp_init(struct net *net)return 0 ; err_unreg: -unregister_ip_vs_app (net, &ip_vs_ftp); +unregister_ip_vs_app (ipvs, &ip_vs_ftp);return ret; }/*
@@ -471,7 +471,12 @@ err_unreg:*/ static void __ip_vs_ftp_exit (struct net *net) { -unregister_ip_vs_app (net, &ip_vs_ftp); +struct netns_ipvs *ipvs =net_ipvs (net); + +if (!ipvs) +return ; + +unregister_ip_vs_app (ipvs, &ip_vs_ftp); }static struct pernet_operations ip_vs_ftp_ops = {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 56/84 ipvs: Pass ipvs not net into ip_vs_app_inc_release
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_app.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_app.c +2 -4
@@ -127,9 +127,8 @@ ip_vs_app_inc_new(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,* Release app incarnation */ static void -ip_vs_app_inc_release (struct net *net,struct ip_vs_app *inc) +ip_vs_app_inc_release (struct netns_ipvs *ipvs,struct ip_vs_app *inc) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_protocol *pp;if (!(pp =ip_vs_proto_get (inc->protocol)))
@@ -230,7 +229,6 @@ out_unlock:void unregister_ip_vs_app (struct netns_ipvs *ipvs,struct ip_vs_app *app) {struct ip_vs_app *a, *anxt, *inc, *nxt; -struct net *net = ipvs->net;mutex_lock (&__ip_vs_app_mutex);
@@ -238,7 +236,7 @@ void unregister_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app)if (app &&strcmp (app->name, a->name))continue ;list_for_each_entry_safe (inc, nxt, &a->incs_list, a_list) { -ip_vs_app_inc_release (net, inc); +ip_vs_app_inc_release (ipvs, inc); }list_del (&a->a_list);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 57/84 ipvs: Pass ipvs not net into ip_vs_app_net_init and ip_vs_app_net_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_app.c | 8 ++++---- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1326,11 +1326,11 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)int ip_vs_estimator_net_init (struct netns_ipvs *ipvs);int ip_vs_control_net_init (struct netns_ipvs *ipvs);int ip_vs_protocol_net_init (struct net *net); -int ip_vs_app_net_init (struct net *net); +int ip_vs_app_net_init (struct netns_ipvs *ipvs);int ip_vs_conn_net_init (struct net *net);int ip_vs_sync_net_init (struct netns_ipvs *ipvs);void ip_vs_conn_net_cleanup (struct net *net); -void ip_vs_app_net_cleanup (struct net *net); +void ip_vs_app_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_protocol_net_cleanup (struct net *net);void ip_vs_control_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_estimator_net_cleanup (struct netns_ipvs *ipvs);
net/netfilter/ipvs/ip_vs_app.c +4 -4
@@ -603,18 +603,18 @@ static const struct file_operations ip_vs_app_fops = { };#endif -int __net_init ip_vs_app_net_init (struct net *net) +int __net_init ip_vs_app_net_init (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;INIT_LIST_HEAD (&ipvs->app_list);proc_create ("ip_vs_app" ,0 , net->proc_net, &ip_vs_app_fops);return 0 ; } -void __net_exit ip_vs_app_net_cleanup(struct net *net) +void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;unregister_ip_vs_app (ipvs,NULL /* all */ );remove_proc_entry ("ip_vs_app" , net->proc_net);
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -2081,7 +2081,7 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_protocol_net_init (net) <0 ) goto protocol_fail; -if (ip_vs_app_net_init (net) <0 ) +if (ip_vs_app_net_init (ipvs) <0 ) goto app_fail;if (ip_vs_conn_net_init (net) <0 )
@@ -2100,7 +2100,7 @@ static int __net_init __ip_vs_init(struct net *net) sync_fail:ip_vs_conn_net_cleanup (net); conn_fail: -ip_vs_app_net_cleanup (net); +ip_vs_app_net_cleanup (ipvs); app_fail:ip_vs_protocol_net_cleanup (net); protocol_fail:
@@ -2118,7 +2118,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)ip_vs_service_net_cleanup (ipvs);/* ip_vs_flush() with locks */ ip_vs_conn_net_cleanup (net); -ip_vs_app_net_cleanup (net); +ip_vs_app_net_cleanup (ipvs);ip_vs_protocol_net_cleanup (net);ip_vs_control_net_cleanup (ipvs);ip_vs_estimator_net_cleanup (ipvs);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 58/84 ipvs: Pass ipvs not net into [un]register_ip_vs_proto_netns
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_proto.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_proto.c +7 -8
@@ -63,9 +63,8 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp)* register an ipvs protocols netns related data */ static int -register_ip_vs_proto_netns (struct net *net,struct ip_vs_protocol *pp) +register_ip_vs_proto_netns (struct netns_ipvs *ipvs,struct ip_vs_protocol *pp) { -struct netns_ipvs *ipvs =net_ipvs (net);unsigned int hash =IP_VS_PROTO_HASH (pp->protocol);struct ip_vs_proto_data *pd =kzalloc (sizeof (struct ip_vs_proto_data ),GFP_KERNEL );
@@ -79,7 +78,7 @@ register_ip_vs_proto_netns(struct net *net, struct ip_vs_protocol *pp)atomic_set (&pd->appcnt,0 );/* Init app counter */ if (pp->init_netns !=NULL ) { -int ret = pp->init_netns (net, pd); +int ret = pp->init_netns (ipvs->net, pd);if (ret) {/* unlink an free proto data */ ipvs->proto_data_table[hash] = pd->next;
@@ -116,9 +115,8 @@ static int unregister_ip_vs_protocol(struct ip_vs_protocol *pp)* unregister an ipvs protocols netns data */ static int -unregister_ip_vs_proto_netns (struct net *net,struct ip_vs_proto_data *pd) +unregister_ip_vs_proto_netns (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data **pd_p;unsigned int hash =IP_VS_PROTO_HASH (pd->pp->protocol);
@@ -127,7 +125,7 @@ unregister_ip_vs_proto_netns(struct net *net, struct ip_vs_proto_data *pd)if (*pd_p == pd) { *pd_p = pd->next;if (pd->pp->exit_netns !=NULL ) - pd->pp->exit_netns (net, pd); + pd->pp->exit_netns (ipvs->net, pd);kfree (pd);return 0 ; }
@@ -329,9 +327,10 @@ int __net_init ip_vs_protocol_net_init(struct net *net) &ip_vs_protocol_esp,#endif }; +struct netns_ipvs *ipvs =net_ipvs (net);for (i =0 ; i <ARRAY_SIZE (protos); i++) { - ret =register_ip_vs_proto_netns (net, protos[i]); + ret =register_ip_vs_proto_netns (ipvs, protos[i]);if (ret <0 ) goto cleanup; }
@@ -351,7 +350,7 @@ void __net_exit ip_vs_protocol_net_cleanup(struct net *net)/* unregister all the ipvs proto data for this netns */ for (i =0 ; i <IP_VS_PROTO_TAB_SIZE ; i++) {while ((pd = ipvs->proto_data_table[i]) !=NULL ) -unregister_ip_vs_proto_netns (net, pd); +unregister_ip_vs_proto_netns (ipvs, pd); } }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 59/84 ipvs: Pass ipvs not net into init_netns and exit_netns
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_proto.c | 4 ++-- net/netfilter/ipvs/ip_vs_proto_sctp.c | 6 ++---- net/netfilter/ipvs/ip_vs_proto_tcp.c | 6 ++---- net/netfilter/ipvs/ip_vs_proto_udp.c | 6 ++---- 5 files changed, 10 insertions(+), 16 deletions(-)
include/net/ip_vs.h +2 -2
@@ -483,9 +483,9 @@ struct ip_vs_protocol {void (*exit)(struct ip_vs_protocol *pp); -int (*init_netns)(struct net *net,struct ip_vs_proto_data *pd); +int (*init_netns)(struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd); -void (*exit_netns)(struct net *net,struct ip_vs_proto_data *pd); +void (*exit_netns)(struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd); int (*conn_schedule)(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,
net/netfilter/ipvs/ip_vs_proto.c +2 -2
@@ -78,7 +78,7 @@ register_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_protocol *pp)atomic_set (&pd->appcnt,0 );/* Init app counter */ if (pp->init_netns !=NULL ) { -int ret = pp->init_netns (ipvs->net, pd); +int ret = pp->init_netns (ipvs, pd);if (ret) {/* unlink an free proto data */ ipvs->proto_data_table[hash] = pd->next;
@@ -125,7 +125,7 @@ unregister_ip_vs_proto_netns(struct netns_ipvs *ipvs, struct ip_vs_proto_data *pif (*pd_p == pd) { *pd_p = pd->next;if (pd->pp->exit_netns !=NULL ) - pd->pp->exit_netns (ipvs->net, pd); + pd->pp->exit_netns (ipvs, pd);kfree (pd);return 0 ; }
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -4
@@ -561,10 +561,8 @@ out:* timeouts is netns related now. * --------------------------------------------- */ -static int __ip_vs_sctp_init (struct net *net,struct ip_vs_proto_data *pd) +static int __ip_vs_sctp_init (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) { -struct netns_ipvs *ipvs =net_ipvs (net); -ip_vs_init_hash_table (ipvs->sctp_apps,SCTP_APP_TAB_SIZE ); pd->timeout_table =ip_vs_create_timeout_table ((int *)sctp_timeouts,sizeof (sctp_timeouts));
@@ -573,7 +571,7 @@ static int __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd)return 0 ; } -static void __ip_vs_sctp_exit (struct net *net,struct ip_vs_proto_data *pd) +static void __ip_vs_sctp_exit (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) {kfree (pd->timeout_table); }
net/netfilter/ipvs/ip_vs_proto_tcp.c +2 -4
@@ -691,10 +691,8 @@ void ip_vs_tcp_conn_listen(struct net *net, struct ip_vs_conn *cp)* timeouts is netns related now. * --------------------------------------------- */ -static int __ip_vs_tcp_init (struct net *net,struct ip_vs_proto_data *pd) +static int __ip_vs_tcp_init (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) { -struct netns_ipvs *ipvs =net_ipvs (net); -ip_vs_init_hash_table (ipvs->tcp_apps,TCP_APP_TAB_SIZE ); pd->timeout_table =ip_vs_create_timeout_table ((int *)tcp_timeouts,sizeof (tcp_timeouts));
@@ -704,7 +702,7 @@ static int __ip_vs_tcp_init(struct net *net, struct ip_vs_proto_data *pd)return 0 ; } -static void __ip_vs_tcp_exit (struct net *net,struct ip_vs_proto_data *pd) +static void __ip_vs_tcp_exit (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) {kfree (pd->timeout_table); }
net/netfilter/ipvs/ip_vs_proto_udp.c +2 -4
@@ -472,10 +472,8 @@ udp_state_transition(struct ip_vs_conn *cp, int direction, cp->timeout = pd->timeout_table[IP_VS_UDP_S_NORMAL ]; } -static int __udp_init (struct net *net,struct ip_vs_proto_data *pd) +static int __udp_init (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) { -struct netns_ipvs *ipvs =net_ipvs (net); -ip_vs_init_hash_table (ipvs->udp_apps,UDP_APP_TAB_SIZE ); pd->timeout_table =ip_vs_create_timeout_table ((int *)udp_timeouts,sizeof (udp_timeouts));
@@ -484,7 +482,7 @@ static int __udp_init(struct net *net, struct ip_vs_proto_data *pd)return 0 ; } -static void __udp_exit (struct net *net,struct ip_vs_proto_data *pd) +static void __udp_exit (struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd) {kfree (pd->timeout_table); }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 60/84 ipvs: Pass ipvs into ip_vs_conn_fill_param_proto
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Move the ugly hack net_ipvs(skb_net(skb)) up a layer in the call stack so it is easier to remove.
--- net/netfilter/ipvs/ip_vs_conn.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +6 -4
@@ -314,12 +314,12 @@ struct ip_vs_conn *ip_vs_conn_in_get(const struct ip_vs_conn_param *p) }static int -ip_vs_conn_fill_param_proto (int af,const struct sk_buff *skb, +ip_vs_conn_fill_param_proto (struct netns_ipvs *ipvs, +int af,const struct sk_buff *skb,const struct ip_vs_iphdr *iph,struct ip_vs_conn_param *p) {__be16 _ports[2 ], *pptr; -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); pptr =frag_safe_skb_hp (skb, iph->len,sizeof (_ports), _ports, iph);if (pptr ==NULL )
@@ -338,9 +338,10 @@ struct ip_vs_conn * ip_vs_conn_in_get_proto(int af, const struct sk_buff *skb, const struct ip_vs_iphdr *iph) { + struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));struct ip_vs_conn_param p; -if (ip_vs_conn_fill_param_proto (af, skb, iph, &p)) +if (ip_vs_conn_fill_param_proto (ipvs, af, skb, iph, &p))return NULL ;return ip_vs_conn_in_get (&p);
@@ -442,9 +443,10 @@ struct ip_vs_conn * ip_vs_conn_out_get_proto(int af, const struct sk_buff *skb, const struct ip_vs_iphdr *iph) { + struct netns_ipvs *ipvs = net_ipvs(skb_net(skb));struct ip_vs_conn_param p; -if (ip_vs_conn_fill_param_proto (af, skb, iph, &p)) +if (ip_vs_conn_fill_param_proto (ipvs, af, skb, iph, &p))return NULL ;return ip_vs_conn_out_get (&p);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 61/84 ipvs: Pass ipvs into .conn_in_get and ip_vs_conn_in_get_proto
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Stop relying on "net_ipvs(skb_net(skb))" to derive the ipvs as skb_net is a hack.
--- include/net/ip_vs.h | 6 ++++-- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 8 ++++---- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 +-- 4 files changed, 11 insertions(+), 10 deletions(-)
include/net/ip_vs.h +4 -2
@@ -493,7 +493,8 @@ struct ip_vs_protocol { struct ip_vs_iphdr *iph);struct ip_vs_conn * - (*conn_in_get)(int af, + (*conn_in_get)(struct netns_ipvs *ipvs, +int af,const struct sk_buff *skb,const struct ip_vs_iphdr *iph);
@@ -1222,7 +1223,8 @@ static inline void ip_vs_conn_fill_param(struct netns_ipvs *ipvs, int af, int prstruct ip_vs_conn *ip_vs_conn_in_get (const struct ip_vs_conn_param *p);struct ip_vs_conn *ip_vs_ct_in_get (const struct ip_vs_conn_param *p); -struct ip_vs_conn *ip_vs_conn_in_get_proto (int af,const struct sk_buff *skb, +struct ip_vs_conn *ip_vs_conn_in_get_proto (struct netns_ipvs *ipvs,int af, +const struct sk_buff *skb,const struct ip_vs_iphdr *iph);struct ip_vs_conn *ip_vs_conn_out_get (const struct ip_vs_conn_param *p);
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -335,10 +335,10 @@ ip_vs_conn_fill_param_proto(struct netns_ipvs *ipvs, }struct ip_vs_conn * -ip_vs_conn_in_get_proto (int af,const struct sk_buff *skb, +ip_vs_conn_in_get_proto (struct netns_ipvs *ipvs,int af, +const struct sk_buff *skb,const struct ip_vs_iphdr *iph) { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct ip_vs_conn_param p;if (ip_vs_conn_fill_param_proto (ipvs, af, skb, iph, &p))
net/netfilter/ipvs/ip_vs_core.c +4 -4
@@ -469,7 +469,7 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,*/ if ((!skb->dev || skb->dev->flags &IFF_LOOPBACK )) { iph->hdr_flags ^=IP_VS_HDR_INVERSE ; - cp = pp->conn_in_get (svc->af, skb, iph); + cp = pp->conn_in_get (svc->ipvs, svc->af, skb, iph); iph->hdr_flags ^=IP_VS_HDR_INVERSE ;if (cp) {
@@ -1490,7 +1490,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)/* The embedded headers contain source and dest in reverse order. * For IPIP this is error for request, not for reply. */ - cp = pp->conn_in_get (AF_INET , skb, &ciph); + cp = pp->conn_in_get (ipvs,AF_INET , skb, &ciph);if (!cp) {int v;
@@ -1648,7 +1648,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,/* The embedded headers contain source and dest in reverse order * if not from localhost */ - cp = pp->conn_in_get (AF_INET6 , skb, &ciph); + cp = pp->conn_in_get (ipvs,AF_INET6 , skb, &ciph);if (!cp) {int v;
@@ -1780,7 +1780,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)/* * Check if the packet belongs to an existing connection entry */ - cp = pp->conn_in_get (af, skb, &iph); + cp = pp->conn_in_get (ipvs, af, skb, &iph); conn_reuse_mode =sysctl_conn_reuse_mode (ipvs); if (conn_reuse_mode && !iph.fragoffs &&
net/netfilter/ipvs/ip_vs_proto_ah_esp.c +1 -2
@@ -56,12 +56,11 @@ ah_esp_conn_fill_param_proto(struct netns_ipvs *ipvs, int af, }static struct ip_vs_conn * -ah_esp_conn_in_get (int af,const struct sk_buff *skb, +ah_esp_conn_in_get (struct netns_ipvs *ipvs,int af,const struct sk_buff *skb,const struct ip_vs_iphdr *iph) {struct ip_vs_conn *cp;struct ip_vs_conn_param p; -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));ah_esp_conn_fill_param_proto (ipvs, af, iph, &p); cp =ip_vs_conn_in_get (&p);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 62/84 ipvs: Pass ipvs into conn_out_get
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Move the hack of relying on "net_ipvs(skb_net(skb))" to derive the ipvs up a layer.
--- include/net/ip_vs.h | 6 ++++-- net/netfilter/ipvs/ip_vs_conn.c | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 8 +++++--- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 +-- net/netfilter/xt_ipvs.c | 3 ++- 5 files changed, 14 insertions(+), 10 deletions(-)
include/net/ip_vs.h +4 -2
@@ -499,7 +499,8 @@ struct ip_vs_protocol { const struct ip_vs_iphdr *iph);struct ip_vs_conn * - (*conn_out_get)(int af, + (*conn_out_get)(struct netns_ipvs *ipvs, +int af,const struct sk_buff *skb,const struct ip_vs_iphdr *iph);
@@ -1229,7 +1230,8 @@ struct ip_vs_conn * ip_vs_conn_in_get_proto(struct netns_ipvs *ipvs, int af,struct ip_vs_conn *ip_vs_conn_out_get (const struct ip_vs_conn_param *p); -struct ip_vs_conn *ip_vs_conn_out_get_proto (int af,const struct sk_buff *skb, +struct ip_vs_conn *ip_vs_conn_out_get_proto (struct netns_ipvs *ipvs,int af, +const struct sk_buff *skb,const struct ip_vs_iphdr *iph);/* Get reference to gain full access to conn.
net/netfilter/ipvs/ip_vs_conn.c +2 -2
@@ -440,10 +440,10 @@ struct ip_vs_conn *ip_vs_conn_out_get(const struct ip_vs_conn_param *p) }struct ip_vs_conn * -ip_vs_conn_out_get_proto (int af,const struct sk_buff *skb, +ip_vs_conn_out_get_proto (struct netns_ipvs *ipvs,int af, +const struct sk_buff *skb,const struct ip_vs_iphdr *iph) { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct ip_vs_conn_param p;if (ip_vs_conn_fill_param_proto (ipvs, af, skb, iph, &p))
net/netfilter/ipvs/ip_vs_core.c +5 -3
@@ -912,6 +912,7 @@ out:static int ip_vs_out_icmp (struct sk_buff *skb,int *related,unsigned int hooknum) { +struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct iphdr *iph;struct icmphdr _icmph, *ic;struct iphdr _ciph, *cih;/* The ip header contained within the ICMP */
@@ -974,7 +975,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related,ip_vs_fill_iph_skb_icmp (AF_INET , skb, offset, true, &ciph);/* The embedded headers contain source and dest in reverse order */ - cp = pp->conn_out_get (AF_INET , skb, &ciph); + cp = pp->conn_out_get (ipvs,AF_INET , skb, &ciph);if (!cp)return NF_ACCEPT ;
@@ -987,6 +988,7 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related,static int ip_vs_out_icmp_v6 (struct sk_buff *skb,int *related,unsigned int hooknum,struct ip_vs_iphdr *ipvsh) { +struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct icmp6hdr _icmph, *ic;struct ip_vs_iphdr ciph = {.flags =0 , .fragoffs =0 };/*Contained IP */ struct ip_vs_conn *cp;
@@ -1029,7 +1031,7 @@ static int ip_vs_out_icmp_v6(struct sk_buff *skb, int *related,return NF_ACCEPT ;/* The embedded headers contain source and dest in reverse order */ - cp = pp->conn_out_get (AF_INET6 , skb, &ciph); + cp = pp->conn_out_get (ipvs,AF_INET6 , skb, &ciph);if (!cp)return NF_ACCEPT ;
@@ -1257,7 +1259,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)/* * Check if the packet belongs to an existing entry */ - cp = pp->conn_out_get (af, skb, &iph); + cp = pp->conn_out_get (ipvs, af, skb, &iph);if (likely (cp))return handle_response (af, skb, pd, cp, &iph, hooknum);
net/netfilter/ipvs/ip_vs_proto_ah_esp.c +1 -2
@@ -82,12 +82,11 @@ ah_esp_conn_in_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb,static struct ip_vs_conn * -ah_esp_conn_out_get (int af,const struct sk_buff *skb, +ah_esp_conn_out_get (struct netns_ipvs *ipvs,int af,const struct sk_buff *skb,const struct ip_vs_iphdr *iph) {struct ip_vs_conn *cp;struct ip_vs_conn_param p; -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));ah_esp_conn_fill_param_proto (ipvs, af, iph, &p); cp =ip_vs_conn_out_get (&p);
net/netfilter/xt_ipvs.c +2 -1
@@ -48,6 +48,7 @@ static bool ipvs_mt(const struct sk_buff *skb, struct xt_action_param *par) { const struct xt_ipvs_mtinfo *data = par->matchinfo; +struct netns_ipvs *ipvs =net_ipvs (par->net);/* ipvs_mt_check ensures that family is only NFPROTO_IPV[46]. */ const u_int8_t family = par->family;struct ip_vs_iphdr iph;
@@ -85,7 +86,7 @@ ipvs_mt(const struct sk_buff *skb, struct xt_action_param *par)/* * Check if the packet belongs to an existing entry */ - cp = pp->conn_out_get (family, skb, &iph); + cp = pp->conn_out_get (ipvs, family, skb, &iph);if (unlikely (cp ==NULL )) { match = false; goto out;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 63/84 ipvs: Pass ipvs not net to ip_vs_conn_hashkey
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_conn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +4 -4
@@ -108,7 +108,7 @@ static inline void ct_write_unlock_bh(unsigned int key)/* * Returns hash value for IPVS connection entry */ -static unsigned int ip_vs_conn_hashkey (struct net *net,int af,unsigned int proto, +static unsigned int ip_vs_conn_hashkey (struct netns_ipvs *ipvs,int af,unsigned int proto,const union nf_inet_addr *addr,__be16 port) {
@@ -116,11 +116,11 @@ static unsigned int ip_vs_conn_hashkey(struct net *net, int af, unsigned int proif (af ==AF_INET6 )return (jhash_3words (jhash (addr,16 , ip_vs_conn_rnd), (__force u32 )port, proto, ip_vs_conn_rnd) ^ - ((size_t )net>>8 )) & ip_vs_conn_tab_mask; + ((size_t )ipvs>>8 )) & ip_vs_conn_tab_mask;#endif return (jhash_3words ((__force u32 )addr->ip, (__force u32 )port, proto, ip_vs_conn_rnd) ^ - ((size_t )net>>8 )) & ip_vs_conn_tab_mask; + ((size_t )ipvs>>8 )) & ip_vs_conn_tab_mask; } static unsigned int ip_vs_conn_hashkey_param(const struct ip_vs_conn_param *p,
@@ -141,7 +141,7 @@ static unsigned int ip_vs_conn_hashkey_param(const struct ip_vs_conn_param *p, port = p->vport; } -return ip_vs_conn_hashkey (p->ipvs->net, p->af, p->protocol, addr, port); +return ip_vs_conn_hashkey (p->ipvs, p->af, p->protocol, addr, port); }static unsigned int ip_vs_conn_hashkey_conn (const struct ip_vs_conn *cp)
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 64/84 ipvs: Pass ipvs not net into ip_vs_conn_net_flush
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_conn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_conn.c +4 -3
@@ -1309,11 +1309,10 @@ void ip_vs_random_dropentry(struct netns_ipvs *ipvs)/* * Flush all the connection entries in the ip_vs_conn_tab */ -static void ip_vs_conn_flush (struct net *net) +static void ip_vs_conn_flush (struct netns_ipvs *ipvs) {int idx;struct ip_vs_conn *cp, *cp_c; -struct netns_ipvs *ipvs =net_ipvs (net); flush_again:rcu_read_lock ();
@@ -1359,8 +1358,10 @@ int __net_init ip_vs_conn_net_init(struct net *net) void __net_exit ip_vs_conn_net_cleanup(struct net *net) { +struct netns_ipvs *ipvs =net_ipvs (net); +/* flush all the connection entries first */ -ip_vs_conn_flush (net); +ip_vs_conn_flush (ipvs);remove_proc_entry ("ip_vs_conn" , net->proc_net);remove_proc_entry ("ip_vs_conn_sync" , net->proc_net); }
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 65/84 ipvs: Pass ipvs not net into ip_vs_conn_net_init and ip_vs_conn_net_cleanup
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_conn.c | 8 ++++---- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1331,9 +1331,9 @@ int ip_vs_estimator_net_init(struct netns_ipvs *ipvs);int ip_vs_control_net_init (struct netns_ipvs *ipvs);int ip_vs_protocol_net_init (struct net *net);int ip_vs_app_net_init (struct netns_ipvs *ipvs); -int ip_vs_conn_net_init (struct net *net); +int ip_vs_conn_net_init (struct netns_ipvs *ipvs);int ip_vs_sync_net_init (struct netns_ipvs *ipvs); -void ip_vs_conn_net_cleanup (struct net *net); +void ip_vs_conn_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_app_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_protocol_net_cleanup (struct net *net);void ip_vs_control_net_cleanup (struct netns_ipvs *ipvs);
net/netfilter/ipvs/ip_vs_conn.c +4 -4
@@ -1345,9 +1345,9 @@ flush_again:/* * per netns init and exit */ -int __net_init ip_vs_conn_net_init (struct net *net) +int __net_init ip_vs_conn_net_init (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;atomic_set (&ipvs->conn_count,0 );
@@ -1356,9 +1356,9 @@ int __net_init ip_vs_conn_net_init(struct net *net)return 0 ; } -void __net_exit ip_vs_conn_net_cleanup(struct net *net) +void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net); +struct net *net = ipvs->net;/* flush all the connection entries first */ ip_vs_conn_flush (ipvs);
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -2086,7 +2086,7 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_app_net_init (ipvs) <0 ) goto app_fail; -if (ip_vs_conn_net_init (net) <0 ) +if (ip_vs_conn_net_init (ipvs) <0 ) goto conn_fail;if (ip_vs_sync_net_init (ipvs) <0 )
@@ -2100,7 +2100,7 @@ static int __net_init __ip_vs_init(struct net *net)*/ sync_fail: -ip_vs_conn_net_cleanup (net); +ip_vs_conn_net_cleanup (ipvs); conn_fail:ip_vs_app_net_cleanup (ipvs); app_fail:
@@ -2119,7 +2119,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)struct netns_ipvs *ipvs =net_ipvs (net);ip_vs_service_net_cleanup (ipvs);/* ip_vs_flush() with locks */ -ip_vs_conn_net_cleanup (net); +ip_vs_conn_net_cleanup (ipvs);ip_vs_app_net_cleanup (ipvs);ip_vs_protocol_net_cleanup (net);ip_vs_control_net_cleanup (ipvs);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 66/84 ipvs: Pass ipvs into .conn_schedule and ip_vs_try_to_schedule
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This moves the hack "net_ipvs(skb_net(skb))" up one level where it will be easier to remove.
--- include/net/ip_vs.h | 3 ++- net/netfilter/ipvs/ip_vs_core.c | 11 ++++++----- net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 3 ++- net/netfilter/ipvs/ip_vs_proto_sctp.c | 8 ++------ net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 ++------ net/netfilter/ipvs/ip_vs_proto_udp.c | 9 +++------ 6 files changed, 17 insertions(+), 25 deletions(-)
include/net/ip_vs.h +2 -1
@@ -487,7 +487,8 @@ struct ip_vs_protocol {void (*exit_netns)(struct netns_ipvs *ipvs,struct ip_vs_proto_data *pd); -int (*conn_schedule)(int af,struct sk_buff *skb, +int (*conn_schedule)(struct netns_ipvs *ipvs, +int af,struct sk_buff *skb,struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph);
net/netfilter/ipvs/ip_vs_core.c +6 -5
@@ -1360,7 +1360,8 @@ ip_vs_local_reply6(void *priv, struct sk_buff *skb,#endif static unsigned int -ip_vs_try_to_schedule (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, +ip_vs_try_to_schedule (struct netns_ipvs *ipvs,int af,struct sk_buff *skb, +struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph) {
@@ -1372,7 +1373,7 @@ ip_vs_try_to_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,*/ /* Schedule and create new connection entry into cpp */ -if (!pp->conn_schedule (af, skb, pd, verdict, cpp, iph)) +if (!pp->conn_schedule (ipvs, af, skb, pd, verdict, cpp, iph))return 0 ; }
@@ -1500,7 +1501,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)if (!sysctl_schedule_icmp (ipvs))return NF_ACCEPT ; -if (!ip_vs_try_to_schedule (AF_INET , skb, pd, &v, &cp, &ciph)) +if (!ip_vs_try_to_schedule (ipvs,AF_INET , skb, pd, &v, &cp, &ciph))return v; new_cp = true; }
@@ -1658,7 +1659,7 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,if (!sysctl_schedule_icmp (ipvs))return NF_ACCEPT ; -if (!ip_vs_try_to_schedule (AF_INET6 , skb, pd, &v, &cp, &ciph)) +if (!ip_vs_try_to_schedule (ipvs,AF_INET6 , skb, pd, &v, &cp, &ciph))return v; new_cp = true;
@@ -1799,7 +1800,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)if (unlikely (!cp)) {int v; -if (!ip_vs_try_to_schedule (af, skb, pd, &v, &cp, &iph)) +if (!ip_vs_try_to_schedule (ipvs, af, skb, pd, &v, &cp, &iph))return v; }
net/netfilter/ipvs/ip_vs_proto_ah_esp.c +2 -1
@@ -104,7 +104,8 @@ ah_esp_conn_out_get(struct netns_ipvs *ipvs, int af, const struct sk_buff *skb,static int -ah_esp_conn_schedule (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, +ah_esp_conn_schedule (struct netns_ipvs *ipvs,int af,struct sk_buff *skb, +struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph) {
net/netfilter/ipvs/ip_vs_proto_sctp.c +2 -6
@@ -9,20 +9,16 @@#include <net/ip_vs.h> static int -sctp_conn_schedule (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, +sctp_conn_schedule (struct netns_ipvs *ipvs,int af,struct sk_buff *skb, +struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph) { -struct net *net;struct ip_vs_service *svc; -struct netns_ipvs *ipvs;sctp_chunkhdr_t _schunkh, *sch;sctp_sctphdr_t *sh, _sctph;__be16 _ports[2 ], *ports =NULL ; - net =skb_net (skb); - ipvs =net_ipvs (net); -if (likely (!ip_vs_iph_icmp (iph))) { sh =skb_header_pointer (skb, iph->len,sizeof (_sctph), &_sctph);if (sh) {
net/netfilter/ipvs/ip_vs_proto_tcp.c +2 -6
@@ -32,19 +32,15 @@#include <net/ip_vs.h> static int -tcp_conn_schedule (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, +tcp_conn_schedule (struct netns_ipvs *ipvs,int af,struct sk_buff *skb, +struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph) { -struct net *net;struct ip_vs_service *svc;struct tcphdr _tcph, *th; -struct netns_ipvs *ipvs;__be16 _ports[2 ], *ports =NULL ; - net =skb_net (skb); - ipvs =net_ipvs (net); -/* In the event of icmp, we're only guaranteed to have the first 8 * bytes of the transport header, so we only check the rest of the * TCP packet for non-ICMP packets
net/netfilter/ipvs/ip_vs_proto_udp.c +3 -6
@@ -29,12 +29,11 @@#include <net/ip6_checksum.h> static int -udp_conn_schedule (int af,struct sk_buff *skb,struct ip_vs_proto_data *pd, +udp_conn_schedule (struct netns_ipvs *ipvs,int af,struct sk_buff *skb, +struct ip_vs_proto_data *pd,int *verdict,struct ip_vs_conn **cpp,struct ip_vs_iphdr *iph) { -struct net *net; -struct netns_ipvs *ipvs;struct ip_vs_service *svc;struct udphdr _udph, *uh;__be16 _ports[2 ], *ports =NULL ;
@@ -54,8 +53,6 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,return 0 ; } - net =skb_net (skb); - ipvs =net_ipvs (net);rcu_read_lock ();if (likely (!ip_vs_iph_inverse (iph))) svc = ip_vs_service_find(ipvs, af, skb->mark, iph->protocol,
@@ -67,7 +64,7 @@ udp_conn_schedule(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,if (svc) {int ignored; -if (ip_vs_todrop (net_ipvs (net))) { +if (ip_vs_todrop (ipvs)) {/* * It seems that we are very loaded. * We have to drop this packet :(
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 67/84 ipvs: Better derivation of ipvs in ip_vs_tunnel_xmit
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_xmit.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_xmit.c +2 -2
@@ -971,8 +971,8 @@ int ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp, struct ip_vs_iphdr *ipvsh) { - struct net *net = skb_net(skb); -struct netns_ipvs *ipvs =net_ipvs (net); + struct netns_ipvs *ipvs = cp->ipvs; +struct net *net = ipvs->net;struct rtable *rt;/* Route to the other host */ __be32 saddr;/* Source for tunnel */ struct net_device *tdev;/* Device to other host */
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 68/84 ipvs: Pass ipvs into __ip_vs_get_out_rt
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_xmit.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
net/netfilter/ipvs/ip_vs_xmit.c +8 -7
@@ -257,11 +257,12 @@ static inline bool ensure_mtu_is_adequate(int skb_af, int rt_mode,/* Get route to destination or remote server */ static int -__ip_vs_get_out_rt (int skb_af,struct sk_buff *skb,struct ip_vs_dest *dest, +__ip_vs_get_out_rt (struct netns_ipvs *ipvs,int skb_af,struct sk_buff *skb, +struct ip_vs_dest *dest,__be32 daddr,int rt_mode,__be32 *ret_saddr,struct ip_vs_iphdr *ipvsh) { -struct net *net =dev_net (skb_dst (skb)->dev); +struct net *net = ipvs->net;struct ip_vs_dest_dst *dest_dst;struct rtable *rt;/* Route to the other host */ int mtu;
@@ -630,7 +631,7 @@ ip_vs_bypass_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); -if (__ip_vs_get_out_rt (cp->af, skb,NULL , iph->daddr, +if (__ip_vs_get_out_rt (cp->ipvs, cp->af, skb,NULL , iph->daddr,IP_VS_RT_MODE_NON_LOCAL ,NULL , ipvsh) <0 ) goto tx_error;
@@ -709,7 +710,7 @@ ip_vs_nat_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, } was_input =rt_is_input_route (skb_rtable (skb)); - local =__ip_vs_get_out_rt (cp->af, skb, cp->dest, cp->daddr.ip, + local =__ip_vs_get_out_rt (cp->ipvs, cp->af, skb, cp->dest, cp->daddr.ip,IP_VS_RT_MODE_LOCAL |IP_VS_RT_MODE_NON_LOCAL |IP_VS_RT_MODE_RDR ,NULL , ipvsh);
@@ -988,7 +989,7 @@ ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); - local = __ip_vs_get_out_rt(cp->af, skb, cp->dest, cp->daddr.ip, + local = __ip_vs_get_out_rt(ipvs, cp->af, skb, cp->dest, cp->daddr.ip, IP_VS_RT_MODE_LOCAL | IP_VS_RT_MODE_NON_LOCAL | IP_VS_RT_MODE_CONNECT |
@@ -1169,7 +1170,7 @@ ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); - local =__ip_vs_get_out_rt (cp->af, skb, cp->dest, cp->daddr.ip, + local =__ip_vs_get_out_rt (cp->ipvs, cp->af, skb, cp->dest, cp->daddr.ip,IP_VS_RT_MODE_LOCAL |IP_VS_RT_MODE_NON_LOCAL |IP_VS_RT_MODE_KNOWN_NH ,NULL , ipvsh);
@@ -1277,7 +1278,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,IP_VS_RT_MODE_LOCAL |IP_VS_RT_MODE_NON_LOCAL | IP_VS_RT_MODE_RDR : IP_VS_RT_MODE_NON_LOCAL;rcu_read_lock (); - local =__ip_vs_get_out_rt (cp->af, skb, cp->dest, cp->daddr.ip, rt_mode, + local =__ip_vs_get_out_rt (cp->ipvs, cp->af, skb, cp->dest, cp->daddr.ip, rt_mode,NULL , iph);if (local <0 ) goto tx_error;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 69/84 ipvs: Pass ipvs into __ip_vs_get_out_rt_v6
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_xmit.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_xmit.c +13 -8
@@ -404,11 +404,12 @@ out_err:* Get route to destination or remote server */ static int -__ip_vs_get_out_rt_v6 (int skb_af,struct sk_buff *skb,struct ip_vs_dest *dest, +__ip_vs_get_out_rt_v6 (struct netns_ipvs *ipvs,int skb_af,struct sk_buff *skb, +struct ip_vs_dest *dest,struct in6_addr *daddr,struct in6_addr *ret_saddr,struct ip_vs_iphdr *ipvsh,int do_xfrm,int rt_mode) { -struct net *net =dev_net (skb_dst (skb)->dev); +struct net *net = ipvs->net;struct ip_vs_dest_dst *dest_dst;struct rt6_info *rt;/* Route to the other host */ struct dst_entry *dst;
@@ -663,7 +664,8 @@ ip_vs_bypass_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); -if (__ip_vs_get_out_rt_v6 (cp->af, skb,NULL , &iph->daddr,NULL , +if (__ip_vs_get_out_rt_v6 (cp->ipvs, cp->af, skb,NULL , + &iph->daddr,NULL , ipvsh,0 ,IP_VS_RT_MODE_NON_LOCAL ) <0 ) goto tx_error;
@@ -799,7 +801,8 @@ ip_vs_nat_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,IP_VS_DBG (10 ,"filled cport=%d\n" ,ntohs (*p)); } - local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6, + local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest, + &cp->daddr.in6, NULL, ipvsh, 0, IP_VS_RT_MODE_LOCAL | IP_VS_RT_MODE_NON_LOCAL |
@@ -1083,7 +1086,8 @@ ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); - local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6, + local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest, + &cp->daddr.in6, &saddr, ipvsh, 1, IP_VS_RT_MODE_LOCAL | IP_VS_RT_MODE_NON_LOCAL |
@@ -1209,7 +1213,8 @@ ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,EnterFunction (10 );rcu_read_lock (); - local = __ip_vs_get_out_rt_v6(cp->af, skb, cp->dest, &cp->daddr.in6, + local = __ip_vs_get_out_rt_v6(cp->ipvs, cp->af, skb, cp->dest, + &cp->daddr.in6, NULL, ipvsh, 0, IP_VS_RT_MODE_LOCAL | IP_VS_RT_MODE_NON_LOCAL |
@@ -1370,8 +1375,8 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,IP_VS_RT_MODE_LOCAL |IP_VS_RT_MODE_NON_LOCAL | IP_VS_RT_MODE_RDR : IP_VS_RT_MODE_NON_LOCAL;rcu_read_lock (); - local =__ip_vs_get_out_rt_v6 (cp->af, skb, cp->dest, &cp->daddr.in6, -NULL , ipvsh,0 , rt_mode); + local =__ip_vs_get_out_rt_v6 (cp->ipvs, cp->af, skb, cp->dest, + &cp->daddr.in6,NULL , ipvsh,0 , rt_mode);if (local <0 ) goto tx_error; rt = (struct rt6_info *)skb_dst (skb);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 70/84 ipvs: Pass ipvs into ensure_mtu_is adequate
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This allows two different ways for computing/guessing net to be removed from ensure_mtu_is_adequate.
--- net/netfilter/ipvs/ip_vs_xmit.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_xmit.c +5 -6
@@ -212,13 +212,14 @@ static inline void maybe_update_pmtu(int skb_af, struct sk_buff *skb, int mtu) ort->dst.ops->update_pmtu (&ort->dst, sk,NULL , mtu); } -static inline bool ensure_mtu_is_adequate (int skb_af,int rt_mode, +static inline bool ensure_mtu_is_adequate (struct netns_ipvs *ipvs,int skb_af, +int rt_mode,struct ip_vs_iphdr *ipvsh,struct sk_buff *skb,int mtu) {#ifdef CONFIG_IP_VS_IPV6 if (skb_af ==AF_INET6 ) { -struct net *net =dev_net (skb_dst (skb)->dev); +struct net *net = ipvs->net;if (unlikely (__mtu_check_toobig_v6 (skb, mtu))) {if (!skb->dev)
@@ -233,8 +234,6 @@ static inline bool ensure_mtu_is_adequate(int skb_af, int rt_mode, } else#endif { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); -/* If we're going to tunnel the packet and pmtu discovery * is disabled, we'll just fragment it anyway */
@@ -338,7 +337,7 @@ __ip_vs_get_out_rt(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,maybe_update_pmtu (skb_af, skb, mtu); } -if (!ensure_mtu_is_adequate (skb_af, rt_mode, ipvsh, skb, mtu)) +if (!ensure_mtu_is_adequate (ipvs, skb_af, rt_mode, ipvsh, skb, mtu)) goto err_put;skb_dst_drop (skb);
@@ -487,7 +486,7 @@ __ip_vs_get_out_rt_v6(struct netns_ipvs *ipvs, int skb_af, struct sk_buff *skb,maybe_update_pmtu (skb_af, skb, mtu); } -if (!ensure_mtu_is_adequate (skb_af, rt_mode, ipvsh, skb, mtu)) +if (!ensure_mtu_is_adequate (ipvs, skb_af, rt_mode, ipvsh, skb, mtu)) goto err_put;skb_dst_drop (skb);
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 71/84 ipvs: Better derivation of ipvs in ip_vs_in_stats and ip_vs_out_stats
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +2 -2
@@ -112,7 +112,7 @@ static inline void ip_vs_in_stats(struct ip_vs_conn *cp, struct sk_buff *skb) { struct ip_vs_dest *dest = cp->dest; -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); +struct netns_ipvs *ipvs = cp->ipvs;if (dest && (dest->flags &IP_VS_DEST_F_AVAILABLE )) {struct ip_vs_cpu_stats *s;
@@ -146,7 +146,7 @@ static inline void ip_vs_out_stats(struct ip_vs_conn *cp, struct sk_buff *skb) { struct ip_vs_dest *dest = cp->dest; -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb)); +struct netns_ipvs *ipvs = cp->ipvs;if (dest && (dest->flags &IP_VS_DEST_F_AVAILABLE )) {struct ip_vs_cpu_stats *s;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 72/84 ipvs: Wrap sysctl_cache_bypass and remove ifdefs in ip_vs_leave
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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
--- include/net/ip_vs.h | 10 ++++++++++ net/netfilter/ipvs/ip_vs_core.c | 13 +++---------- 2 files changed, 13 insertions(+), 10 deletions(-)
include/net/ip_vs.h +10 -0
@@ -1101,6 +1101,11 @@ static inline int sysctl_ignore_tunneled(struct netns_ipvs *ipvs) return ipvs->sysctl_ignore_tunneled; } +static inline int sysctl_cache_bypass (struct netns_ipvs *ipvs) +{ +return ipvs->sysctl_cache_bypass; +} +#else static inline int sysctl_sync_threshold (struct netns_ipvs *ipvs)
@@ -1183,6 +1188,11 @@ static inline int sysctl_ignore_tunneled(struct netns_ipvs *ipvs) return 0; } +static inline int sysctl_cache_bypass (struct netns_ipvs *ipvs) +{ +return 0 ; +} +#endif /* IPVS core functions
net/netfilter/ipvs/ip_vs_core.c +3 -10
@@ -568,17 +568,14 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, struct ip_vs_proto_data *pd, struct ip_vs_iphdr *iph) { __be16 _ports[2], *pptr, dport; -#ifdef CONFIG_SYSCTL struct net *net;struct netns_ipvs *ipvs; -#endif pptr =frag_safe_skb_hp (skb, iph->len,sizeof (_ports), _ports, iph);if (!pptr)return NF_DROP ; dport =likely (!ip_vs_iph_inverse (iph)) ? pptr[1 ] : pptr[0 ]; -#ifdef CONFIG_SYSCTL net =skb_net (skb);
@@ -586,7 +583,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,and the destination is a non-local unicast, then create a cache_bypass connection entry */ ipvs =net_ipvs (net); -if (ipvs->sysctl_cache_bypass && svc->fwmark && +if (sysctl_cache_bypass (ipvs) && svc->fwmark && !(iph->hdr_flags & (IP_VS_HDR_INVERSE |IP_VS_HDR_ICMP )) &&ip_vs_addr_is_unicast (net, svc->af, &iph->daddr)) {int ret;
@@ -624,7 +621,6 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,ip_vs_conn_put (cp);return ret; } -#endif /* * When the virtual ftp service is presented, packets destined
@@ -647,11 +643,8 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,*/ #ifdef CONFIG_IP_VS_IPV6 if (svc->af ==AF_INET6 ) { -if (!skb->dev) { -struct net *net_ =dev_net (skb_dst (skb)->dev); - - skb->dev = net_->loopback_dev; - } +if (!skb->dev) + skb->dev = net->loopback_dev;icmpv6_send (skb,ICMPV6_DEST_UNREACH ,ICMPV6_PORT_UNREACH ,0 ); } else#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 73/84 ipvs: Simplify ipvs and net access in ip_vs_leave
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
Stop using the hack skb_net(skb) to compute the network namespace.
--- net/netfilter/ipvs/ip_vs_core.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +2 -6
@@ -568,21 +568,17 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb, struct ip_vs_proto_data *pd, struct ip_vs_iphdr *iph) { __be16 _ports[2], *pptr, dport; -struct net *net; -struct netns_ipvs *ipvs; +struct netns_ipvs *ipvs = svc->ipvs; +struct net *net = ipvs->net; pptr =frag_safe_skb_hp (skb, iph->len,sizeof (_ports), _ports, iph);if (!pptr)return NF_DROP ; dport =likely (!ip_vs_iph_inverse (iph)) ? pptr[1 ] : pptr[0 ]; - net =skb_net (skb); - -/* if it is fwmark-based service, the cache_bypass sysctl is up and the destination is a non-local unicast, then create a cache_bypass connection entry */ - ipvs =net_ipvs (net);if (sysctl_cache_bypass (ipvs) && svc->fwmark && !(iph->hdr_flags & (IP_VS_HDR_INVERSE |IP_VS_HDR_ICMP )) &&ip_vs_addr_is_unicast (net, svc->af, &iph->daddr)) {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 74/84 ipvs: Pass ipvs not net into sysctl_nat_icmp_send
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- net/netfilter/ipvs/ip_vs_core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +3 -4
@@ -657,9 +657,8 @@ static int sysctl_snat_reroute(struct sk_buff *skb)return ipvs->sysctl_snat_reroute; } -static int sysctl_nat_icmp_send (struct net *net) +static int sysctl_nat_icmp_send (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net);return ipvs->sysctl_nat_icmp_send; }
@@ -671,7 +670,7 @@ static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs)#else static int sysctl_snat_reroute (struct sk_buff *skb) {return 0 ; } -static int sysctl_nat_icmp_send (struct net *net) {return 0 ; } +static int sysctl_nat_icmp_send (struct netns_ipvs *ipvs) {return 0 ; }static int sysctl_expire_nodest_conn (struct netns_ipvs *ipvs) {return 0 ; }#endif
@@ -1252,7 +1251,7 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)if (likely (cp))return handle_response (af, skb, pd, cp, &iph, hooknum); -if (sysctl_nat_icmp_send (net) && +if (sysctl_nat_icmp_send (ipvs) && (pp->protocol ==IPPROTO_TCP || pp->protocol ==IPPROTO_UDP || pp->protocol ==IPPROTO_SCTP )) {
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 75/84 ipvs: Pass ipvs into ip_vs_out
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_core.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +6 -9
@@ -1173,10 +1173,9 @@ drop:* Check if outgoing packet belongs to the established ip_vs_conn. */ static unsigned int -ip_vs_out (unsigned int hooknum,struct sk_buff *skb,int af) +ip_vs_out (struct netns_ipvs *ipvs,unsigned int hooknum,struct sk_buff *skb,int af) { -struct net *net =NULL ; -struct netns_ipvs *ipvs; +struct net *net = ipvs->net;struct ip_vs_iphdr iph;struct ip_vs_protocol *pp;struct ip_vs_proto_data *pd;
@@ -1201,8 +1200,6 @@ ip_vs_out(unsigned int hooknum, struct sk_buff *skb, int af)if (unlikely (!skb_dst (skb)))return NF_ACCEPT ; - net =skb_net (skb); - ipvs =net_ipvs (net);if (!ipvs->enable)return NF_ACCEPT ;
@@ -1306,7 +1303,7 @@ static unsigned int ip_vs_reply4(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_out (state->hook, skb,AF_INET ); +return ip_vs_out (net_ipvs (state->net), state->hook, skb,AF_INET ); }/*
@@ -1317,7 +1314,7 @@ static unsigned int ip_vs_local_reply4(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_out (state->hook, skb,AF_INET ); +return ip_vs_out (net_ipvs (state->net), state->hook, skb,AF_INET ); }#ifdef CONFIG_IP_VS_IPV6
@@ -1331,7 +1328,7 @@ static unsigned int ip_vs_reply6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_out (state->hook, skb,AF_INET6 ); +return ip_vs_out (net_ipvs (state->net), state->hook, skb,AF_INET6 ); }/*
@@ -1342,7 +1339,7 @@ static unsigned int ip_vs_local_reply6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_out (state->hook, skb,AF_INET6 ); +return ip_vs_out (net_ipvs (state->net), state->hook, skb,AF_INET6 ); }#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 76/84 ipvs: Pass ipvs into ip_vs_in
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_core.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +5 -9
@@ -1684,15 +1684,13 @@ out:* and send it on its way... */ static unsigned int -ip_vs_in (unsigned int hooknum,struct sk_buff *skb,int af) +ip_vs_in (struct netns_ipvs *ipvs,unsigned int hooknum,struct sk_buff *skb,int af) { -struct net *net;struct ip_vs_iphdr iph;struct ip_vs_protocol *pp;struct ip_vs_proto_data *pd;struct ip_vs_conn *cp;int ret, pkts; -struct netns_ipvs *ipvs;int conn_reuse_mode;/* Already marked as IPVS request or reply? */
@@ -1715,8 +1713,6 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)return NF_ACCEPT ; }/* ipvs enabled in this netns ? */ - net =skb_net (skb); - ipvs =net_ipvs (net);if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable))return NF_ACCEPT ;
@@ -1844,7 +1840,7 @@ static unsigned int ip_vs_remote_request4(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_in (state->hook, skb,AF_INET ); +return ip_vs_in (net_ipvs (state->net), state->hook, skb,AF_INET ); }/*
@@ -1855,7 +1851,7 @@ static unsigned int ip_vs_local_request4(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_in (state->hook, skb,AF_INET ); +return ip_vs_in (net_ipvs (state->net), state->hook, skb,AF_INET ); }#ifdef CONFIG_IP_VS_IPV6
@@ -1868,7 +1864,7 @@ static unsigned int ip_vs_remote_request6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_in (state->hook, skb,AF_INET6 ); +return ip_vs_in (net_ipvs (state->net), state->hook, skb,AF_INET6 ); }/*
@@ -1879,7 +1875,7 @@ static unsigned int ip_vs_local_request6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) { -return ip_vs_in (state->hook, skb,AF_INET6 ); +return ip_vs_in (net_ipvs (state->net), state->hook, skb,AF_INET6 ); }#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 77/84 ipvs: Pass ipvs into ip_vs_in_icmp and ip_vs_in_icmp_v6
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
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.
--- net/netfilter/ipvs/ip_vs_core.c | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +14 -22
@@ -1388,10 +1388,9 @@ ip_vs_try_to_schedule(struct netns_ipvs *ipvs, int af, struct sk_buff *skb,* Currently handles error types - unreachable, quench, ttl exceeded. */ static int -ip_vs_in_icmp (struct sk_buff *skb,int *related,unsigned int hooknum) +ip_vs_in_icmp (struct netns_ipvs *ipvs,struct sk_buff *skb,int *related, +unsigned int hooknum) { -struct net *net =NULL ; -struct netns_ipvs *ipvs;struct iphdr *iph;struct icmphdr _icmph, *ic;struct iphdr _ciph, *cih;/* The ip header contained within the ICMP */
@@ -1440,9 +1439,6 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)if (cih ==NULL )return NF_ACCEPT ;/* The packet looks wrong, ignore */ - net =skb_net (skb); - ipvs =net_ipvs (net); -/* Special case for errors for IPIP packets */ ipip = false;if (cih->protocol ==IPPROTO_IPIP ) {
@@ -1520,7 +1516,7 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)skb_reset_network_header (skb);IP_VS_DBG (12 ,"ICMP for IPIP %pI4->%pI4: mtu=%u\n" , &ip_hdr (skb)->saddr, &ip_hdr (skb)->daddr, mtu); -ipv4_update_pmtu (skb,dev_net (skb->dev), +ipv4_update_pmtu (skb, ipvs->net, mtu,0 ,0 ,0 ,0 );/* Client uses PMTUD? */ if (!(frag_off &htons (IP_DF )))
@@ -1575,11 +1571,10 @@ out: }#ifdef CONFIG_IP_VS_IPV6 -static int ip_vs_in_icmp_v6 (struct sk_buff *skb,int *related, -unsigned int hooknum,struct ip_vs_iphdr *iph) +static int ip_vs_in_icmp_v6 (struct netns_ipvs *ipvs,struct sk_buff *skb, +int *related,unsigned int hooknum, +struct ip_vs_iphdr *iph) { -struct net *net =NULL ; -struct netns_ipvs *ipvs;struct icmp6hdr _icmph, *ic;struct ip_vs_iphdr ciph = {.flags =0 , .fragoffs =0 };/*Contained IP */ struct ip_vs_conn *cp;
@@ -1619,8 +1614,6 @@ static int ip_vs_in_icmp_v6(struct sk_buff *skb, int *related,if (!ip_vs_fill_iph_skb_icmp (AF_INET6 , skb, offset, true, &ciph))return NF_ACCEPT ; - net =skb_net (skb); - ipvs =net_ipvs (net); pd =ip_vs_proto_data_get (ipvs, ciph.protocol);if (!pd)return NF_ACCEPT ;
@@ -1732,8 +1725,8 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, intif (af ==AF_INET6 ) {if (unlikely (iph.protocol ==IPPROTO_ICMPV6 )) {int related; -int verdict =ip_vs_in_icmp_v6 (skb, &related, hooknum, - &iph); +int verdict =ip_vs_in_icmp_v6 (ipvs, skb, &related, + hooknum, &iph);if (related)return verdict;
@@ -1742,7 +1735,8 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int#endif if (unlikely (iph.protocol ==IPPROTO_ICMP )) {int related; -int verdict =ip_vs_in_icmp (skb, &related, hooknum); +int verdict =ip_vs_in_icmp (ipvs, skb, &related, + hooknum);if (related)return verdict;
@@ -1895,17 +1889,16 @@ ip_vs_forward_icmp(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) {int r; -struct netns_ipvs *ipvs; +struct netns_ipvs *ipvs =net_ipvs (state->net);if (ip_hdr (skb)->protocol !=IPPROTO_ICMP )return NF_ACCEPT ;/* ipvs enabled in this netns ? */ - ipvs =net_ipvs (state->net);if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable))return NF_ACCEPT ; -return ip_vs_in_icmp (skb, &r, state->hook); +return ip_vs_in_icmp (ipvs, skb, &r, state->hook); }#ifdef CONFIG_IP_VS_IPV6
@@ -1914,7 +1907,7 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb, const struct nf_hook_state *state) {int r; -struct netns_ipvs *ipvs; +struct netns_ipvs *ipvs =net_ipvs (state->net);struct ip_vs_iphdr iphdr;ip_vs_fill_iph_skb (AF_INET6 , skb, false, &iphdr);
@@ -1922,11 +1915,10 @@ ip_vs_forward_icmp_v6(void *priv, struct sk_buff *skb,return NF_ACCEPT ;/* ipvs enabled in this netns ? */ - ipvs =net_ipvs (state->net);if (unlikely (sysctl_backup_only (ipvs) || !ipvs->enable))return NF_ACCEPT ; - return ip_vs_in_icmp_v6(skb, &r, state->hook, &iphdr); + return ip_vs_in_icmp_v6(ipvs, skb, &r, state->hook, &iphdr); }#endif
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 78/84 ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This removes the need to compute ipvs with the hack "net_ipvs(skb_net(skb))"
--- net/netfilter/ipvs/ip_vs_core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +7 -8
@@ -897,10 +897,9 @@ out:* Find any that might be relevant, check against existing connections. * Currently handles error types - unreachable, quench, ttl exceeded. */ -static int ip_vs_out_icmp (struct sk_buff *skb,int *related, -unsigned int hooknum) +static int ip_vs_out_icmp (struct netns_ipvs *ipvs,struct sk_buff *skb, +int *related,unsigned int hooknum) { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct iphdr *iph;struct icmphdr _icmph, *ic;struct iphdr _ciph, *cih;/* The ip header contained within the ICMP */
@@ -973,10 +972,10 @@ static int ip_vs_out_icmp(struct sk_buff *skb, int *related, }#ifdef CONFIG_IP_VS_IPV6 -static int ip_vs_out_icmp_v6 (struct sk_buff *skb,int *related, -unsigned int hooknum,struct ip_vs_iphdr *ipvsh) +static int ip_vs_out_icmp_v6 (struct netns_ipvs *ipvs,struct sk_buff *skb, +int *related,unsigned int hooknum, +struct ip_vs_iphdr *ipvsh) { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));struct icmp6hdr _icmph, *ic;struct ip_vs_iphdr ciph = {.flags =0 , .fragoffs =0 };/*Contained IP */ struct ip_vs_conn *cp;
@@ -1208,7 +1207,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, inif (af ==AF_INET6 ) {if (unlikely (iph.protocol ==IPPROTO_ICMPV6 )) {int related; -int verdict =ip_vs_out_icmp_v6 (skb, &related, +int verdict =ip_vs_out_icmp_v6 (ipvs, skb, &related, hooknum, &iph);if (related)
@@ -1218,7 +1217,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, in#endif if (unlikely (iph.protocol ==IPPROTO_ICMP )) {int related; -int verdict =ip_vs_out_icmp (skb, &related, hooknum); +int verdict =ip_vs_out_icmp (ipvs, skb, &related, hooknum);if (related)return verdict;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 79/84 ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_reroute
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This removes the need to use the hack skb_net.
--- net/netfilter/ipvs/ip_vs_core.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +7 -8
@@ -651,9 +651,8 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,#ifdef CONFIG_SYSCTL -static int sysctl_snat_reroute (struct sk_buff *skb) +static int sysctl_snat_reroute (struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (skb_net (skb));return ipvs->sysctl_snat_reroute; }
@@ -669,7 +668,7 @@ static int sysctl_expire_nodest_conn(struct netns_ipvs *ipvs)#else -static int sysctl_snat_reroute (struct sk_buff *skb) {return 0 ; } +static int sysctl_snat_reroute (struct netns_ipvs *ipvs) {return 0 ; }static int sysctl_nat_icmp_send (struct netns_ipvs *ipvs) {return 0 ; }static int sysctl_expire_nodest_conn (struct netns_ipvs *ipvs) {return 0 ; }
@@ -702,10 +701,10 @@ static inline int ip_vs_gather_frags(struct sk_buff *skb, u_int32_t user)return err; } -static int ip_vs_route_me_harder (int af,struct sk_buff *skb, -unsigned int hooknum) +static int ip_vs_route_me_harder (struct netns_ipvs *ipvs,int af, +struct sk_buff *skb,unsigned int hooknum) { -if (!sysctl_snat_reroute (skb)) +if (!sysctl_snat_reroute (ipvs))return 0 ;/* Reroute replies only to remote clients (FORWARD and LOCAL_OUT) */ if (NF_INET_LOCAL_IN == hooknum)
@@ -873,7 +872,7 @@ static int handle_response_icmp(int af, struct sk_buff *skb,#endif ip_vs_nat_icmp (skb, pp, cp,1 ); -if (ip_vs_route_me_harder (af, skb, hooknum)) +if (ip_vs_route_me_harder (cp->ipvs, af, skb, hooknum)) goto out;/* do the statistics and put it back */
@@ -1144,7 +1143,7 @@ handle_response(int af, struct sk_buff *skb, struct ip_vs_proto_data *pd,* if it came from this machine itself. So re-compute * the routing information. */ -if (ip_vs_route_me_harder (af, skb, hooknum)) +if (ip_vs_route_me_harder (cp->ipvs, af, skb, hooknum)) goto drop;IP_VS_DBG_PKT (10 , af, pp, skb, iph->off,"After SNAT" );
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 80/84 ipvs: Remove net argument from ip_vs_tcp_conn_listen
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
The argument is unnecessary and in practice confusing, and has caused the callers to do all manner of silly things.
--- include/net/ip_vs.h | 2 +- net/netfilter/ipvs/ip_vs_ftp.c | 8 ++------ net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- 3 files changed, 5 insertions(+), 9 deletions(-)
include/net/ip_vs.h +1 -1
@@ -1271,7 +1271,7 @@ void ip_vs_conn_expire_now(struct ip_vs_conn *cp);const char *ip_vs_state_name (__u16 proto,int state); -void ip_vs_tcp_conn_listen (struct net *net,struct ip_vs_conn *cp); +void ip_vs_tcp_conn_listen (struct ip_vs_conn *cp);int ip_vs_check_template (struct ip_vs_conn *ct);void ip_vs_random_dropentry (struct netns_ipvs *ipvs);int ip_vs_conn_init (void );
net/netfilter/ipvs/ip_vs_ftp.c +2 -6
@@ -181,7 +181,6 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,int ret =0 ;enum ip_conntrack_info ctinfo;struct nf_conn *ct; -struct net *net; *diff =0 ;
@@ -289,9 +288,8 @@ static int ip_vs_ftp_out(struct ip_vs_app *app, struct ip_vs_conn *cp,* would be adjusted twice. */ - net =skb_net (skb); cp->app_data =NULL ; -ip_vs_tcp_conn_listen (net, n_cp); +ip_vs_tcp_conn_listen (n_cp);ip_vs_conn_put (n_cp);return ret; }
@@ -320,7 +318,6 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,union nf_inet_addr to;__be16 port;struct ip_vs_conn *n_cp; -struct net *net;/* no diff required for incoming packets */ *diff =0 ;
@@ -413,8 +410,7 @@ static int ip_vs_ftp_in(struct ip_vs_app *app, struct ip_vs_conn *cp,/* * Move tunnel to listen state */ - net =skb_net (skb); -ip_vs_tcp_conn_listen (net, n_cp); +ip_vs_tcp_conn_listen (n_cp);ip_vs_conn_put (n_cp);return 1 ;
net/netfilter/ipvs/ip_vs_proto_tcp.c +2 -2
@@ -672,9 +672,9 @@ tcp_app_conn_bind(struct ip_vs_conn *cp)/* * Set LISTEN timeout. (ip_vs_conn_put will setup timer) */ -void ip_vs_tcp_conn_listen (struct net *net,struct ip_vs_conn *cp) +void ip_vs_tcp_conn_listen (struct ip_vs_conn *cp) { -struct ip_vs_proto_data *pd =ip_vs_proto_data_get (net_ipvs (net),IPPROTO_TCP ); +struct ip_vs_proto_data *pd =ip_vs_proto_data_get (cp->ipvs,IPPROTO_TCP );spin_lock_bh (&cp->lock); cp->state =IP_VS_TCP_S_LISTEN ;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 81/84 ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
--- include/net/ip_vs.h | 4 ++-- net/netfilter/ipvs/ip_vs_core.c | 6 +++--- net/netfilter/ipvs/ip_vs_proto.c | 8 +++----- 3 files changed, 8 insertions(+), 10 deletions(-)
include/net/ip_vs.h +2 -2
@@ -1340,13 +1340,13 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)/* IPVS netns init & cleanup functions */ int ip_vs_estimator_net_init (struct netns_ipvs *ipvs);int ip_vs_control_net_init (struct netns_ipvs *ipvs); -int ip_vs_protocol_net_init (struct net *net); +int ip_vs_protocol_net_init (struct netns_ipvs *ipvs);int ip_vs_app_net_init (struct netns_ipvs *ipvs);int ip_vs_conn_net_init (struct netns_ipvs *ipvs);int ip_vs_sync_net_init (struct netns_ipvs *ipvs);void ip_vs_conn_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_app_net_cleanup (struct netns_ipvs *ipvs); -void ip_vs_protocol_net_cleanup (struct net *net); +void ip_vs_protocol_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_control_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_estimator_net_cleanup (struct netns_ipvs *ipvs);void ip_vs_sync_net_cleanup (struct netns_ipvs *ipvs);
net/netfilter/ipvs/ip_vs_core.c +3 -3
@@ -2052,7 +2052,7 @@ static int __net_init __ip_vs_init(struct net *net)if (ip_vs_control_net_init (ipvs) <0 ) goto control_fail; -if (ip_vs_protocol_net_init (net) <0 ) +if (ip_vs_protocol_net_init (ipvs) <0 ) goto protocol_fail;if (ip_vs_app_net_init (ipvs) <0 )
@@ -2076,7 +2076,7 @@ sync_fail: conn_fail:ip_vs_app_net_cleanup (ipvs); app_fail: -ip_vs_protocol_net_cleanup (net); +ip_vs_protocol_net_cleanup (ipvs); protocol_fail:ip_vs_control_net_cleanup (ipvs); control_fail:
@@ -2093,7 +2093,7 @@ static void __net_exit __ip_vs_cleanup(struct net *net)ip_vs_service_net_cleanup (ipvs);/* ip_vs_flush() with locks */ ip_vs_conn_net_cleanup (ipvs);ip_vs_app_net_cleanup (ipvs); -ip_vs_protocol_net_cleanup (net); +ip_vs_protocol_net_cleanup (ipvs);ip_vs_control_net_cleanup (ipvs);ip_vs_estimator_net_cleanup (ipvs);IP_VS_DBG (2 ,"ipvs netns %d released\n" , ipvs->gen);
net/netfilter/ipvs/ip_vs_proto.c +3 -5
@@ -307,7 +307,7 @@ ip_vs_tcpudp_debug_packet(int af, struct ip_vs_protocol *pp,/* * per network name-space init */ -int __net_init ip_vs_protocol_net_init (struct net *net) +int __net_init ip_vs_protocol_net_init (struct netns_ipvs *ipvs) {int i, ret;static struct ip_vs_protocol *protos[] = {
@@ -327,7 +327,6 @@ int __net_init ip_vs_protocol_net_init(struct net *net) &ip_vs_protocol_esp,#endif }; -struct netns_ipvs *ipvs =net_ipvs (net);for (i =0 ; i <ARRAY_SIZE (protos); i++) { ret =register_ip_vs_proto_netns (ipvs, protos[i]);
@@ -337,13 +336,12 @@ int __net_init ip_vs_protocol_net_init(struct net *net)return 0 ; cleanup: -ip_vs_protocol_net_cleanup (net); +ip_vs_protocol_net_cleanup (ipvs);return ret; } -void __net_exit ip_vs_protocol_net_cleanup(struct net *net) +void __net_exit ip_vs_protocol_net_cleanup(struct netns_ipvs *ipvs) { -struct netns_ipvs *ipvs =net_ipvs (net);struct ip_vs_proto_data *pd;int i;
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 82/84 ipvs: Remove skb_net
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This hack has no more users so remove it.
--- include/net/ip_vs.h | 31 ------------------------------- 1 file changed, 31 deletions(-)
include/net/ip_vs.h +0 -31
@@ -38,37 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net)return net->ipvs; } -/* Get net ptr from skb in traffic cases -* use skb_sknet when call is from userland (ioctl or netlink) -*/ -static inline struct net *skb_net (const struct sk_buff *skb) -{ -#ifdef CONFIG_NET_NS -#ifdef CONFIG_IP_VS_DEBUG -/* -* This is used for debug only. -* Start with the most likely hit -* End with BUG -*/ -if (likely (skb->dev &&dev_net (skb->dev))) -return dev_net (skb->dev); -if (skb_dst (skb) &&skb_dst (skb)->dev) -return dev_net (skb_dst (skb)->dev); -WARN (skb->sk,"Maybe skb_sknet should be used in %s() at line:%d\n" , - __func__, __LINE__); -if (likely (skb->sk &&sock_net (skb->sk))) -return sock_net (skb->sk); -pr_err ("There is no net ptr to find in the skb in %s() line:%d\n" , - __func__, __LINE__); -BUG (); -#else -return dev_net (skb->dev ? :skb_dst (skb)->dev); -#endif -#else -return &init_net; -#endif -} -static inline struct net *skb_sknet (const struct sk_buff *skb) {#ifdef CONFIG_NET_NS
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 83/84 ipvs: Remove skb_sknet
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This function adds no real value and it obscures what the code is doing.
--- include/net/ip_vs.h | 22 ---------------------- net/netfilter/ipvs/ip_vs_ctl.c | 25 ++++++++++--------------- 2 files changed, 10 insertions(+), 37 deletions(-)
include/net/ip_vs.h +0 -22
@@ -38,28 +38,6 @@ static inline struct netns_ipvs *net_ipvs(struct net* net)return net->ipvs; } -static inline struct net *skb_sknet (const struct sk_buff *skb) -{ -#ifdef CONFIG_NET_NS -#ifdef CONFIG_IP_VS_DEBUG -/* Start with the most likely hit */ -if (likely (skb->sk &&sock_net (skb->sk))) -return sock_net (skb->sk); -WARN (skb->dev,"Maybe skb_net should be used instead in %s() line:%d\n" , - __func__, __LINE__); -if (likely (skb->dev &&dev_net (skb->dev))) -return dev_net (skb->dev); -pr_err ("There is no net ptr to find in the skb in %s() line:%d\n" , - __func__, __LINE__); -BUG (); -#else -return sock_net (skb->sk); -#endif -#else -return &init_net; -#endif -} -/* This one needed for single_open_net since net is stored directly in * private not as a struct i.e. seq_file_net can't be used. */
net/netfilter/ipvs/ip_vs_ctl.c +10 -15
@@ -3002,7 +3002,8 @@ static int ip_vs_genl_dump_services(struct sk_buff *skb,int idx =0 , i;int start = cb->args[0 ];struct ip_vs_service *svc; -struct netns_ipvs *ipvs =net_ipvs (skb_sknet (skb)); +struct net *net =sock_net (skb->sk); +struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&__ip_vs_mutex);for (i =0 ; i <IP_VS_SVC_TAB_SIZE ; i++) {
@@ -3201,7 +3202,7 @@ static int ip_vs_genl_dump_dests(struct sk_buff *skb,struct ip_vs_service *svc;struct ip_vs_dest *dest;struct nlattr *attrs[IPVS_CMD_ATTR_MAX +1 ]; -struct net *net =skb_sknet (skb); +struct net *net =sock_net (skb->sk);struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&__ip_vs_mutex);
@@ -3348,7 +3349,7 @@ nla_put_failure:static int ip_vs_genl_dump_daemons (struct sk_buff *skb,struct netlink_callback *cb) { -struct net *net =skb_sknet (skb); +struct net *net =sock_net (skb->sk);struct netns_ipvs *ipvs =net_ipvs (net);mutex_lock (&ipvs->sync_mutex);
@@ -3475,11 +3476,9 @@ static int ip_vs_genl_set_config(struct netns_ipvs *ipvs, struct nlattr **attrs)static int ip_vs_genl_set_daemon (struct sk_buff *skb,struct genl_info *info) {int ret = -EINVAL , cmd; -struct net *net; -struct netns_ipvs *ipvs; +struct net *net =sock_net (skb->sk); +struct netns_ipvs *ipvs =net_ipvs (net); - net =skb_sknet (skb); - ipvs =net_ipvs (net); cmd = info->genlhdr->cmd;if (cmd ==IPVS_CMD_NEW_DAEMON || cmd ==IPVS_CMD_DEL_DAEMON ) {
@@ -3508,11 +3507,9 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info)struct ip_vs_dest_user_kern udest;int ret =0 , cmd;int need_full_svc =0 , need_full_dest =0 ; -struct net *net; -struct netns_ipvs *ipvs; +struct net *net =sock_net (skb->sk); +struct netns_ipvs *ipvs =net_ipvs (net); - net =skb_sknet (skb); - ipvs =net_ipvs (net); cmd = info->genlhdr->cmd;mutex_lock (&__ip_vs_mutex);
@@ -3632,11 +3629,9 @@ static int ip_vs_genl_get_cmd(struct sk_buff *skb, struct genl_info *info)struct sk_buff *msg;void *reply;int ret, cmd, reply_cmd; -struct net *net; -struct netns_ipvs *ipvs; +struct net *net =sock_net (skb->sk); +struct netns_ipvs *ipvs =net_ipvs (net); - net =skb_sknet (skb); - ipvs =net_ipvs (net); cmd = info->genlhdr->cmd;if (cmd ==IPVS_CMD_GET_SERVICE )
Signature · 1 line
2.1.4
Simon Horman
maintainerPATCH 84/84 ipvs: Pass ipvs into ip_vs_gather_frags
In reply to Simon HormanFrom: "Eric W. Biederman" <[email protected]>
This will be needed later when the network namespace guessing is removed from ip_defrag.
--- net/netfilter/ipvs/ip_vs_core.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +5 -4
@@ -688,7 +688,8 @@ static inline enum ip_defrag_users ip_vs_defrag_user(unsigned int hooknum)return IP_DEFRAG_VS_OUT ; } -static inline int ip_vs_gather_frags (struct sk_buff *skb,u_int32_t user) +static inline int ip_vs_gather_frags (struct netns_ipvs *ipvs, +struct sk_buff *skb,u_int32_t user) {int err;
@@ -912,7 +913,7 @@ static int ip_vs_out_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb,/* reassemble IP fragments */ if (ip_is_fragment (ip_hdr (skb))) { -if (ip_vs_gather_frags (skb,ip_vs_defrag_user (hooknum))) +if (ip_vs_gather_frags (ipvs, skb,ip_vs_defrag_user (hooknum)))return NF_STOLEN ; }
@@ -1232,7 +1233,7 @@ ip_vs_out(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, in if (af == AF_INET)#endif if (unlikely (ip_is_fragment (ip_hdr (skb)) && !pp->dont_defrag)) { -if (ip_vs_gather_frags (skb, +if (ip_vs_gather_frags (ipvs, skb,ip_vs_defrag_user (hooknum)))return NF_STOLEN ;
@@ -1403,7 +1404,7 @@ ip_vs_in_icmp(struct netns_ipvs *ipvs, struct sk_buff *skb, int *related,/* reassemble IP fragments */ if (ip_is_fragment (ip_hdr (skb))) { -if (ip_vs_gather_frags (skb,ip_vs_defrag_user (hooknum))) +if (ip_vs_gather_frags (ipvs, skb,ip_vs_defrag_user (hooknum)))return NF_STOLEN ; }
Signature · 1 line
2.1.4
Pablo Neira Ayuso
maintainerQuoted 4 lines · Simon Horman
Hi Pablo,
please consider these bug fixes and extensive clean-ups of IPVS from Eric Biederman for v4.4.
Pulled, thanks Simon.
PATCH 1/1 ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL
I arranged the code so that the compiler can remove the unecessary bits in ip_vs_leave when CONFIG_SYSCTL is unset, and removed an explicit CONFIG_SYSCTL.
Unfortunately when rebasing my work on top of that of Alex Gartrell I missed the fact that the newly added function ip_vs_addr_is_unicast was surrounded by CONFIG_SYSCTL.
So remove the now unnecessary CONFIG_SYSCTL guards around ip_vs_addr_is_unicast. It is causing build failures today when CONFIG_SYSCTL is not selected and any self respecting compiler will notice that sysctl_cache_bypass is always false without CONFIG_SYSCTL and not include the logic from the function ip_vs_addr_is_unicast in the compiled code.
---
This is a build fix for ipvs-next and nf-next.
net/netfilter/ipvs/ip_vs_core.c | 2 -- 1 file changed, 2 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +0 -2
@@ -547,7 +547,6 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,return cp; } -#ifdef CONFIG_SYSCTL static inline int ip_vs_addr_is_unicast (struct net *net,int af,union nf_inet_addr *addr) {
@@ -557,7 +556,6 @@ static inline int ip_vs_addr_is_unicast(struct net *net, int af,#endif return (inet_addr_type (net, addr->ip) ==RTN_UNICAST ); } -#endif /* * Pass or drop the packet.
Signature · 1 line
2.2.1
Re: [PATCH] ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL
Hello,
Quoted 8 lines · Eric W. Biederman
I arranged the code so that the compiler can remove the unecessary bits in
ip_vs_leavewhenCONFIG_SYSCTLis unset, and removed an explicitCONFIG_SYSCTL.Unfortunately when rebasing my work on top of that of Alex Gartrell I missed the fact that the newly added function
ip_vs_addr_is_unicastwas surrounded byCONFIG_SYSCTL.
Quoted 8 lines
So remove the now unnecessary
CONFIG_SYSCTLguards aroundip_vs_addr_is_unicast. It is causing build failures today whenCONFIG_SYSCTLis not selected and any self respecting compiler will notice thatsysctl_cache_bypassis always false withoutCONFIG_SYSCTLand not include the logic from the functionip_vs_addr_is_unicastin the compiled code.Signed-off-by "Eric W. Biederman" <[email protected]>
Simon, please apply to ipvs-next
Quoted 29 lines
---
This is a build fix for ipvs-next and nf-next.
net/netfilter/ipvs/ip_vs_core.c | 2 -- 1 file changed, 2 deletions(-)net/netfilter/ipvs/ip_vs_core.c +0
-2@@ -547,7 +547,6 @@ ip_vs_schedule(struct ip_vs_service *svc, struct sk_buff *skb,return cp; } -#ifdef CONFIG_SYSCTL static inline int ip_vs_addr_is_unicast (struct net *net,int af,union nf_inet_addr *addr) {@@ -557,7 +556,6 @@ static inline int ip_vs_addr_is_unicast(struct net *net, int af,#endif return (inet_addr_type (net, addr->ip) ==RTN_UNICAST ); } -#endif /* * Pass or drop the packet. Signature · 1 line
2.2.1
Regards
--
Julian Anastasov <[email protected]>
Re: [PATCH] ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTL
Quoted 20 lines · Julian Anastasov
Hello,
Quoted 15 lines · Eric W. Biederman
I arranged the code so that the compiler can remove the unecessary bits in
ip_vs_leavewhenCONFIG_SYSCTLis unset, and removed an explicitCONFIG_SYSCTL.Unfortunately when rebasing my work on top of that of Alex Gartrell I missed the fact that the newly added function
ip_vs_addr_is_unicastwas surrounded byCONFIG_SYSCTL.So remove the now unnecessary
CONFIG_SYSCTLguards aroundip_vs_addr_is_unicast. It is causing build failures today whenCONFIG_SYSCTLis not selected and any self respecting compiler will notice thatsysctl_cache_bypassis always false withoutCONFIG_SYSCTLand not include the logic from the functionip_vs_addr_is_unicastin the compiled code.
Quoted 5 lines
Quoted 1 line
Signed-off-by "Eric W. Biederman" <[email protected]>Acked-by Julian Anastasov <[email protected]>Simon, please apply to ipvs-next
Thanks, applied.