redonkable/freescale-linux-fslc
redonkable/freescale-linux-fslc
1
0
Fork 0
Code Releases Activity

mm: memcontrol: move kmem accounting code to CONFIG_MEMCG

Browse source 
The cgroup2 memory controller will account important in-kernel memory
consumers per default.  Move all necessary components to CONFIG_MEMCG.

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johannes Weiner 2016-01-20 15:02:32 -08:00 committed by Linus Torvalds
parent 3893e302f6
commit 127424c86b
11 changed files with 73 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/linux/list_lru.h
View file

@ -40,7 +40,7 @@ struct list_lru_node {
spinlock_t lock; spinlock_t lock;
/* global list, used for the root cgroup in cgroup aware lrus */ /* global list, used for the root cgroup in cgroup aware lrus */
struct list_lru_one lru; struct list_lru_one lru;
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
/* for cgroup aware lrus points to per cgroup lists, otherwise NULL */ /* for cgroup aware lrus points to per cgroup lists, otherwise NULL */
struct list_lru_memcg *memcg_lrus; struct list_lru_memcg *memcg_lrus;
#endif #endif
@ -48,7 +48,7 @@ struct list_lru_node {
struct list_lru { struct list_lru {
struct list_lru_node *node; struct list_lru_node *node;
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
struct list_head list; struct list_head list;
#endif #endif
}; };

7
include/linux/memcontrol.h
View file

@ -236,7 +236,7 @@ struct mem_cgroup {
#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET) #if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_INET)
struct cg_proto tcp_mem; struct cg_proto tcp_mem;
#endif #endif
#if defined(CONFIG_MEMCG_KMEM) #ifndef CONFIG_SLOB
/* Index in the kmem_cache->memcg_params.memcg_caches array */ /* Index in the kmem_cache->memcg_params.memcg_caches array */
int kmemcg_id; int kmemcg_id;
enum memcg_kmem_state kmem_state; enum memcg_kmem_state kmem_state;
@ -735,7 +735,7 @@ static inline bool mem_cgroup_under_socket_pressure(struct mem_cgroup *memcg)
} }
#endif #endif
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
extern struct static_key_false memcg_kmem_enabled_key; extern struct static_key_false memcg_kmem_enabled_key;
extern int memcg_nr_cache_ids; extern int memcg_nr_cache_ids;
@ -891,5 +891,6 @@ memcg_kmem_get_cache(struct kmem_cache *cachep, gfp_t gfp)
static inline void memcg_kmem_put_cache(struct kmem_cache *cachep) static inline void memcg_kmem_put_cache(struct kmem_cache *cachep)
{ {
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
#endif /* _LINUX_MEMCONTROL_H */ #endif /* _LINUX_MEMCONTROL_H */

4
include/linux/sched.h
View file

@ -1476,10 +1476,10 @@ struct task_struct {
unsigned in_iowait:1; unsigned in_iowait:1;
#ifdef CONFIG_MEMCG #ifdef CONFIG_MEMCG
unsigned memcg_may_oom:1; unsigned memcg_may_oom:1;
#endif #ifndef CONFIG_SLOB
#ifdef CONFIG_MEMCG_KMEM
unsigned memcg_kmem_skip_account:1; unsigned memcg_kmem_skip_account:1;
#endif #endif
#endif
#ifdef CONFIG_COMPAT_BRK #ifdef CONFIG_COMPAT_BRK
unsigned brk_randomized:1; unsigned brk_randomized:1;
#endif #endif

2
include/linux/slab.h
View file

@ -86,7 +86,7 @@
#else #else
# define SLAB_FAILSLAB 0x00000000UL # define SLAB_FAILSLAB 0x00000000UL
#endif #endif
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
# define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */ # define SLAB_ACCOUNT 0x04000000UL /* Account to memcg */
#else #else
# define SLAB_ACCOUNT 0x00000000UL # define SLAB_ACCOUNT 0x00000000UL

3
include/linux/slab_def.h
View file

@ -69,7 +69,8 @@ struct kmem_cache {
*/ */
int obj_offset; int obj_offset;
#endif /* CONFIG_DEBUG_SLAB */ #endif /* CONFIG_DEBUG_SLAB */
#ifdef CONFIG_MEMCG_KMEM
#ifdef CONFIG_MEMCG
struct memcg_cache_params memcg_params; struct memcg_cache_params memcg_params;
#endif #endif

2
include/linux/slub_def.h
View file

@ -84,7 +84,7 @@ struct kmem_cache {
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS
struct kobject kobj; /* For sysfs */ struct kobject kobj; /* For sysfs */
#endif #endif
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
struct memcg_cache_params memcg_params; struct memcg_cache_params memcg_params;
int max_attr_size; /* for propagation, maximum size of a stored attr */ int max_attr_size; /* for propagation, maximum size of a stored attr */
#ifdef CONFIG_SYSFS #ifdef CONFIG_SYSFS

12
mm/list_lru.c
View file

@ -12,7 +12,7 @@
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/memcontrol.h> #include <linux/memcontrol.h>
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static LIST_HEAD(list_lrus); static LIST_HEAD(list_lrus);
static DEFINE_MUTEX(list_lrus_mutex); static DEFINE_MUTEX(list_lrus_mutex);
@ -37,9 +37,9 @@ static void list_lru_register(struct list_lru *lru)
static void list_lru_unregister(struct list_lru *lru) static void list_lru_unregister(struct list_lru *lru)
{ {
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static inline bool list_lru_memcg_aware(struct list_lru *lru) static inline bool list_lru_memcg_aware(struct list_lru *lru)
{ {
/* /*
@ -104,7 +104,7 @@ list_lru_from_kmem(struct list_lru_node *nlru, void *ptr)
{ {
return &nlru->lru; return &nlru->lru;
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
bool list_lru_add(struct list_lru *lru, struct list_head *item) bool list_lru_add(struct list_lru *lru, struct list_head *item)
{ {
@ -292,7 +292,7 @@ static void init_one_lru(struct list_lru_one *l)
l->nr_items = 0; l->nr_items = 0;
} }
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
static void __memcg_destroy_list_lru_node(struct list_lru_memcg *memcg_lrus, static void __memcg_destroy_list_lru_node(struct list_lru_memcg *memcg_lrus,
int begin, int end) int begin, int end)
{ {
@ -529,7 +529,7 @@ static int memcg_init_list_lru(struct list_lru *lru, bool memcg_aware)
static void memcg_destroy_list_lru(struct list_lru *lru) static void memcg_destroy_list_lru(struct list_lru *lru)
{ {
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
int __list_lru_init(struct list_lru *lru, bool memcg_aware, int __list_lru_init(struct list_lru *lru, bool memcg_aware,
struct lock_class_key *key) struct lock_class_key *key)

71
mm/memcontrol.c
View file

@ -297,7 +297,7 @@ static inline struct mem_cgroup *mem_cgroup_from_id(unsigned short id)
return mem_cgroup_from_css(css); return mem_cgroup_from_css(css);
} }
#ifdef CONFIG_MEMCG_KMEM #ifndef CONFIG_SLOB
/* /*
* This will be the memcg's index in each cache's ->memcg_params.memcg_caches. * This will be the memcg's index in each cache's ->memcg_params.memcg_caches.
* The main reason for not using cgroup id for this: * The main reason for not using cgroup id for this:
@ -349,7 +349,7 @@ void memcg_put_cache_ids(void)
DEFINE_STATIC_KEY_FALSE(memcg_kmem_enabled_key); DEFINE_STATIC_KEY_FALSE(memcg_kmem_enabled_key);
EXPORT_SYMBOL(memcg_kmem_enabled_key); EXPORT_SYMBOL(memcg_kmem_enabled_key);
#endif /* CONFIG_MEMCG_KMEM */ #endif /* !CONFIG_SLOB */
static struct mem_cgroup_per_zone * static struct mem_cgroup_per_zone *
mem_cgroup_zone_zoneinfo(struct mem_cgroup *memcg, struct zone *zone) mem_cgroup_zone_zoneinfo(struct mem_cgroup *memcg, struct zone *zone)
@ -2203,7 +2203,7 @@ static void commit_charge(struct page *page, struct mem_cgroup *memcg,
unlock_page_lru(page, isolated); unlock_page_lru(page, isolated);
} }
#ifdef CONFIG_MEMCG_KMEM #ifndef CONFIG_SLOB
static int memcg_alloc_cache_id(void) static int memcg_alloc_cache_id(void)
{ {
int id, size; int id, size;
@ -2424,7 +2424,7 @@ void __memcg_kmem_uncharge(struct page *page, int order)
page->mem_cgroup = NULL; page->mem_cgroup = NULL;
css_put_many(&memcg->css, nr_pages); css_put_many(&memcg->css, nr_pages);
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* !CONFIG_SLOB */
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE
@ -2860,7 +2860,7 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys_state *css,
} }
} }
#ifdef CONFIG_MEMCG_KMEM #ifndef CONFIG_SLOB
static int memcg_online_kmem(struct mem_cgroup *memcg) static int memcg_online_kmem(struct mem_cgroup *memcg)
{ {
int err = 0; int err = 0;
@ -2908,24 +2908,6 @@ out:
return err; return err;
} }
static int memcg_update_kmem_limit(struct mem_cgroup *memcg,
unsigned long limit)
{
int ret;
mutex_lock(&memcg_limit_mutex);
/* Top-level cgroup doesn't propagate from root */
if (!memcg_kmem_online(memcg)) {
ret = memcg_online_kmem(memcg);
if (ret)
goto out;
}
ret = page_counter_limit(&memcg->kmem, limit);
out:
mutex_unlock(&memcg_limit_mutex);
return ret;
}
static int memcg_propagate_kmem(struct mem_cgroup *memcg) static int memcg_propagate_kmem(struct mem_cgroup *memcg)
{ {
int ret = 0; int ret = 0;
@ -3000,16 +2982,45 @@ static void memcg_free_kmem(struct mem_cgroup *memcg)
} }
} }
#else #else
static int memcg_propagate_kmem(struct mem_cgroup *memcg)
{
return 0;
}
static void memcg_offline_kmem(struct mem_cgroup *memcg)
{
}
static void memcg_free_kmem(struct mem_cgroup *memcg)
{
}
#endif /* !CONFIG_SLOB */
#ifdef CONFIG_MEMCG_KMEM
static int memcg_update_kmem_limit(struct mem_cgroup *memcg,
unsigned long limit)
{
int ret;
mutex_lock(&memcg_limit_mutex);
/* Top-level cgroup doesn't propagate from root */
if (!memcg_kmem_online(memcg)) {
ret = memcg_online_kmem(memcg);
if (ret)
goto out;
}
ret = page_counter_limit(&memcg->kmem, limit);
out:
mutex_unlock(&memcg_limit_mutex);
return ret;
}
#else
static int memcg_update_kmem_limit(struct mem_cgroup *memcg, static int memcg_update_kmem_limit(struct mem_cgroup *memcg,
unsigned long limit) unsigned long limit)
{ {
return -EINVAL; return -EINVAL;
} }
static void memcg_offline_kmem(struct mem_cgroup *memcg)
{
}
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG_KMEM */
/* /*
* The user of this function is... * The user of this function is...
* RES_LIMIT. * RES_LIMIT.
@ -4182,7 +4193,7 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *parent_css)
vmpressure_init(&memcg->vmpressure); vmpressure_init(&memcg->vmpressure);
INIT_LIST_HEAD(&memcg->event_list); INIT_LIST_HEAD(&memcg->event_list);
spin_lock_init(&memcg->event_list_lock); spin_lock_init(&memcg->event_list_lock);
#ifdef CONFIG_MEMCG_KMEM #ifndef CONFIG_SLOB
memcg->kmemcg_id = -1; memcg->kmemcg_id = -1;
#endif #endif
#ifdef CONFIG_CGROUP_WRITEBACK #ifdef CONFIG_CGROUP_WRITEBACK
@ -4244,10 +4255,11 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css)
} }
mutex_unlock(&memcg_create_mutex); mutex_unlock(&memcg_create_mutex);
#ifdef CONFIG_MEMCG_KMEM
ret = memcg_propagate_kmem(memcg); ret = memcg_propagate_kmem(memcg);
if (ret) if (ret)
return ret; return ret;
#ifdef CONFIG_MEMCG_KMEM
ret = tcp_init_cgroup(memcg); ret = tcp_init_cgroup(memcg);
if (ret) if (ret)
return ret; return ret;
@ -4308,8 +4320,9 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
static_branch_dec(&memcg_sockets_enabled_key); static_branch_dec(&memcg_sockets_enabled_key);
#endif #endif
#ifdef CONFIG_MEMCG_KMEM
memcg_free_kmem(memcg); memcg_free_kmem(memcg);
#ifdef CONFIG_MEMCG_KMEM
tcp_destroy_cgroup(memcg); tcp_destroy_cgroup(memcg);
#endif #endif

6
mm/slab.h
View file

@ -173,7 +173,7 @@ ssize_t slabinfo_write(struct file *file, const char __user *buffer,
void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **); void __kmem_cache_free_bulk(struct kmem_cache *, size_t, void **);
int __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **); int __kmem_cache_alloc_bulk(struct kmem_cache *, gfp_t, size_t, void **);
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
/* /*
* Iterate over all memcg caches of the given root cache. The caller must hold * Iterate over all memcg caches of the given root cache. The caller must hold
* slab_mutex. * slab_mutex.
@ -251,7 +251,7 @@ static __always_inline int memcg_charge_slab(struct page *page,
extern void slab_init_memcg_params(struct kmem_cache *); extern void slab_init_memcg_params(struct kmem_cache *);
#else /* !CONFIG_MEMCG_KMEM */ #else /* CONFIG_MEMCG && !CONFIG_SLOB */
#define for_each_memcg_cache(iter, root) \ #define for_each_memcg_cache(iter, root) \
for ((void)(iter), (void)(root); 0; ) for ((void)(iter), (void)(root); 0; )
@ -292,7 +292,7 @@ static inline int memcg_charge_slab(struct page *page, gfp_t gfp, int order,
static inline void slab_init_memcg_params(struct kmem_cache *s) static inline void slab_init_memcg_params(struct kmem_cache *s)
{ {
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x) static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
{ {

10
mm/slab_common.c
View file

@ -128,7 +128,7 @@ int __kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t nr,
return i; return i;
} }
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
void slab_init_memcg_params(struct kmem_cache *s) void slab_init_memcg_params(struct kmem_cache *s)
{ {
s->memcg_params.is_root_cache = true; s->memcg_params.is_root_cache = true;
@ -221,7 +221,7 @@ static inline int init_memcg_params(struct kmem_cache *s,
static inline void destroy_memcg_params(struct kmem_cache *s) static inline void destroy_memcg_params(struct kmem_cache *s)
{ {
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
/* /*
* Find a mergeable slab cache * Find a mergeable slab cache
@ -477,7 +477,7 @@ static void release_caches(struct list_head *release, bool need_rcu_barrier)
} }
} }
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
/* /*
* memcg_create_kmem_cache - Create a cache for a memory cgroup. * memcg_create_kmem_cache - Create a cache for a memory cgroup.
* @memcg: The memory cgroup the new cache is for. * @memcg: The memory cgroup the new cache is for.
@ -689,7 +689,7 @@ static inline int shutdown_memcg_caches(struct kmem_cache *s,
{ {
return 0; return 0;
} }
#endif /* CONFIG_MEMCG_KMEM */ #endif /* CONFIG_MEMCG && !CONFIG_SLOB */
void slab_kmem_cache_release(struct kmem_cache *s) void slab_kmem_cache_release(struct kmem_cache *s)
{ {
@ -1123,7 +1123,7 @@ static int slab_show(struct seq_file *m, void *p)
return 0; return 0;
} }
#ifdef CONFIG_MEMCG_KMEM #if defined(CONFIG_MEMCG) && !defined(CONFIG_SLOB)
int memcg_slab_show(struct seq_file *m, void *p) int memcg_slab_show(struct seq_file *m, void *p)
{ {
struct kmem_cache *s = list_entry(p, struct kmem_cache, list); struct kmem_cache *s = list_entry(p, struct kmem_cache, list);

10
mm/slub.c
View file

@ -5207,7 +5207,7 @@ static ssize_t slab_attr_store(struct kobject *kobj,
return -EIO; return -EIO;
err = attribute->store(s, buf, len); err = attribute->store(s, buf, len);
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
if (slab_state >= FULL && err >= 0 && is_root_cache(s)) { if (slab_state >= FULL && err >= 0 && is_root_cache(s)) {
struct kmem_cache *c; struct kmem_cache *c;
@ -5242,7 +5242,7 @@ static ssize_t slab_attr_store(struct kobject *kobj,
static void memcg_propagate_slab_attrs(struct kmem_cache *s) static void memcg_propagate_slab_attrs(struct kmem_cache *s)
{ {
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
int i; int i;
char *buffer = NULL; char *buffer = NULL;
struct kmem_cache *root_cache; struct kmem_cache *root_cache;
@ -5328,7 +5328,7 @@ static struct kset *slab_kset;
static inline struct kset *cache_kset(struct kmem_cache *s) static inline struct kset *cache_kset(struct kmem_cache *s)
{ {
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
if (!is_root_cache(s)) if (!is_root_cache(s))
return s->memcg_params.root_cache->memcg_kset; return s->memcg_params.root_cache->memcg_kset;
#endif #endif
@ -5405,7 +5405,7 @@ static int sysfs_slab_add(struct kmem_cache *s)
if (err) if (err)
goto out_del_kobj; goto out_del_kobj;
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
if (is_root_cache(s)) { if (is_root_cache(s)) {
s->memcg_kset = kset_create_and_add("cgroup", NULL, &s->kobj); s->memcg_kset = kset_create_and_add("cgroup", NULL, &s->kobj);
if (!s->memcg_kset) { if (!s->memcg_kset) {
@ -5438,7 +5438,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
*/ */
return; return;
#ifdef CONFIG_MEMCG_KMEM #ifdef CONFIG_MEMCG
kset_unregister(s->memcg_kset); kset_unregister(s->memcg_kset);
#endif #endif
kobject_uevent(&s->kobj, KOBJ_REMOVE); kobject_uevent(&s->kobj, KOBJ_REMOVE);