linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] mm: Move check for SHRINKER_NUMA_AWARE to do_shrink_slab()
@ 2018-08-02 11:00 Kirill Tkhai
  2018-08-02 16:47 ` Yang Shi
  2018-08-02 20:47 ` Andrew Morton
  0 siblings, 2 replies; 12+ messages in thread
From: Kirill Tkhai @ 2018-08-02 11:00 UTC (permalink / raw)
  To: akpm, ktkhai, vdavydov.dev, mhocko, aryabinin, ying.huang,
	penguin-kernel, willy, shakeelb, jbacik, linux-mm, linux-kernel

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.

(Andrew, this may be merged to mm-iterate-only-over-charged-shrinkers-during-memcg-shrink_slab)

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
---
 mm/vmscan.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/vmscan.c b/mm/vmscan.c
index ea0a46166e8e..0d980e801b8a 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -455,6 +455,9 @@ static unsigned long do_shrink_slab(struct shrink_control *shrinkctl,
 					  : 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 gfp_mask, int nid,
 			.memcg = memcg,
 		};
 
-		if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
-			sc.nid = 0;
-
 		ret = do_shrink_slab(&sc, shrinker, priority);
 		if (ret == SHRINK_EMPTY)
 			ret = 0;

^ permalink raw reply related	[flat|nested] 12+ messages in thread

end of thread, other threads:[~2018-08-03 12:00 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-02 11:00 [PATCH] mm: Move check for SHRINKER_NUMA_AWARE to do_shrink_slab() Kirill Tkhai
2018-08-02 16:47 ` Yang Shi
2018-08-02 16:54   ` Shakeel Butt
2018-08-02 17:26     ` Yang Shi
2018-08-03  7:11       ` Kirill Tkhai
2018-08-02 20:47 ` Andrew Morton
2018-08-03  9:02   ` Kirill Tkhai
2018-08-03 10:31   ` David Howells
2018-08-03 10:59     ` Kirill Tkhai
2018-08-03 11:04       ` Kirill Tkhai
2018-08-03 12:00       ` David Howells
2018-08-03 11:18   ` David Howells

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).