From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> To: Andrew Morton <akpm@linux-foundation.org>, Minchan Kim <minchan@kernel.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [RFC][PATCHv2 8/8] zsmalloc: register a shrinker to trigger auto-compaction Date: Fri, 5 Jun 2015 21:03:58 +0900 [thread overview] Message-ID: <1433505838-23058-9-git-send-email-sergey.senozhatsky@gmail.com> (raw) In-Reply-To: <1433505838-23058-1-git-send-email-sergey.senozhatsky@gmail.com> Perform automatic pool compaction by a shrinker when system is getting tight on memory. Demonstration (this output is merely to show auto-compaction effectiveness and is not part of the code): [..] [ 4283.803766] zram0 zs_shrinker_scan freed 364 [ 4285.398937] zram0 zs_shrinker_scan freed 471 [ 4286.044095] zram0 zs_shrinker_scan freed 273 [ 4286.951824] zram0 zs_shrinker_scan freed 312 [ 4287.583563] zram0 zs_shrinker_scan freed 222 [ 4289.360971] zram0 zs_shrinker_scan freed 343 [ 4289.884653] zram0 zs_shrinker_scan freed 210 [ 4291.204705] zram0 zs_shrinker_scan freed 175 [ 4292.043656] zram0 zs_shrinker_scan freed 425 [ 4292.273397] zram0 zs_shrinker_scan freed 109 [ 4292.513351] zram0 zs_shrinker_scan freed 191 [..] cat /sys/block/zram0/mm_stat 2908798976 2061913167 2091438080 0 2128449536 868 6074 Compaction now has a relatively quick pool scan so we are able to estimate the number of pages that will be freed easily, which makes it possible to call this function from a shrinker->count_objects() callback. We also abort compaction as soon as we detect that we can't free any pages any more, preventing wasteful objects migrations. In the example above, "6074 objects were migrated" implies that we actually released zspages back to system. The initial patch was triggering compaction from zs_free() for every ZS_ALMOST_EMPTY page. Minchan Kim proposed to use a slab shrinker. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Reported-by: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a81e75b..f262d8d 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -247,7 +247,9 @@ struct zs_pool { atomic_long_t pages_allocated; /* How many objects were migrated */ unsigned long num_migrated; - + /* Compact classes */ + struct shrinker shrinker; + bool shrinker_enabled; #ifdef CONFIG_ZSMALLOC_STAT struct dentry *stat_dentry; #endif @@ -1728,12 +1730,9 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) while ((dst_page = isolate_target_page(class))) { cc.d_page = dst_page; - /* - * If there is no more space in dst_page, resched - * and see if anyone had allocated another zspage. - */ + if (!migrate_zspage(pool, class, &cc)) - break; + goto out; putback_zspage(pool, class, dst_page); } @@ -1744,11 +1743,10 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) putback_zspage(pool, class, dst_page); putback_zspage(pool, class, src_page); - spin_unlock(&class->lock); - cond_resched(); - spin_lock(&class->lock); } - +out: + if (dst_page) + putback_zspage(pool, class, dst_page); if (src_page) putback_zspage(pool, class, src_page); @@ -1772,6 +1770,65 @@ unsigned long zs_compact(struct zs_pool *pool) } EXPORT_SYMBOL_GPL(zs_compact); +static unsigned long zs_shrinker_scan(struct shrinker *shrinker, + struct shrink_control *sc) +{ + unsigned long freed; + struct zs_pool *pool = container_of(shrinker, struct zs_pool, + shrinker); + + freed = pool->num_migrated; + /* Compact classes and calculate compaction delta */ + freed = zs_compact(pool) - freed; + + return freed ? freed : SHRINK_STOP; +} + +static unsigned long zs_shrinker_count(struct shrinker *shrinker, + struct shrink_control *sc) +{ + int i; + struct size_class *class; + unsigned long to_free = 0; + struct zs_pool *pool = container_of(shrinker, struct zs_pool, + shrinker); + + if (!pool->shrinker_enabled) + return 0; + + for (i = zs_size_classes - 1; i >= 0; i--) { + class = pool->size_class[i]; + if (!class) + continue; + if (class->index != i) + continue; + + spin_lock(&class->lock); + to_free += zs_can_compact(class); + spin_unlock(&class->lock); + } + + return to_free; +} + +static void zs_unregister_shrinker(struct zs_pool *pool) +{ + if (pool->shrinker_enabled) { + unregister_shrinker(&pool->shrinker); + pool->shrinker_enabled = false; + } +} + +static int zs_register_shrinker(struct zs_pool *pool) +{ + pool->shrinker.scan_objects = zs_shrinker_scan; + pool->shrinker.count_objects = zs_shrinker_count; + pool->shrinker.batch = 0; + pool->shrinker.seeks = DEFAULT_SEEKS; + + return register_shrinker(&pool->shrinker); +} + /** * zs_create_pool - Creates an allocation pool to work from. * @flags: allocation flags used to allocate pool metadata @@ -1857,6 +1914,9 @@ struct zs_pool *zs_create_pool(char *name, gfp_t flags) if (zs_pool_stat_create(name, pool)) goto err; + /* Not critical, we still can use the pool */ + if (zs_register_shrinker(pool) == 0) + pool->shrinker_enabled = true; return pool; err: @@ -1869,6 +1929,7 @@ void zs_destroy_pool(struct zs_pool *pool) { int i; + zs_unregister_shrinker(pool); zs_pool_stat_destroy(pool); for (i = 0; i < zs_size_classes; i++) { -- 2.4.2.387.gf86f31a
WARNING: multiple messages have this Message-ID (diff)
From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> To: Andrew Morton <akpm@linux-foundation.org>, Minchan Kim <minchan@kernel.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [RFC][PATCHv2 8/8] zsmalloc: register a shrinker to trigger auto-compaction Date: Fri, 5 Jun 2015 21:03:58 +0900 [thread overview] Message-ID: <1433505838-23058-9-git-send-email-sergey.senozhatsky@gmail.com> (raw) In-Reply-To: <1433505838-23058-1-git-send-email-sergey.senozhatsky@gmail.com> Perform automatic pool compaction by a shrinker when system is getting tight on memory. Demonstration (this output is merely to show auto-compaction effectiveness and is not part of the code): [..] [ 4283.803766] zram0 zs_shrinker_scan freed 364 [ 4285.398937] zram0 zs_shrinker_scan freed 471 [ 4286.044095] zram0 zs_shrinker_scan freed 273 [ 4286.951824] zram0 zs_shrinker_scan freed 312 [ 4287.583563] zram0 zs_shrinker_scan freed 222 [ 4289.360971] zram0 zs_shrinker_scan freed 343 [ 4289.884653] zram0 zs_shrinker_scan freed 210 [ 4291.204705] zram0 zs_shrinker_scan freed 175 [ 4292.043656] zram0 zs_shrinker_scan freed 425 [ 4292.273397] zram0 zs_shrinker_scan freed 109 [ 4292.513351] zram0 zs_shrinker_scan freed 191 [..] cat /sys/block/zram0/mm_stat 2908798976 2061913167 2091438080 0 2128449536 868 6074 Compaction now has a relatively quick pool scan so we are able to estimate the number of pages that will be freed easily, which makes it possible to call this function from a shrinker->count_objects() callback. We also abort compaction as soon as we detect that we can't free any pages any more, preventing wasteful objects migrations. In the example above, "6074 objects were migrated" implies that we actually released zspages back to system. The initial patch was triggering compaction from zs_free() for every ZS_ALMOST_EMPTY page. Minchan Kim proposed to use a slab shrinker. Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Reported-by: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 71 insertions(+), 10 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index a81e75b..f262d8d 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -247,7 +247,9 @@ struct zs_pool { atomic_long_t pages_allocated; /* How many objects were migrated */ unsigned long num_migrated; - + /* Compact classes */ + struct shrinker shrinker; + bool shrinker_enabled; #ifdef CONFIG_ZSMALLOC_STAT struct dentry *stat_dentry; #endif @@ -1728,12 +1730,9 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) while ((dst_page = isolate_target_page(class))) { cc.d_page = dst_page; - /* - * If there is no more space in dst_page, resched - * and see if anyone had allocated another zspage. - */ + if (!migrate_zspage(pool, class, &cc)) - break; + goto out; putback_zspage(pool, class, dst_page); } @@ -1744,11 +1743,10 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) putback_zspage(pool, class, dst_page); putback_zspage(pool, class, src_page); - spin_unlock(&class->lock); - cond_resched(); - spin_lock(&class->lock); } - +out: + if (dst_page) + putback_zspage(pool, class, dst_page); if (src_page) putback_zspage(pool, class, src_page); @@ -1772,6 +1770,65 @@ unsigned long zs_compact(struct zs_pool *pool) } EXPORT_SYMBOL_GPL(zs_compact); +static unsigned long zs_shrinker_scan(struct shrinker *shrinker, + struct shrink_control *sc) +{ + unsigned long freed; + struct zs_pool *pool = container_of(shrinker, struct zs_pool, + shrinker); + + freed = pool->num_migrated; + /* Compact classes and calculate compaction delta */ + freed = zs_compact(pool) - freed; + + return freed ? freed : SHRINK_STOP; +} + +static unsigned long zs_shrinker_count(struct shrinker *shrinker, + struct shrink_control *sc) +{ + int i; + struct size_class *class; + unsigned long to_free = 0; + struct zs_pool *pool = container_of(shrinker, struct zs_pool, + shrinker); + + if (!pool->shrinker_enabled) + return 0; + + for (i = zs_size_classes - 1; i >= 0; i--) { + class = pool->size_class[i]; + if (!class) + continue; + if (class->index != i) + continue; + + spin_lock(&class->lock); + to_free += zs_can_compact(class); + spin_unlock(&class->lock); + } + + return to_free; +} + +static void zs_unregister_shrinker(struct zs_pool *pool) +{ + if (pool->shrinker_enabled) { + unregister_shrinker(&pool->shrinker); + pool->shrinker_enabled = false; + } +} + +static int zs_register_shrinker(struct zs_pool *pool) +{ + pool->shrinker.scan_objects = zs_shrinker_scan; + pool->shrinker.count_objects = zs_shrinker_count; + pool->shrinker.batch = 0; + pool->shrinker.seeks = DEFAULT_SEEKS; + + return register_shrinker(&pool->shrinker); +} + /** * zs_create_pool - Creates an allocation pool to work from. * @flags: allocation flags used to allocate pool metadata @@ -1857,6 +1914,9 @@ struct zs_pool *zs_create_pool(char *name, gfp_t flags) if (zs_pool_stat_create(name, pool)) goto err; + /* Not critical, we still can use the pool */ + if (zs_register_shrinker(pool) == 0) + pool->shrinker_enabled = true; return pool; err: @@ -1869,6 +1929,7 @@ void zs_destroy_pool(struct zs_pool *pool) { int i; + zs_unregister_shrinker(pool); zs_pool_stat_destroy(pool); for (i = 0; i < zs_size_classes; i++) { -- 2.4.2.387.gf86f31a -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2015-06-05 12:05 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-06-05 12:03 [RFC][PATCHv2 0/8] introduce automatic pool compaction Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 1/8] zsmalloc: drop unused variable `nr_to_migrate' Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 2/8] zsmalloc: partial page ordering within a fullness_list Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-16 13:19 ` Minchan Kim 2015-06-16 13:19 ` Minchan Kim 2015-06-16 14:30 ` Sergey Senozhatsky 2015-06-16 14:30 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 3/8] zsmalloc: lower ZS_ALMOST_FULL waterline Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-16 13:37 ` Minchan Kim 2015-06-16 13:37 ` Minchan Kim 2015-06-16 14:35 ` Sergey Senozhatsky 2015-06-16 14:35 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 4/8] zsmalloc: always keep per-class stats Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 5/8] zsmalloc: introduce zs_can_compact() function Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-16 14:19 ` Minchan Kim 2015-06-16 14:19 ` Minchan Kim 2015-06-16 14:41 ` Sergey Senozhatsky 2015-06-16 14:41 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 6/8] zsmalloc: cosmetic compaction code adjustments Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-05 12:03 ` [RFC][PATCHv2 7/8] zsmalloc/zram: move `num_migrated' to zs_pool Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky 2015-06-05 12:03 ` Sergey Senozhatsky [this message] 2015-06-05 12:03 ` [RFC][PATCHv2 8/8] zsmalloc: register a shrinker to trigger auto-compaction Sergey Senozhatsky 2015-06-16 14:47 ` Minchan Kim 2015-06-16 14:47 ` Minchan Kim 2015-06-16 15:45 ` Sergey Senozhatsky 2015-06-16 15:45 ` Sergey Senozhatsky 2015-06-18 1:50 ` Minchan Kim 2015-06-18 1:50 ` Minchan Kim 2015-06-18 2:41 ` Sergey Senozhatsky 2015-06-18 2:41 ` Sergey Senozhatsky 2015-06-18 3:01 ` Sergey Senozhatsky 2015-06-18 3:01 ` Sergey Senozhatsky 2015-06-18 3:46 ` Minchan Kim 2015-06-18 3:46 ` Minchan Kim 2015-06-18 3:39 ` Minchan Kim 2015-06-18 3:39 ` Minchan Kim 2015-06-18 3:58 ` Sergey Senozhatsky 2015-06-18 3:58 ` Sergey Senozhatsky 2015-06-17 7:11 ` Sergey Senozhatsky 2015-06-17 7:11 ` Sergey Senozhatsky 2015-06-10 0:04 ` [RFC][PATCHv2 0/8] introduce automatic pool compaction Minchan Kim 2015-06-10 0:04 ` Minchan Kim 2015-06-10 0:07 ` Sergey Senozhatsky 2015-06-10 0:07 ` Sergey Senozhatsky
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1433505838-23058-9-git-send-email-sergey.senozhatsky@gmail.com \ --to=sergey.senozhatsky@gmail.com \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan@kernel.org \ --cc=sergey.senozhatsky.work@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.