Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a6d10db authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pernet_sysctls' 



Eric W. Biederman says:

====================
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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 3167fe98 fd2d5356

include/net/netns/ipv4.h

+0 −1
Original line number Diff line number Diff line
@@ -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/sock.h

+14 −14
Original line number Diff line number Diff line
@@ -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.h

+1 −2
Original line number Diff line number Diff line
@@ -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);

include/net/tcp_memcontrol.h

+0 −12
Original line number Diff line number Diff line 
#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);

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 */

mm/memcontrol.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}