The patch titled
Subject: mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9
has been removed from the -mm tree. Its filename was
mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9.patch
This patch was dropped because it was folded into mm-assign-memcg-aware-shrinkers-bitmap-to-memcg.patch
------------------------------------------------------
From: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Subject: mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9
Link: http://lkml.kernel.org/r/153112549031.4097.3576147070498769979.stgit@localhost.localdomain
Signed-off-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Acked-by: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Tested-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 5 ++---
mm/vmscan.c | 11 ++++++-----
2 files changed, 8 insertions(+), 8 deletions(-)
--- a/mm/memcontrol.c~mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9
+++ a/mm/memcontrol.c
@@ -352,8 +352,7 @@ static int memcg_expand_one_shrinker_map
memset((void *)new->map + old_size, 0, size - old_size);
rcu_assign_pointer(memcg->nodeinfo[nid]->shrinker_map, new);
- if (old)
- call_rcu(&old->rcu, memcg_free_shrinker_map_rcu);
+ call_rcu(&old->rcu, memcg_free_shrinker_map_rcu);
}
return 0;
@@ -406,7 +405,7 @@ int memcg_expand_shrinker_maps(int new_i
int size, old_size, ret = 0;
struct mem_cgroup *memcg;
- size = DIV_ROUND_UP(new_id + 1, BITS_PER_BYTE);
+ size = DIV_ROUND_UP(new_id + 1, BITS_PER_LONG) * sizeof(unsigned long);
old_size = memcg_shrinker_map_size;
if (size <= old_size)
return 0;
--- a/mm/vmscan.c~mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-v9
+++ a/mm/vmscan.c
@@ -183,13 +183,14 @@ static int prealloc_memcg_shrinker(struc
if (id < 0)
goto unlock;
- if (memcg_expand_shrinker_maps(id)) {
- idr_remove(&shrinker_idr, id);
- goto unlock;
- }
+ if (id >= shrinker_nr_max) {
+ if (memcg_expand_shrinker_maps(id)) {
+ idr_remove(&shrinker_idr, id);
+ goto unlock;
+ }
- if (id >= shrinker_nr_max)
shrinker_nr_max = id + 1;
+ }
shrinker->id = id;
ret = 0;
unlock:
_
Patches currently in -mm which might be from ktkhai@xxxxxxxxxxxxx are
list_lru-combine-code-under-the-same-define.patch
mm-introduce-config_memcg_kmem-as-combination-of-config_memcg-config_slob.patch
mm-assign-id-to-every-memcg-aware-shrinker.patch
memcg-move-up-for_each_mem_cgroup-_tree-defines.patch
mm-assign-memcg-aware-shrinkers-bitmap-to-memcg.patch
mm-assign-memcg-aware-shrinkers-bitmap-to-memcg-fix.patch
mm-refactoring-in-workingset_init.patch
mm-refactoring-in-workingset_init-v9.patch
fs-refactoring-in-alloc_super.patch
fs-propagate-shrinker-id-to-list_lru.patch
list_lru-add-memcg-argument-to-list_lru_from_kmem.patch
list_lru-pass-dst_memcg-argument-to-memcg_drain_list_lru_node.patch
list_lru-pass-lru-argument-to-memcg_drain_list_lru_node.patch
mm-export-mem_cgroup_is_root.patch
mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance.patch
mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch
mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab.patch
mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab-v9.patch
mm-add-shrink_empty-shrinker-methods-return-value.patch
mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg.patch
mm-clear-shrinker-bit-if-there-are-no-objects-related-to-memcg-v9.patch
mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.patch
mm-use-special-value-shrinker_registering-instead-list_empty-check.patch
mm-use-special-value-shrinker_registering-instead-list_empty-check-v3.patch
