The patch titled Subject: mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 has been added to the -mm tree. Its filename is mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx> Subject: mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 Link: http://lkml.kernel.org/r/153112557572.4097.17315791419810749985.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> --- include/linux/memcontrol.h | 14 ++------------ mm/memcontrol.c | 13 +++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) diff -puN include/linux/memcontrol.h~mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 include/linux/memcontrol.h --- a/include/linux/memcontrol.h~mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 +++ a/include/linux/memcontrol.h @@ -1273,18 +1273,8 @@ static inline int memcg_cache_id(struct extern int memcg_expand_shrinker_maps(int new_id); -static inline void memcg_set_shrinker_bit(struct mem_cgroup *memcg, - int nid, int shrinker_id) -{ - if (shrinker_id >= 0 && memcg && !mem_cgroup_is_root(memcg)) { - struct memcg_shrinker_map *map; - - rcu_read_lock(); - map = rcu_dereference(memcg->nodeinfo[nid]->shrinker_map); - set_bit(shrinker_id, map->map); - rcu_read_unlock(); - } -} +extern void memcg_set_shrinker_bit(struct mem_cgroup *memcg, + int nid, int shrinker_id); #else #define for_each_memcg_cache_index(_idx) \ for (; NULL; ) diff -puN mm/memcontrol.c~mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 mm/memcontrol.c --- a/mm/memcontrol.c~mm-set-bit-in-memcg-shrinker-bitmap-on-first-list_lru-item-apearance-v9 +++ a/mm/memcontrol.c @@ -422,6 +422,19 @@ unlock: mutex_unlock(&memcg_shrinker_map_mutex); return ret; } + +void memcg_set_shrinker_bit(struct mem_cgroup *memcg, int nid, int shrinker_id) +{ + if (shrinker_id >= 0 && memcg && !mem_cgroup_is_root(memcg)) { + struct memcg_shrinker_map *map; + + rcu_read_lock(); + map = rcu_dereference(memcg->nodeinfo[nid]->shrinker_map); + set_bit(shrinker_id, map->map); + rcu_read_unlock(); + } +} + #else /* CONFIG_MEMCG_KMEM */ static int memcg_alloc_shrinker_maps(struct mem_cgroup *memcg) { _ Patches currently in -mm which might be from ktkhai@xxxxxxxxxxxxx are memcg-remove-memcg_cgroup-id-from-idr-on-mem_cgroup_css_alloc-failure.patch 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 mm-assign-id-to-every-memcg-aware-shrinker-v9.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-v9.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 -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html