Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1404504
| From | Minchan Kim <minchan@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 09/12] zsmalloc: separate free_zspage from putback_zspage |
| Date | 2016-05-20 16:30 +0200 |
| Message-ID | <rATB9-6Bl-37@gated-at.bofh.it> (permalink) |
| References | <rATB8-6Bl-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 b24842bd4537..8fc16cc4d76d 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1683,14 +1683,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;
@@ -1699,15 +1697,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;
}
@@ -1756,23 +1745,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
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 00/12] Support non-lru page migration Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 03/12] mm: balloon: use general non-lru movable page feature Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
Re: [PATCH v6 03/12] mm: balloon: use general non-lru movable page feature Vlastimil Babka <vbabka@suse.cz> - 2016-05-30 14:20 +0200
[PATCH v6 12/12] zram: use __GFP_MOVABLE for memory allocation Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 05/12] zsmalloc: use bit_spin_lock Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-05-24 07:30 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-24 08:30 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-05-24 10:10 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-24 10:20 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-25 07:20 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Sergey Senozhatsky <sergey.senozhatsky@gmail.com> - 2016-05-25 16:30 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-26 02:40 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com> - 2016-05-26 03:00 +0200
Re: [PATCH v6 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-26 06:40 +0200
[PATCH v6r2 11/12] zsmalloc: page migration support Minchan Kim <minchan@kernel.org> - 2016-05-27 00:00 +0200
[PATCH v6 08/12] zsmalloc: introduce zspage structure Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 06/12] zsmalloc: use accessor Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 02/12] mm: migrate: support non-lru movable page migration Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
Re: [PATCH v6 02/12] mm: migrate: support non-lru movable page migration Vlastimil Babka <vbabka@suse.cz> - 2016-05-27 16:30 +0200
Re: [PATCH v6 02/12] mm: migrate: support non-lru movable page migration Minchan Kim <minchan@kernel.org> - 2016-05-30 03:40 +0200
Re: [PATCH v6 02/12] mm: migrate: support non-lru movable page migration Vlastimil Babka <vbabka@suse.cz> - 2016-05-30 11:10 +0200
PATCH v6v2 02/12] mm: migrate: support non-lru movable page migration Minchan Kim <minchan@kernel.org> - 2016-05-30 03:40 +0200
Re: PATCH v6v2 02/12] mm: migrate: support non-lru movable page migration Vlastimil Babka <vbabka@suse.cz> - 2016-05-30 11:40 +0200
Re: PATCH v6v2 02/12] mm: migrate: support non-lru movable page migration Minchan Kim <minchan@kernel.org> - 2016-05-30 18:30 +0200
Re: PATCH v6v2 02/12] mm: migrate: support non-lru movable page migration Vlastimil Babka <vbabka@suse.cz> - 2016-05-31 10:00 +0200
[PATCH v6v3 02/12] mm: migrate: support non-lru movable page migration Minchan Kim <minchan@kernel.org> - 2016-05-31 02:10 +0200
Re: [PATCH v6v3 02/12] mm: migrate: support non-lru movable page migration Vlastimil Babka <vbabka@suse.cz> - 2016-05-31 10:00 +0200
[PATCH v6 10/12] zsmalloc: use freeobj for index Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 09/12] zsmalloc: separate free_zspage from putback_zspage Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 04/12] zsmalloc: keep max_object in size_class Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 01/12] mm: use put_page to free page instead of putback_lru_page Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
[PATCH v6 07/12] zsmalloc: factor page chain functionality out Minchan Kim <minchan@kernel.org> - 2016-05-20 16:30 +0200
csiph-web