From: Minchan Kim <minchan@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Minchan Kim <minchan@kernel.org>, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [PATCH v7 09/12] zsmalloc: separate free_zspage from putback_zspage Date: Wed, 1 Jun 2016 08:21:18 +0900 [thread overview] Message-ID: <1464736881-24886-10-git-send-email-minchan@kernel.org> (raw) In-Reply-To: <1464736881-24886-1-git-send-email-minchan@kernel.org> Currently, putback_zspage does free zspage under class->lock if fullness become ZS_EMPTY but it makes trouble to implement locking scheme for new zspage migration. So, this patch is to separate free_zspage from putback_zspage and free zspage out of class->lock which is preparation for zspage migration. Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c6d2cbe0f19f..dd3708611f65 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1687,14 +1687,12 @@ static struct zspage *isolate_zspage(struct size_class *class, bool source) /* * putback_zspage - add @zspage into right class's fullness list - * @pool: target pool * @class: destination class * @zspage: target page * * Return @zspage's fullness_group */ -static enum fullness_group putback_zspage(struct zs_pool *pool, - struct size_class *class, +static enum fullness_group putback_zspage(struct size_class *class, struct zspage *zspage) { enum fullness_group fullness; @@ -1703,15 +1701,6 @@ static enum fullness_group putback_zspage(struct zs_pool *pool, insert_zspage(class, zspage, fullness); set_zspage_mapping(zspage, class->index, fullness); - if (fullness == ZS_EMPTY) { - zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage( - class->size, class->pages_per_zspage)); - atomic_long_sub(class->pages_per_zspage, - &pool->pages_allocated); - - free_zspage(pool, zspage); - } - return fullness; } @@ -1760,23 +1749,29 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) if (!migrate_zspage(pool, class, &cc)) break; - putback_zspage(pool, class, dst_zspage); + putback_zspage(class, dst_zspage); } /* Stop if we couldn't find slot */ if (dst_zspage == NULL) break; - putback_zspage(pool, class, dst_zspage); - if (putback_zspage(pool, class, src_zspage) == ZS_EMPTY) + putback_zspage(class, dst_zspage); + if (putback_zspage(class, src_zspage) == ZS_EMPTY) { + zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage( + class->size, class->pages_per_zspage)); + atomic_long_sub(class->pages_per_zspage, + &pool->pages_allocated); + free_zspage(pool, src_zspage); pool->stats.pages_compacted += class->pages_per_zspage; + } spin_unlock(&class->lock); cond_resched(); spin_lock(&class->lock); } if (src_zspage) - putback_zspage(pool, class, src_zspage); + putback_zspage(class, src_zspage); spin_unlock(&class->lock); } -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Minchan Kim <minchan@kernel.org> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Minchan Kim <minchan@kernel.org>, Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Subject: [PATCH v7 09/12] zsmalloc: separate free_zspage from putback_zspage Date: Wed, 1 Jun 2016 08:21:18 +0900 [thread overview] Message-ID: <1464736881-24886-10-git-send-email-minchan@kernel.org> (raw) In-Reply-To: <1464736881-24886-1-git-send-email-minchan@kernel.org> Currently, putback_zspage does free zspage under class->lock if fullness become ZS_EMPTY but it makes trouble to implement locking scheme for new zspage migration. So, this patch is to separate free_zspage from putback_zspage and free zspage out of class->lock which is preparation for zspage migration. Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c6d2cbe0f19f..dd3708611f65 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1687,14 +1687,12 @@ static struct zspage *isolate_zspage(struct size_class *class, bool source) /* * putback_zspage - add @zspage into right class's fullness list - * @pool: target pool * @class: destination class * @zspage: target page * * Return @zspage's fullness_group */ -static enum fullness_group putback_zspage(struct zs_pool *pool, - struct size_class *class, +static enum fullness_group putback_zspage(struct size_class *class, struct zspage *zspage) { enum fullness_group fullness; @@ -1703,15 +1701,6 @@ static enum fullness_group putback_zspage(struct zs_pool *pool, insert_zspage(class, zspage, fullness); set_zspage_mapping(zspage, class->index, fullness); - if (fullness == ZS_EMPTY) { - zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage( - class->size, class->pages_per_zspage)); - atomic_long_sub(class->pages_per_zspage, - &pool->pages_allocated); - - free_zspage(pool, zspage); - } - return fullness; } @@ -1760,23 +1749,29 @@ static void __zs_compact(struct zs_pool *pool, struct size_class *class) if (!migrate_zspage(pool, class, &cc)) break; - putback_zspage(pool, class, dst_zspage); + putback_zspage(class, dst_zspage); } /* Stop if we couldn't find slot */ if (dst_zspage == NULL) break; - putback_zspage(pool, class, dst_zspage); - if (putback_zspage(pool, class, src_zspage) == ZS_EMPTY) + putback_zspage(class, dst_zspage); + if (putback_zspage(class, src_zspage) == ZS_EMPTY) { + zs_stat_dec(class, OBJ_ALLOCATED, get_maxobj_per_zspage( + class->size, class->pages_per_zspage)); + atomic_long_sub(class->pages_per_zspage, + &pool->pages_allocated); + free_zspage(pool, src_zspage); pool->stats.pages_compacted += class->pages_per_zspage; + } spin_unlock(&class->lock); cond_resched(); spin_lock(&class->lock); } if (src_zspage) - putback_zspage(pool, class, src_zspage); + putback_zspage(class, src_zspage); spin_unlock(&class->lock); } -- 1.9.1 -- 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:[~2016-05-31 23:21 UTC|newest] Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-31 23:21 [PATCH v7 00/12] Support non-lru page migration Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 01/12] mm: use put_page to free page instead of putback_lru_page Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 02/12] mm: migrate: support non-lru movable page migration Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 03/12] mm: balloon: use general non-lru movable page feature Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 04/12] zsmalloc: keep max_object in size_class Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 05/12] zsmalloc: use bit_spin_lock Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 06/12] zsmalloc: use accessor Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 07/12] zsmalloc: factor page chain functionality out Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 08/12] zsmalloc: introduce zspage structure Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` Minchan Kim [this message] 2016-05-31 23:21 ` [PATCH v7 09/12] zsmalloc: separate free_zspage from putback_zspage Minchan Kim 2016-05-31 23:21 ` [PATCH v7 10/12] zsmalloc: use freeobj for index Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 11/12] zsmalloc: page migration support Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-06-01 14:09 ` Vlastimil Babka 2016-06-01 14:09 ` Vlastimil Babka 2016-06-02 0:25 ` Minchan Kim 2016-06-02 0:25 ` Minchan Kim 2016-06-02 11:44 ` Vlastimil Babka 2016-06-02 11:44 ` Vlastimil Babka 2016-06-01 21:39 ` Andrew Morton 2016-06-01 21:39 ` Andrew Morton 2016-06-02 0:15 ` Minchan Kim 2016-06-02 0:15 ` Minchan Kim [not found] ` <CGME20170119001317epcas1p188357c77e1f4ff08b6d3dcb76dedca06@epcas1p1.samsung.com> 2017-01-19 0:13 ` Chulmin Kim 2017-01-19 2:44 ` Minchan Kim 2017-01-19 3:39 ` Chulmin Kim 2017-01-19 6:21 ` Minchan Kim 2017-01-19 8:16 ` Chulmin Kim 2017-01-23 5:22 ` Minchan Kim 2017-01-23 5:30 ` Sergey Senozhatsky 2017-01-23 5:40 ` Minchan Kim 2017-01-25 4:06 ` Chulmin Kim 2017-01-25 4:25 ` Sergey Senozhatsky 2017-01-25 5:26 ` Minchan Kim 2017-01-26 17:04 ` Dan Streetman 2017-01-31 0:10 ` Minchan Kim 2017-01-31 13:09 ` Dan Streetman 2017-02-01 6:51 ` Minchan Kim 2017-02-01 19:38 ` Dan Streetman 2017-02-02 8:48 ` Minchan Kim 2016-05-31 23:21 ` [PATCH v7 12/12] zram: use __GFP_MOVABLE for memory allocation Minchan Kim 2016-05-31 23:21 ` Minchan Kim 2016-06-01 21:41 ` [PATCH v7 00/12] Support non-lru page migration Andrew Morton 2016-06-01 21:41 ` Andrew Morton 2016-06-01 21:41 ` Andrew Morton 2016-06-01 22:40 ` Daniel Vetter 2016-06-01 22:40 ` Daniel Vetter 2016-06-01 22:40 ` Daniel Vetter 2016-06-02 0:36 ` Minchan Kim 2016-06-02 0:36 ` Minchan Kim 2016-06-02 0:36 ` Minchan Kim 2016-06-15 7:59 ` Sergey Senozhatsky 2016-06-15 7:59 ` Sergey Senozhatsky 2016-06-15 7:59 ` Sergey Senozhatsky 2016-06-15 23:12 ` Minchan Kim 2016-06-15 23:12 ` Minchan Kim 2016-06-16 2:48 ` Sergey Senozhatsky 2016-06-16 2:48 ` Sergey Senozhatsky 2016-06-16 2:58 ` Minchan Kim 2016-06-16 2:58 ` Minchan Kim 2016-06-16 2:58 ` Minchan Kim 2016-06-16 4:23 ` Sergey Senozhatsky 2016-06-16 4:23 ` Sergey Senozhatsky 2016-06-16 4:47 ` Minchan Kim 2016-06-16 4:47 ` Minchan Kim 2016-06-16 4:47 ` Minchan Kim 2016-06-16 5:22 ` Sergey Senozhatsky 2016-06-16 5:22 ` Sergey Senozhatsky 2016-06-16 5:22 ` Sergey Senozhatsky 2016-06-16 6:47 ` Minchan Kim 2016-06-16 6:47 ` Minchan Kim 2016-06-16 6:47 ` Minchan Kim 2016-06-16 8:42 ` Sergey Senozhatsky 2016-06-16 8:42 ` Sergey Senozhatsky 2016-06-16 10:09 ` Minchan Kim 2016-06-16 10:09 ` Minchan Kim 2016-06-17 7:28 ` Joonsoo Kim 2016-06-17 7:28 ` Joonsoo Kim 2016-06-17 7:28 ` Joonsoo Kim 2016-06-16 10:09 ` Minchan Kim 2016-06-16 8:42 ` Sergey Senozhatsky 2016-06-16 4:23 ` Sergey Senozhatsky 2016-06-16 2:48 ` Sergey Senozhatsky 2016-06-15 23:12 ` Minchan Kim
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=1464736881-24886-10-git-send-email-minchan@kernel.org \ --to=minchan@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=sergey.senozhatsky@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.