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

Commit d1a4c0b3 authored by Glauber Costa's avatar Glauber Costa Committed by David S. Miller
Browse files

tcp memory pressure controls 



This patch introduces memory pressure controls for the tcp
protocol. It uses the generic socket memory pressure code
introduced in earlier patches, and fills in the
necessary data in cg_proto struct.

Signed-off-by: default avatarGlauber Costa <glommer@parallels.com>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujtisu.com>
CC: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1aab161

Documentation/cgroups/memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -293,6 +293,8 @@ to trigger slab reclaim when those limits are reached. 
thresholds. The Memory Controller allows them to be controlled individually

per cgroup, instead of globally.



* tcp memory pressure: sockets memory pressure for the tcp protocol.



3. User Interface



0. Configuration

include/linux/memcontrol.h

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p); 
extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);



extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg);

extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont);



static inline

int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)

include/net/sock.h

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ 
#include <net/dst.h>

#include <net/checksum.h>



int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss);

void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss);

/*

 * This structure really needs to be cleaned up.

 * Most of it is for TCP, and not used by any of

include/net/tcp_memcontrol.h

0 → 100644
+17 −0
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 cgroup *cgrp, struct cgroup_subsys *ss);

void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss);

#endif /* _TCP_MEMCG_H */

mm/memcontrol.c

+39 −1
Original line number Diff line number Diff line
@@ -50,6 +50,8 @@ 
#include <linux/cpu.h>

#include <linux/oom.h>

#include "internal.h"

#include <net/sock.h>

#include <net/tcp_memcontrol.h>



#include <asm/uaccess.h>
@@ -295,6 +297,10 @@ struct mem_cgroup { 
	 */

	struct mem_cgroup_stat_cpu nocpu_base;

	spinlock_t pcp_counter_lock;



#ifdef CONFIG_INET

	struct tcp_memcontrol tcp_mem;

#endif

};



/* Stuffs for move charges at task migration. */
@@ -384,6 +390,7 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); 
#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM

#ifdef CONFIG_INET

#include <net/sock.h>

#include <net/ip.h>



static bool mem_cgroup_is_root(struct mem_cgroup *memcg);

void sock_update_memcg(struct sock *sk)
@@ -418,6 +425,15 @@ void sock_release_memcg(struct sock *sk) 
		mem_cgroup_put(memcg);

	}

}



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;

}

EXPORT_SYMBOL(tcp_proto_cgroup);

#endif /* CONFIG_INET */

#endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */
@@ -800,7 +816,7 @@ static void memcg_check_events(struct mem_cgroup *memcg, struct page *page) 
	preempt_enable();

}



static struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont)

struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont)

{

	return container_of(cgroup_subsys_state(cont,

				mem_cgroup_subsys_id), struct mem_cgroup,
@@ -4732,14 +4748,34 @@ static int register_kmem_files(struct cgroup *cont, struct cgroup_subsys *ss) 


	ret = cgroup_add_files(cont, ss, kmem_cgroup_files,

			       ARRAY_SIZE(kmem_cgroup_files));



	/*

	 * Part of this would be better living in a separate allocation

	 * function, leaving us with just the cgroup tree population work.

	 * We, however, depend on state such as network's proto_list that

	 * is only initialized after cgroup creation. I found the less

	 * cumbersome way to deal with it to defer it all to populate time

	 */

	if (!ret)

		ret = mem_cgroup_sockets_init(cont, ss);

	return ret;

};



static void kmem_cgroup_destroy(struct cgroup_subsys *ss,

				struct cgroup *cont)

{

	mem_cgroup_sockets_destroy(cont, ss);

}

#else

static int register_kmem_files(struct cgroup *cont, struct cgroup_subsys *ss)

{

	return 0;

}



static void kmem_cgroup_destroy(struct cgroup_subsys *ss,

				struct cgroup *cont)

{

}

#endif



static struct cftype mem_cgroup_files[] = {
@@ -5098,6 +5134,8 @@ static void mem_cgroup_destroy(struct cgroup_subsys *ss, 
{

	struct mem_cgroup *memcg = mem_cgroup_from_cont(cont);



	kmem_cgroup_destroy(ss, cont);



	mem_cgroup_put(memcg);

}