The patch titled
Subject: mm/vmscan.c: move check for SHRINKER_NUMA_AWARE to do_shrink_slab()
has been added to the -mm tree. Its filename is
mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab.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/vmscan.c: move check for SHRINKER_NUMA_AWARE to do_shrink_slab()
In case of shrink_slab_memcg() we do not zero nid, when shrinker is not
numa-aware. This is not a real problem, since currently all memcg-aware
shrinkers are numa-aware too (we have two: super_block shrinker and
workingset shrinker), but something may change in the future.
Link: http://lkml.kernel.org/r/153320759911.18959.8842396230157677671.stgit@localhost.localdomain
Signed-off-by: Kirill Tkhai <ktkhai@xxxxxxxxxxxxx>
Reviewed-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Josef Bacik <jbacik@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/vmscan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/vmscan.c~mm-move-check-for-shrinker_numa_aware-to-do_shrink_slab
+++ a/mm/vmscan.c
@@ -455,6 +455,9 @@ static unsigned long do_shrink_slab(stru
: SHRINK_BATCH;
long scanned = 0, next_deferred;
+ if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
+ nid = 0;
+
freeable = shrinker->count_objects(shrinker, shrinkctl);
if (freeable == 0 || freeable == SHRINK_EMPTY)
return freeable;
@@ -680,9 +683,6 @@ static unsigned long shrink_slab(gfp_t g
.memcg = memcg,
};
- if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
- sc.nid = 0;
-
ret = do_shrink_slab(&sc, shrinker, priority);
if (ret == SHRINK_EMPTY)
ret = 0;
_
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-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-keep-int-fields-in-struct-shrink_control-together.patch
mm-make-flags-of-unsigned-type-in-struct-shrinker.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
