diff options
author | Vladimir Davydov <vdavydov@parallels.com> | 2014-01-23 18:53:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-23 19:36:51 -0500 |
commit | f8570263ee16eb1d5038b8e20d7db3a68bbb2b49 (patch) | |
tree | 06d54d7f5f357622604d1e8338478b906729409d /mm/memcontrol.c | |
parent | f717eb3abb5ea38f60e671dbfdbf512c2c93d22e (diff) |
memcg, slab: RCU protect memcg_params for root caches
We relocate root cache's memcg_params whenever we need to grow the
memcg_caches array to accommodate all kmem-active memory cgroups.
Currently on relocation we free the old version immediately, which can
lead to use-after-free, because the memcg_caches array is accessed
lock-free (see cache_from_memcg_idx()). This patch fixes this by making
memcg_params RCU-protected for root caches.
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Glauber Costa <glommer@gmail.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Christoph Lameter <cl@linux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 80197e544764..216659d4441a 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -3178,18 +3178,17 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups) | |||
3178 | 3178 | ||
3179 | if (num_groups > memcg_limited_groups_array_size) { | 3179 | if (num_groups > memcg_limited_groups_array_size) { |
3180 | int i; | 3180 | int i; |
3181 | struct memcg_cache_params *new_params; | ||
3181 | ssize_t size = memcg_caches_array_size(num_groups); | 3182 | ssize_t size = memcg_caches_array_size(num_groups); |
3182 | 3183 | ||
3183 | size *= sizeof(void *); | 3184 | size *= sizeof(void *); |
3184 | size += offsetof(struct memcg_cache_params, memcg_caches); | 3185 | size += offsetof(struct memcg_cache_params, memcg_caches); |
3185 | 3186 | ||
3186 | s->memcg_params = kzalloc(size, GFP_KERNEL); | 3187 | new_params = kzalloc(size, GFP_KERNEL); |
3187 | if (!s->memcg_params) { | 3188 | if (!new_params) |
3188 | s->memcg_params = cur_params; | ||
3189 | return -ENOMEM; | 3189 | return -ENOMEM; |
3190 | } | ||
3191 | 3190 | ||
3192 | s->memcg_params->is_root_cache = true; | 3191 | new_params->is_root_cache = true; |
3193 | 3192 | ||
3194 | /* | 3193 | /* |
3195 | * There is the chance it will be bigger than | 3194 | * There is the chance it will be bigger than |
@@ -3203,7 +3202,7 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups) | |||
3203 | for (i = 0; i < memcg_limited_groups_array_size; i++) { | 3202 | for (i = 0; i < memcg_limited_groups_array_size; i++) { |
3204 | if (!cur_params->memcg_caches[i]) | 3203 | if (!cur_params->memcg_caches[i]) |
3205 | continue; | 3204 | continue; |
3206 | s->memcg_params->memcg_caches[i] = | 3205 | new_params->memcg_caches[i] = |
3207 | cur_params->memcg_caches[i]; | 3206 | cur_params->memcg_caches[i]; |
3208 | } | 3207 | } |
3209 | 3208 | ||
@@ -3216,7 +3215,9 @@ int memcg_update_cache_size(struct kmem_cache *s, int num_groups) | |||
3216 | * bigger than the others. And all updates will reset this | 3215 | * bigger than the others. And all updates will reset this |
3217 | * anyway. | 3216 | * anyway. |
3218 | */ | 3217 | */ |
3219 | kfree(cur_params); | 3218 | rcu_assign_pointer(s->memcg_params, new_params); |
3219 | if (cur_params) | ||
3220 | kfree_rcu(cur_params, rcu_head); | ||
3220 | } | 3221 | } |
3221 | return 0; | 3222 | return 0; |
3222 | } | 3223 | } |