Sometimes it can be necessary to iterate over all memcgs' lists of the same memcg-aware LRU. For example shrink_dcache_sb() should prune all dentries no matter what memory cgroup they belong to. Current interface to struct memcg_list_lru, however, only allows per-memcg LRU walks. This patch adds the special method memcg_list_lru_walk_all() which provides the required functionality. Note that this function does not guarantee that all the elements will be processed in the true least-recently-used order, in fact it simply enumerates all kmem-active memcgs and for each of them calls list_lru_walk(), but shrink_dcache_sb(), which is going to be the only user of this function, does not need it. Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx> Cc: Glauber Costa <glommer@xxxxxxxxxx> Cc: Dave Chinner <dchinner@xxxxxxxxxx> Cc: Mel Gorman <mgorman@xxxxxxx> Cc: Rik van Riel <riel@xxxxxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Michal Hocko <mhocko@xxxxxxx> Cc: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/list_lru.h | 21 ++++++++++++++++++ mm/memcontrol.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/include/linux/list_lru.h b/include/linux/list_lru.h index b3b3b86..ce815cc 100644 --- a/include/linux/list_lru.h +++ b/include/linux/list_lru.h @@ -40,6 +40,16 @@ struct memcg_list_lru { struct list_lru **memcg_lrus; /* rcu-protected array of per-memcg lrus, indexed by memcg_cache_id() */ + /* + * When a memory cgroup is removed, all pointers to its list_lru + * objects stored in memcg_lrus arrays are first marked as dead by + * setting the lowest bit of the address while the actual data free + * happens only after an rcu grace period. If a memcg_lrus reader, + * which should be rcu-protected, faces a dead pointer, it won't + * dereference it. This ensures there will be no use-after-free. + */ +#define MEMCG_LIST_LRU_DEAD 1 + struct list_head list; /* list of all memcg-aware lrus */ /* @@ -160,6 +170,10 @@ struct list_lru * mem_cgroup_list_lru(struct memcg_list_lru *lru, struct mem_cgroup *memcg); struct list_lru * mem_cgroup_kmem_list_lru(struct memcg_list_lru *lru, void *ptr); + +unsigned long +memcg_list_lru_walk_all(struct memcg_list_lru *lru, list_lru_walk_cb isolate, + void *cb_arg, unsigned long nr_to_walk); #else static inline int memcg_list_lru_init(struct memcg_list_lru *lru) { @@ -182,6 +196,13 @@ mem_cgroup_kmem_list_lru(struct memcg_list_lru *lru, void *ptr) { return &lru->global_lru; } + +static inline unsigned long +memcg_list_lru_walk_all(struct memcg_list_lru *lru, list_lru_walk_cb isolate, + void *cb_arg, unsigned long nr_to_walk) +{ + return list_lru_walk(&lru->global_lru, isolate, cb_arg, nr_to_walk); +} #endif /* CONFIG_MEMCG_KMEM */ #endif /* _LRU_LIST_H */ diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 39e4772..03178d0 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3899,16 +3899,30 @@ static int alloc_memcg_lru(struct memcg_list_lru *lru, int memcg_id) return err; } + smp_wmb(); VM_BUG_ON(lru->memcg_lrus[memcg_id]); lru->memcg_lrus[memcg_id] = memcg_lru; return 0; } +static void memcg_lru_mark_dead(struct memcg_list_lru *lru, int memcg_id) +{ + struct list_lru *memcg_lru; + + BUG_ON(!lru->memcg_lrus); + memcg_lru = lru->memcg_lrus[memcg_id]; + if (memcg_lru) + lru->memcg_lrus[memcg_id] = (void *)((unsigned long)memcg_lru | + MEMCG_LIST_LRU_DEAD); +} + static void free_memcg_lru(struct memcg_list_lru *lru, int memcg_id) { struct list_lru *memcg_lru = NULL; swap(lru->memcg_lrus[memcg_id], memcg_lru); + memcg_lru = (void *)((unsigned long)memcg_lru & + ~MEMCG_LIST_LRU_DEAD); if (memcg_lru) { list_lru_destroy(memcg_lru); kfree(memcg_lru); @@ -3942,6 +3956,17 @@ static void __memcg_destroy_all_lrus(int memcg_id) { struct memcg_list_lru *lru; + /* + * Mark all lru lists of this memcg as dead and free them only after a + * grace period. This is to prevent functions iterating over memcg_lrus + * arrays (e.g. memcg_list_lru_walk_all()) from dereferencing pointers + * pointing to already freed data. + */ + list_for_each_entry(lru, &memcg_lrus_list, list) + memcg_lru_mark_dead(lru, memcg_id); + + synchronize_rcu(); + list_for_each_entry(lru, &memcg_lrus_list, list) free_memcg_lru(lru, memcg_id); } @@ -4103,6 +4128,36 @@ mem_cgroup_kmem_list_lru(struct memcg_list_lru *lru, void *ptr) } return mem_cgroup_list_lru(lru, memcg); } + +unsigned long +memcg_list_lru_walk_all(struct memcg_list_lru *lru, list_lru_walk_cb isolate, + void *cb_arg, unsigned long nr_to_walk) +{ + int i; + unsigned long isolated; + struct list_lru *memcg_lru; + struct list_lru **memcg_lrus; + + isolated = list_lru_walk(&lru->global_lru, isolate, cb_arg, nr_to_walk); + + rcu_read_lock(); + memcg_lrus = rcu_dereference(lru->memcg_lrus); + for (i = 0; i < memcg_limited_groups_array_size; i++) { + memcg_lru = memcg_lrus[i]; + if (!memcg_lru) + continue; + + if ((unsigned long)memcg_lru & MEMCG_LIST_LRU_DEAD) + continue; + + smp_read_barrier_depends(); + isolated += list_lru_walk(memcg_lru, + isolate, cb_arg, nr_to_walk); + } + rcu_read_unlock(); + + return isolated; +} #else static inline void mem_cgroup_destroy_all_caches(struct mem_cgroup *memcg) { -- 1.7.10.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>