[RHEL7,COMMIT] tswap, tcache: Increase shrinkers seeks

Submitted by Konstantin Khorenko on Nov. 8, 2017, 3:28 p.m.

Details

Message ID 201711081528.vA8FS6w5020376@finist_ce7.work
State New
Series "tswap, tcache: Increase shrinkers seeks"
Headers show

Commit Message

Konstantin Khorenko Nov. 8, 2017, 3:28 p.m.
The commit is pushed to "branch-rh7-3.10.0-693.1.1.vz7.37.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh7-3.10.0-693.1.1.vz7.37.24
------>
commit d6cdd02bdcf3f264f18b1d187cb419ecc5607644
Author: Kirill Tkhai <ktkhai@virtuozzo.com>
Date:   Wed Nov 8 18:28:06 2017 +0300

    tswap, tcache: Increase shrinkers seeks
    
    Commit e008b95a28ef95dd4bb08f69c89d26fc5fa7411a
    "ms/mm: use sc->priority for slab shrink targets"
    exposed the fact we shrinks too many tcache pages.
    
    Shrinkers of {in,}active pages shrink up to 32
    pages, while tcache and tswap shrinks 128 pages.
    This became a reason of tcache active test fail.
    
    This patch makes numbers of shrinked pages of tcache
    and tswap in consistent state with pages shrinkers,
    and restores the test-expected behaviour.
    
    https://jira.sw.ru/browse/PSBM-72584
    
    Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    Acked-by: Andrey Ryabinin <aryabinin@virtuozzo.com>
---
 mm/tcache.c | 2 +-
 mm/tswap.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/mm/tcache.c b/mm/tcache.c
index d1a2c53..8b893e6 100644
--- a/mm/tcache.c
+++ b/mm/tcache.c
@@ -1202,7 +1202,7 @@  static unsigned long tcache_shrink_scan(struct shrinker *shrink,
 struct shrinker tcache_shrinker = {
 	.count_objects		= tcache_shrink_count,
 	.scan_objects		= tcache_shrink_scan,
-	.seeks			= 1,
+	.seeks			= 4,
 	.batch			= TCACHE_SCAN_BATCH,
 	.flags			= SHRINKER_NUMA_AWARE,
 };
diff --git a/mm/tswap.c b/mm/tswap.c
index 38a389f..b7a990e 100644
--- a/mm/tswap.c
+++ b/mm/tswap.c
@@ -271,7 +271,7 @@  static unsigned long tswap_shrink_scan(struct shrinker *shrink,
 static struct shrinker tswap_shrinker = {
 	.count_objects = tswap_shrink_count,
 	.scan_objects = tswap_shrink_scan,
-	.seeks = 1,
+	.seeks = 4,
 	.flags = SHRINKER_NUMA_AWARE,
 };