ipv4: tcp_memcontrol and userns sysctls
Subsystems (7)
cover ipv4: tcp_memcontrol and userns sysctls
While looking into allowing the ipv4 sysctls to be used in a network namespace I stumbled upon the mess that is tcp_memcontrol.
I remove the dead code, broken code, and excessive abstraction in the tcp_memcontrols then I clean up up and allow in the user namespace the per net ipv4 sysctls.
Eric W. Biederman (6):
tcp_memcontrol: Remove tcp_max_memory
tcp_memcontrol: Remove setting cgroup settings via sysctl
tcp_memcontrol: Remove the per netns control.
tcp_memcontrol: Kill struct tcp_memcontrol
ipv4: Use math to point per net sysctls into the appropriate struct net.
ipv4: Allow unprivileged users to use per net sysctls
include/net/netns/ipv4.h | 1 - include/net/sock.h | 28 ++++++------ include/net/tcp.h | 3 +- include/net/tcp_memcontrol.h | 12 ------ mm/memcontrol.c | 6 +- net/ipv4/af_inet.c | 2 - net/ipv4/sysctl_net_ipv4.c | 85 ++++++---------------------------------- net/ipv4/tcp.c | 12 +++-- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_memcontrol.c | 90 ++++++++--------------------------------- net/ipv6/af_inet6.c | 2 - net/ipv6/tcp_ipv6.c | 1 + 12 files changed, 57 insertions(+), 186 deletions(-)
Eric
PATCH 1/6 tcp_memcontrol: Remove tcp_max_memory
In reply to a message not in the archiveThis function is never called. Remove it.
--- include/net/tcp_memcontrol.h | 1 - net/ipv4/tcp_memcontrol.c | 13 ------------- 2 files changed, 0 insertions(+), 14 deletions(-)
include/net/tcp_memcontrol.h +0 -1
@@ -14,6 +14,5 @@ struct tcp_memcontrol {struct cg_proto *tcp_proto_cgroup (struct mem_cgroup *memcg);int tcp_init_cgroup (struct mem_cgroup *memcg,struct cgroup_subsys *ss);void tcp_destroy_cgroup (struct mem_cgroup *memcg); -unsigned long long tcp_max_memory (const struct mem_cgroup *memcg);void tcp_prot_mem (struct mem_cgroup *memcg,long val,int idx);#endif /* _TCP_MEMCG_H */
net/ipv4/tcp_memcontrol.c +0 -13
@@ -226,19 +226,6 @@ static int tcp_cgroup_reset(struct cgroup_subsys_state *css, unsigned int event)return 0 ; } -unsigned long long tcp_max_memory (const struct mem_cgroup *memcg) -{ -struct tcp_memcontrol *tcp; -struct cg_proto *cg_proto; - - cg_proto = tcp_prot.proto_cgroup ((struct mem_cgroup *)memcg); -if (!cg_proto) -return 0 ; - - tcp =tcp_from_cgproto (cg_proto); -return res_counter_read_u64 (&tcp->tcp_memory_allocated,RES_LIMIT ); -} -void tcp_prot_mem (struct mem_cgroup *memcg,long val,int idx) {struct tcp_memcontrol *tcp;
Signature · 1 line
1.7.5.4
PATCH 2/6 tcp_memcontrol: Remove setting cgroup settings via sysctl
In reply to a message not in the archiveThe code is broken and does not constrain sysctl_tcp_mem as tcp_update_limit does. With the result that it allows the cgroup tcp memory limits to be bypassed.
The semantics are broken as the settings are not per netns and are in a per netns table, and instead looks at current.
Since the code is broken in both design and implementation and does not implement the functionality for which it was written remove it.
--- include/net/tcp_memcontrol.h | 1 - net/ipv4/sysctl_net_ipv4.c | 39 ++------------------------------------- net/ipv4/tcp_memcontrol.c | 14 -------------- 3 files changed, 2 insertions(+), 52 deletions(-)
include/net/tcp_memcontrol.h +0 -1
@@ -14,5 +14,4 @@ struct tcp_memcontrol {struct cg_proto *tcp_proto_cgroup (struct mem_cgroup *memcg);int tcp_init_cgroup (struct mem_cgroup *memcg,struct cgroup_subsys *ss);void tcp_destroy_cgroup (struct mem_cgroup *memcg); -void tcp_prot_mem (struct mem_cgroup *memcg,long val,int idx);#endif /* _TCP_MEMCG_H */
net/ipv4/sysctl_net_ipv4.c +2 -37
@@ -204,43 +204,8 @@ static int ipv4_tcp_mem(struct ctl_table *ctl, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { - int ret; -unsigned long vec[3 ]; -struct net *net = current->nsproxy->net_ns; -#ifdef CONFIG_MEMCG_KMEM -struct mem_cgroup *memcg; -#endif - -struct ctl_table tmp = { - .data = &vec, - .maxlen =sizeof (vec), - .mode = ctl->mode, - }; - -if (!write) { - ctl->data = &net->ipv4.sysctl_tcp_mem; -return proc_doulongvec_minmax (ctl, write, buffer, lenp, ppos); - } - - ret =proc_doulongvec_minmax (&tmp, write, buffer, lenp, ppos); -if (ret) -return ret; - -#ifdef CONFIG_MEMCG_KMEM -rcu_read_lock (); - memcg =mem_cgroup_from_task (current); - -tcp_prot_mem (memcg, vec[0 ],0 ); -tcp_prot_mem (memcg, vec[1 ],1 ); -tcp_prot_mem (memcg, vec[2 ],2 ); -rcu_read_unlock (); -#endif - - net->ipv4.sysctl_tcp_mem[0 ] = vec[0 ]; - net->ipv4.sysctl_tcp_mem[1 ] = vec[1 ]; - net->ipv4.sysctl_tcp_mem[2 ] = vec[2 ]; - -return 0 ; + ctl->data = ¤t->nsproxy->net_ns->ipv4.sysctl_tcp_mem; +return proc_doulongvec_minmax (ctl, write, buffer, lenp, ppos); } static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
net/ipv4/tcp_memcontrol.c +0 -14
@@ -226,20 +226,6 @@ static int tcp_cgroup_reset(struct cgroup_subsys_state *css, unsigned int event)return 0 ; } -void tcp_prot_mem (struct mem_cgroup *memcg,long val,int idx) -{ -struct tcp_memcontrol *tcp; -struct cg_proto *cg_proto; - - cg_proto = tcp_prot.proto_cgroup (memcg); -if (!cg_proto) -return ; - - tcp =tcp_from_cgproto (cg_proto); - - tcp->tcp_prot_mem[idx] = val; -} -static struct cftype tcp_files[] = { { .name ="kmem.tcp.limit_in_bytes" ,
Signature · 1 line
1.7.5.4
PATCH 3/6 tcp_memcontrol: Remove the per netns control.
In reply to a message not in the archiveThe code that is implemented is per memory cgroup not per netns, and having per netns bits is just confusing. Remove the per netns bits to make it easier to see what is really going on.
--- include/net/netns/ipv4.h | 1 - include/net/tcp.h | 3 +-- net/ipv4/af_inet.c | 2 -- net/ipv4/sysctl_net_ipv4.c | 23 +++++++---------------- net/ipv4/tcp.c | 12 +++++++----- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_memcontrol.c | 10 ++++------ net/ipv6/af_inet6.c | 2 -- net/ipv6/tcp_ipv6.c | 1 + 9 files changed, 21 insertions(+), 34 deletions(-)
include/net/netns/ipv4.h +0 -1
@@ -71,7 +71,6 @@ struct netns_ipv4 {int sysctl_tcp_ecn;kgid_t sysctl_ping_group_range[2 ]; -long sysctl_tcp_mem[3 ];atomic_t dev_addr_genid;
include/net/tcp.h +1 -2
@@ -259,6 +259,7 @@ extern int sysctl_tcp_max_orphans;extern int sysctl_tcp_fack;extern int sysctl_tcp_reordering;extern int sysctl_tcp_dsack; +extern long sysctl_tcp_mem[3 ];extern int sysctl_tcp_wmem[3 ];extern int sysctl_tcp_rmem[3 ];extern int sysctl_tcp_app_win;
@@ -348,8 +349,6 @@ extern struct proto tcp_prot;#define TCP_ADD_STATS_USER (net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)#define TCP_ADD_STATS (net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) -void tcp_init_mem (struct net *net); -void tcp_tasklet_init (void );void tcp_v4_err (struct sk_buff *skb,u32 );
net/ipv4/af_inet.c +0 -2
@@ -1706,8 +1706,6 @@ static int __init inet_init(void)ip_static_sysctl_init ();#endif - tcp_prot.sysctl_mem = init_net.ipv4.sysctl_tcp_mem; -/* * Add all the base protocols. */
net/ipv4/sysctl_net_ipv4.c +7 -16
@@ -200,14 +200,6 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,return ret; } -static int ipv4_tcp_mem (struct ctl_table *ctl,int write, -void __user *buffer,size_t *lenp, -loff_t *ppos) -{ - ctl->data = ¤t->nsproxy->net_ns->ipv4.sysctl_tcp_mem; -return proc_doulongvec_minmax (ctl, write, buffer, lenp, ppos); -} -static int proc_tcp_fastopen_key (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -517,6 +509,13 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec }, { + .procname = "tcp_mem", + .maxlen = sizeof(sysctl_tcp_mem), + .data = &sysctl_tcp_mem, + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + }, + { .procname = "tcp_wmem", .data = &sysctl_tcp_wmem, .maxlen = sizeof(sysctl_tcp_wmem),
@@ -825,12 +824,6 @@ static struct ctl_table ipv4_net_table[] = { .mode = 0644, .proc_handler = ipv4_local_port_range, }, - { - .procname = "tcp_mem", - .maxlen = sizeof(init_net.ipv4.sysctl_tcp_mem), - .mode = 0644, - .proc_handler = ipv4_tcp_mem, - }, { } };
@@ -882,8 +875,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) net->ipv4.sysctl_local_ports.range[0 ] =32768 ; net->ipv4.sysctl_local_ports.range[1 ] =61000 ; -tcp_init_mem (net); - net->ipv4.ipv4_hdr =register_net_sysctl (net,"net/ipv4" , table);if (net->ipv4.ipv4_hdr ==NULL ) goto err_reg;
net/ipv4/tcp.c +7 -5
@@ -288,9 +288,11 @@ int sysctl_tcp_min_tso_segs __read_mostly = 2;struct percpu_counter tcp_orphan_count;EXPORT_SYMBOL_GPL (tcp_orphan_count); +long sysctl_tcp_mem[3 ]__read_mostly ;int sysctl_tcp_wmem[3 ]__read_mostly ;int sysctl_tcp_rmem[3 ]__read_mostly ; +EXPORT_SYMBOL (sysctl_tcp_mem);EXPORT_SYMBOL (sysctl_tcp_rmem);EXPORT_SYMBOL (sysctl_tcp_wmem);
@@ -3097,13 +3099,13 @@ static int __init set_thash_entries(char *str) }__setup ("thash_entries=" , set_thash_entries); -void tcp_init_mem (struct net *net) +static void tcp_init_mem (void ) {unsigned long limit =nr_free_buffer_pages () /8 ; limit =max (limit,128UL ); - net->ipv4.sysctl_tcp_mem[0 ] = limit /4 *3 ; - net->ipv4.sysctl_tcp_mem[1 ] = limit; - net->ipv4.sysctl_tcp_mem[2 ] = net->ipv4.sysctl_tcp_mem[0 ] *2 ; + sysctl_tcp_mem[0 ] = limit /4 *3 ; + sysctl_tcp_mem[1 ] = limit; + sysctl_tcp_mem[2 ] = sysctl_tcp_mem[0 ] *2 ; }void __init tcp_init (void )
@@ -3165,7 +3167,7 @@ void __init tcp_init(void) sysctl_tcp_max_orphans = cnt /2 ; sysctl_max_syn_backlog =max (128 , cnt /256 ); -tcp_init_mem (&init_net); +tcp_init_mem ();/* Set per-socket limits to no more than 1/128 the pressure threshold */ limit =nr_free_buffer_pages () << (PAGE_SHIFT -7 ); max_wshare =min (4UL *1024 *1024 , limit);
net/ipv4/tcp_ipv4.c +1 -0
@@ -2749,6 +2749,7 @@ struct proto tcp_prot = { .orphan_count = &tcp_orphan_count, .memory_allocated = &tcp_memory_allocated, .memory_pressure = &tcp_memory_pressure, + .sysctl_mem = sysctl_tcp_mem, .sysctl_wmem = sysctl_tcp_wmem, .sysctl_rmem = sysctl_tcp_rmem, .max_header = MAX_TCP_HEADER,
net/ipv4/tcp_memcontrol.c +4 -6
@@ -29,7 +29,6 @@ int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss)struct cg_proto *cg_proto, *parent_cg;struct tcp_memcontrol *tcp;struct mem_cgroup *parent =parent_mem_cgroup (memcg); -struct net *net = current->nsproxy->net_ns; cg_proto = tcp_prot.proto_cgroup (memcg);if (!cg_proto)
@@ -37,9 +36,9 @@ int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss) tcp =tcp_from_cgproto (cg_proto); - tcp->tcp_prot_mem[0 ] = net->ipv4.sysctl_tcp_mem[0 ]; - tcp->tcp_prot_mem[1 ] = net->ipv4.sysctl_tcp_mem[1 ]; - tcp->tcp_prot_mem[2 ] = net->ipv4.sysctl_tcp_mem[2 ]; + tcp->tcp_prot_mem[0 ] = sysctl_tcp_mem[0 ]; + tcp->tcp_prot_mem[1 ] = sysctl_tcp_mem[1 ]; + tcp->tcp_prot_mem[2 ] = sysctl_tcp_mem[2 ]; tcp->tcp_memory_pressure =0 ; parent_cg = tcp_prot.proto_cgroup (parent);
@@ -76,7 +75,6 @@ EXPORT_SYMBOL(tcp_destroy_cgroup);static int tcp_update_limit (struct mem_cgroup *memcg,u64 val) { -struct net *net = current->nsproxy->net_ns;struct tcp_memcontrol *tcp;struct cg_proto *cg_proto;u64 old_lim;
@@ -99,7 +97,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)for (i =0 ; i <3 ; i++) tcp->tcp_prot_mem[i] =min_t (long, val >>PAGE_SHIFT , - net->ipv4.sysctl_tcp_mem[i]); + sysctl_tcp_mem[i]);if (val ==RES_COUNTER_MAX )clear_bit (MEMCG_SOCK_ACTIVE , &cg_proto->flags);
net/ipv6/af_inet6.c +0 -2
@@ -870,8 +870,6 @@ static int __init inet6_init(void)if (err) goto out_sock_register_fail; - tcpv6_prot.sysctl_mem = init_net.ipv4.sysctl_tcp_mem; -/* * ipngwg API draft makes clear that the correct semantics * for TCP and UDP is to consider one TCP and UDP instance
net/ipv6/tcp_ipv6.c +1 -0
@@ -1929,6 +1929,7 @@ struct proto tcpv6_prot = { .memory_allocated = &tcp_memory_allocated, .memory_pressure = &tcp_memory_pressure, .orphan_count = &tcp_orphan_count, + .sysctl_mem = sysctl_tcp_mem, .sysctl_wmem = sysctl_tcp_wmem, .sysctl_rmem = sysctl_tcp_rmem, .max_header = MAX_TCP_HEADER,
Signature · 1 line
1.7.5.4
PATCH 3/6 tcp_memcontrol: Remove the per netns control.
In reply to a message not in the archiveThe code that is implemented is per memory cgroup not per netns, and having per netns bits is just confusing. Remove the per netns bits to make it easier to see what is really going on.
--- include/net/netns/ipv4.h | 1 - include/net/tcp.h | 3 +-- net/ipv4/af_inet.c | 2 -- net/ipv4/sysctl_net_ipv4.c | 23 +++++++---------------- net/ipv4/tcp.c | 12 +++++++----- net/ipv4/tcp_ipv4.c | 1 + net/ipv4/tcp_memcontrol.c | 10 ++++------ net/ipv6/af_inet6.c | 2 -- net/ipv6/tcp_ipv6.c | 1 + 9 files changed, 21 insertions(+), 34 deletions(-)
include/net/netns/ipv4.h +0 -1
@@ -71,7 +71,6 @@ struct netns_ipv4 {int sysctl_tcp_ecn;kgid_t sysctl_ping_group_range[2 ]; -long sysctl_tcp_mem[3 ];atomic_t dev_addr_genid;
include/net/tcp.h +1 -2
@@ -259,6 +259,7 @@ extern int sysctl_tcp_max_orphans;extern int sysctl_tcp_fack;extern int sysctl_tcp_reordering;extern int sysctl_tcp_dsack; +extern long sysctl_tcp_mem[3 ];extern int sysctl_tcp_wmem[3 ];extern int sysctl_tcp_rmem[3 ];extern int sysctl_tcp_app_win;
@@ -348,8 +349,6 @@ extern struct proto tcp_prot;#define TCP_ADD_STATS_USER (net, field, val) SNMP_ADD_STATS_USER((net)->mib.tcp_statistics, field, val)#define TCP_ADD_STATS (net, field, val) SNMP_ADD_STATS((net)->mib.tcp_statistics, field, val) -void tcp_init_mem (struct net *net); -void tcp_tasklet_init (void );void tcp_v4_err (struct sk_buff *skb,u32 );
net/ipv4/af_inet.c +0 -2
@@ -1706,8 +1706,6 @@ static int __init inet_init(void)ip_static_sysctl_init ();#endif - tcp_prot.sysctl_mem = init_net.ipv4.sysctl_tcp_mem; -/* * Add all the base protocols. */
net/ipv4/sysctl_net_ipv4.c +7 -16
@@ -200,14 +200,6 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,return ret; } -static int ipv4_tcp_mem (struct ctl_table *ctl,int write, -void __user *buffer,size_t *lenp, -loff_t *ppos) -{ - ctl->data = ¤t->nsproxy->net_ns->ipv4.sysctl_tcp_mem; -return proc_doulongvec_minmax (ctl, write, buffer, lenp, ppos); -} -static int proc_tcp_fastopen_key (struct ctl_table *ctl,int write,void __user *buffer,size_t *lenp,loff_t *ppos)
@@ -517,6 +509,13 @@ static struct ctl_table ipv4_table[] = { .proc_handler = proc_dointvec }, { + .procname = "tcp_mem", + .maxlen = sizeof(sysctl_tcp_mem), + .data = &sysctl_tcp_mem, + .mode = 0644, + .proc_handler = proc_doulongvec_minmax, + }, + { .procname = "tcp_wmem", .data = &sysctl_tcp_wmem, .maxlen = sizeof(sysctl_tcp_wmem),
@@ -825,12 +824,6 @@ static struct ctl_table ipv4_net_table[] = { .mode = 0644, .proc_handler = ipv4_local_port_range, }, - { - .procname = "tcp_mem", - .maxlen = sizeof(init_net.ipv4.sysctl_tcp_mem), - .mode = 0644, - .proc_handler = ipv4_tcp_mem, - }, { } };
@@ -882,8 +875,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) net->ipv4.sysctl_local_ports.range[0 ] =32768 ; net->ipv4.sysctl_local_ports.range[1 ] =61000 ; -tcp_init_mem (net); - net->ipv4.ipv4_hdr =register_net_sysctl (net,"net/ipv4" , table);if (net->ipv4.ipv4_hdr ==NULL ) goto err_reg;
net/ipv4/tcp.c +7 -5
@@ -288,9 +288,11 @@ int sysctl_tcp_min_tso_segs __read_mostly = 2;struct percpu_counter tcp_orphan_count;EXPORT_SYMBOL_GPL (tcp_orphan_count); +long sysctl_tcp_mem[3 ]__read_mostly ;int sysctl_tcp_wmem[3 ]__read_mostly ;int sysctl_tcp_rmem[3 ]__read_mostly ; +EXPORT_SYMBOL (sysctl_tcp_mem);EXPORT_SYMBOL (sysctl_tcp_rmem);EXPORT_SYMBOL (sysctl_tcp_wmem);
@@ -3097,13 +3099,13 @@ static int __init set_thash_entries(char *str) }__setup ("thash_entries=" , set_thash_entries); -void tcp_init_mem (struct net *net) +static void tcp_init_mem (void ) {unsigned long limit =nr_free_buffer_pages () /8 ; limit =max (limit,128UL ); - net->ipv4.sysctl_tcp_mem[0 ] = limit /4 *3 ; - net->ipv4.sysctl_tcp_mem[1 ] = limit; - net->ipv4.sysctl_tcp_mem[2 ] = net->ipv4.sysctl_tcp_mem[0 ] *2 ; + sysctl_tcp_mem[0 ] = limit /4 *3 ; + sysctl_tcp_mem[1 ] = limit; + sysctl_tcp_mem[2 ] = sysctl_tcp_mem[0 ] *2 ; }void __init tcp_init (void )
@@ -3165,7 +3167,7 @@ void __init tcp_init(void) sysctl_tcp_max_orphans = cnt /2 ; sysctl_max_syn_backlog =max (128 , cnt /256 ); -tcp_init_mem (&init_net); +tcp_init_mem ();/* Set per-socket limits to no more than 1/128 the pressure threshold */ limit =nr_free_buffer_pages () << (PAGE_SHIFT -7 ); max_wshare =min (4UL *1024 *1024 , limit);
net/ipv4/tcp_ipv4.c +1 -0
@@ -2749,6 +2749,7 @@ struct proto tcp_prot = { .orphan_count = &tcp_orphan_count, .memory_allocated = &tcp_memory_allocated, .memory_pressure = &tcp_memory_pressure, + .sysctl_mem = sysctl_tcp_mem, .sysctl_wmem = sysctl_tcp_wmem, .sysctl_rmem = sysctl_tcp_rmem, .max_header = MAX_TCP_HEADER,
net/ipv4/tcp_memcontrol.c +4 -6
@@ -29,7 +29,6 @@ int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss)struct cg_proto *cg_proto, *parent_cg;struct tcp_memcontrol *tcp;struct mem_cgroup *parent =parent_mem_cgroup (memcg); -struct net *net = current->nsproxy->net_ns; cg_proto = tcp_prot.proto_cgroup (memcg);if (!cg_proto)
@@ -37,9 +36,9 @@ int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss) tcp =tcp_from_cgproto (cg_proto); - tcp->tcp_prot_mem[0 ] = net->ipv4.sysctl_tcp_mem[0 ]; - tcp->tcp_prot_mem[1 ] = net->ipv4.sysctl_tcp_mem[1 ]; - tcp->tcp_prot_mem[2 ] = net->ipv4.sysctl_tcp_mem[2 ]; + tcp->tcp_prot_mem[0 ] = sysctl_tcp_mem[0 ]; + tcp->tcp_prot_mem[1 ] = sysctl_tcp_mem[1 ]; + tcp->tcp_prot_mem[2 ] = sysctl_tcp_mem[2 ]; tcp->tcp_memory_pressure =0 ; parent_cg = tcp_prot.proto_cgroup (parent);
@@ -76,7 +75,6 @@ EXPORT_SYMBOL(tcp_destroy_cgroup);static int tcp_update_limit (struct mem_cgroup *memcg,u64 val) { -struct net *net = current->nsproxy->net_ns;struct tcp_memcontrol *tcp;struct cg_proto *cg_proto;u64 old_lim;
@@ -99,7 +97,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)for (i =0 ; i <3 ; i++) tcp->tcp_prot_mem[i] =min_t (long, val >>PAGE_SHIFT , - net->ipv4.sysctl_tcp_mem[i]); + sysctl_tcp_mem[i]);if (val ==RES_COUNTER_MAX )clear_bit (MEMCG_SOCK_ACTIVE , &cg_proto->flags);
net/ipv6/af_inet6.c +0 -2
@@ -870,8 +870,6 @@ static int __init inet6_init(void)if (err) goto out_sock_register_fail; - tcpv6_prot.sysctl_mem = init_net.ipv4.sysctl_tcp_mem; -/* * ipngwg API draft makes clear that the correct semantics * for TCP and UDP is to consider one TCP and UDP instance
net/ipv6/tcp_ipv6.c +1 -0
@@ -1929,6 +1929,7 @@ struct proto tcpv6_prot = { .memory_allocated = &tcp_memory_allocated, .memory_pressure = &tcp_memory_pressure, .orphan_count = &tcp_orphan_count, + .sysctl_mem = sysctl_tcp_mem, .sysctl_wmem = sysctl_tcp_wmem, .sysctl_rmem = sysctl_tcp_rmem, .max_header = MAX_TCP_HEADER,
Signature · 1 line
1.7.5.4
PATCH 4/6 tcp_memcontrol: Kill struct tcp_memcontrol
In reply to a message not in the archiveReplace the pointers in struct cg_proto with actual data fields and kill struct tcp_memcontrol as it is not fully redundant.
This removes a confusing, unnecessary layer of abstraction.
--- include/net/sock.h | 28 +++++++++--------- include/net/tcp_memcontrol.h | 10 ------- mm/memcontrol.c | 6 ++-- net/ipv4/tcp_memcontrol.c | 61 ++++++++++++----------------------------- 4 files changed, 35 insertions(+), 70 deletions(-)
include/net/sock.h +14 -14
@@ -1036,10 +1036,10 @@ enum cg_proto_flags {struct cg_proto {void (*enter_memory_pressure)(struct sock *sk); -struct res_counter *memory_allocated;/* Current allocated memory. */ -struct percpu_counter *sockets_allocated;/* Current number of sockets. */ -int *memory_pressure; -long *sysctl_mem; +struct res_counter memory_allocated;/* Current allocated memory. */ +struct percpu_counter sockets_allocated;/* Current number of sockets. */ +int memory_pressure; +long sysctl_mem[3 ];unsigned long flags;/* * memcg field is used to find which memcg we belong directly
@@ -1135,9 +1135,9 @@ static inline bool sk_under_memory_pressure(const struct sock *sk)return false;if (mem_cgroup_sockets_enabled && sk->sk_cgrp) -return !!*sk->sk_cgrp->memory_pressure; +return !!sk->sk_cgrp->memory_pressure; -return !!*sk->sk_prot->memory_pressure; +return !!sk->sk_prot->memory_pressure; }static inline void sk_leave_memory_pressure (struct sock *sk)
@@ -1155,8 +1155,8 @@ static inline void sk_leave_memory_pressure(struct sock *sk)struct proto *prot = sk->sk_prot;for (; cg_proto; cg_proto =parent_cg_proto (prot, cg_proto)) -if (*cg_proto->memory_pressure) - *cg_proto->memory_pressure =0 ; +if (cg_proto->memory_pressure) + cg_proto->memory_pressure =0 ; } }
@@ -1192,7 +1192,7 @@ static inline void memcg_memory_allocated_add(struct cg_proto *prot,struct res_counter *fail;int ret; - ret =res_counter_charge_nofail (prot->memory_allocated, + ret =res_counter_charge_nofail (&prot->memory_allocated, amt <<PAGE_SHIFT , &fail);if (ret <0 ) *parent_status =OVER_LIMIT ;
@@ -1201,13 +1201,13 @@ static inline void memcg_memory_allocated_add(struct cg_proto *prot,static inline void memcg_memory_allocated_sub (struct cg_proto *prot,unsigned long amt) { -res_counter_uncharge (prot->memory_allocated, amt <<PAGE_SHIFT ); +res_counter_uncharge (&prot->memory_allocated, amt <<PAGE_SHIFT ); }static inline u64 memcg_memory_allocated_read (struct cg_proto *prot) {u64 ret; - ret =res_counter_read_u64 (prot->memory_allocated,RES_USAGE ); + ret =res_counter_read_u64 (&prot->memory_allocated,RES_USAGE );return ret >>PAGE_SHIFT ; }
@@ -1255,7 +1255,7 @@ static inline void sk_sockets_allocated_dec(struct sock *sk)struct cg_proto *cg_proto = sk->sk_cgrp;for (; cg_proto; cg_proto =parent_cg_proto (prot, cg_proto)) -percpu_counter_dec (cg_proto->sockets_allocated); +percpu_counter_dec (&cg_proto->sockets_allocated); }percpu_counter_dec (prot->sockets_allocated);
@@ -1269,7 +1269,7 @@ static inline void sk_sockets_allocated_inc(struct sock *sk)struct cg_proto *cg_proto = sk->sk_cgrp;for (; cg_proto; cg_proto =parent_cg_proto (prot, cg_proto)) -percpu_counter_inc (cg_proto->sockets_allocated); +percpu_counter_inc (&cg_proto->sockets_allocated); }percpu_counter_inc (prot->sockets_allocated);
@@ -1281,7 +1281,7 @@ sk_sockets_allocated_read_positive(struct sock *sk)struct proto *prot = sk->sk_prot;if (mem_cgroup_sockets_enabled && sk->sk_cgrp) -return percpu_counter_read_positive (sk->sk_cgrp->sockets_allocated); +return percpu_counter_read_positive (&sk->sk_cgrp->sockets_allocated);return percpu_counter_read_positive (prot->sockets_allocated); }
include/net/tcp_memcontrol.h +0 -10
@@ -1,16 +1,6 @@#ifndef _TCP_MEMCG_H#define _TCP_MEMCG_H -struct tcp_memcontrol { -struct cg_proto cg_proto; -/* per-cgroup tcp memory pressure knobs */ -struct res_counter tcp_memory_allocated; -struct percpu_counter tcp_sockets_allocated; -/* those two are read-mostly, leave them at the end */ -long tcp_prot_mem[3 ]; -int tcp_memory_pressure; -}; -struct cg_proto *tcp_proto_cgroup (struct mem_cgroup *memcg);int tcp_init_cgroup (struct mem_cgroup *memcg,struct cgroup_subsys *ss);void tcp_destroy_cgroup (struct mem_cgroup *memcg);
mm/memcontrol.c +3 -3
@@ -311,7 +311,7 @@ struct mem_cgroup {atomic_t dead_count;#if defined(CONFIG_MEMCG_KMEM ) && defined(CONFIG_INET ) -struct tcp_memcontrol tcp_mem; +struct cg_proto tcp_mem;#endif #if defined(CONFIG_MEMCG_KMEM )/* analogous to slab_common's slab_caches list. per-memcg */
@@ -550,13 +550,13 @@ struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)if (!memcg ||mem_cgroup_is_root (memcg))return NULL ; -return &memcg->tcp_mem.cg_proto; +return &memcg->tcp_mem; }EXPORT_SYMBOL (tcp_proto_cgroup);static void disarm_sock_keys (struct mem_cgroup *memcg) { -if (!memcg_proto_activated (&memcg->tcp_mem.cg_proto)) +if (!memcg_proto_activated (&memcg->tcp_mem))return ;static_key_slow_dec (&memcg_socket_limit_enabled); }
net/ipv4/tcp_memcontrol.c +18 -43
151 lines not on this page · raw message
Signature · 1 line
1.7.5.4
PATCH 5/6 ipv4: Use math to point per net sysctls into the appropriate struct net.
In reply to a message not in the archiveSimplify maintenance of ipv4_net_table by using math to point the per net sysctls into the appropriate struct net, instead of manually reassinging all of the variables into hard coded table slots.
--- net/ipv4/sysctl_net_ipv4.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-)
net/ipv4/sysctl_net_ipv4.c +5 -18
@@ -833,28 +833,15 @@ static __net_init int ipv4_sysctl_init_net(struct net *net) table = ipv4_net_table;if (!net_eq (net, &init_net)) { +int i; + table =kmemdup (table,sizeof (ipv4_net_table),GFP_KERNEL );if (table ==NULL ) goto err_alloc; - table[0 ].data = - &net->ipv4.sysctl_icmp_echo_ignore_all; - table[1 ].data = - &net->ipv4.sysctl_icmp_echo_ignore_broadcasts; - table[2 ].data = - &net->ipv4.sysctl_icmp_ignore_bogus_error_responses; - table[3 ].data = - &net->ipv4.sysctl_icmp_errors_use_inbound_ifaddr; - table[4 ].data = - &net->ipv4.sysctl_icmp_ratelimit; - table[5 ].data = - &net->ipv4.sysctl_icmp_ratemask; - table[6 ].data = - &net->ipv4.sysctl_ping_group_range; - table[7 ].data = - &net->ipv4.sysctl_tcp_ecn; - table[8 ].data = - &net->ipv4.sysctl_local_ports.range; +/* Update the variables to point into the current struct net */ +for (i =0 ; i <ARRAY_SIZE (ipv4_net_table) -1 ; i++) + table[i].data += (void *)net - (void *)&init_net;/* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns)
Signature · 1 line
1.7.5.4
PATCH 6/6 ipv4: Allow unprivileged users to use per net sysctls
In reply to a message not in the archiveAllow unprivileged users to use:/proc/sys/net/ipv4/icmp_echo_ignore_all /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts /proc/sys/net/ipv4/icmp_ignore_bogus_error_response /proc/sys/net/ipv4/icmp_errors_use_inbound_ifaddr /proc/sys/net/ipv4/icmp_ratelimit /proc/sys/net/ipv4/icmp_ratemask /proc/sys/net/ipv4/ping_group_range /proc/sys/net/ipv4/tcp_ecn /proc/sys/net/ipv4/ip_local_ports_range
These are occassionally handy and after a quick review I don't see any problems with unprivileged users using them.
--- net/ipv4/sysctl_net_ipv4.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
net/ipv4/sysctl_net_ipv4.c +0 -4
@@ -842,10 +842,6 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)/* Update the variables to point into the current struct net */ for (i =0 ; i <ARRAY_SIZE (ipv4_net_table) -1 ; i++) table[i].data += (void *)net - (void *)&init_net; - -/* Don't export sysctls to unprivileged users */ -if (net->user_ns != &init_user_ns) - table[0 ].procname =NULL ; }/*
Signature · 1 line
1.7.5.4
From: ebiederm-aS9lmoZGLiVWk0Htik3J/[email protected] (Eric W. Biederman)
Date: Sat, 19 Oct 2013 16:23:19 -0700
Quoted 6 lines
While looking into allowing the ipv4 sysctls to be used in a network namespace I stumbled upon the mess that is
tcp_memcontrol.I remove the dead code, broken code, and excessive abstraction in the
tcp_memcontrolsthen I clean up up and allow in the user namespace the per net ipv4 sysctls.
I wish we hadn't installed this stuff in the first place, but better to take care of it now than later.
Series applied, thanks Eric.