From: Dan Streetman <ddstreet@ieee.org> To: Minchan Kim <minchan@kernel.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky@gmail.com>, Nitin Gupta <ngupta@vflare.org>, Seth Jennings <sjennings@variantweb.net>, Andrew Morton <akpm@linux-foundation.org>, Dan Streetman <ddstreet@ieee.org> Subject: [PATCH 04/10] zsmalloc: move zspage obj freeing to separate function Date: Thu, 11 Sep 2014 16:53:55 -0400 [thread overview] Message-ID: <1410468841-320-5-git-send-email-ddstreet@ieee.org> (raw) In-Reply-To: <1410468841-320-1-git-send-email-ddstreet@ieee.org> Move the code that frees a zspage object out of the zs_free() function and into its own obj_free() function. This is required by zsmalloc shrinking, which will also need to free objects during zspage reclaiming. Signed-off-by: Dan Streetman <ddstreet@ieee.org> Cc: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 51db622..cff8935 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -584,6 +584,21 @@ static unsigned long obj_idx_to_offset(struct page *page, return off + obj_idx * class_size; } +static void obj_free(unsigned long obj, struct page *page, unsigned long offset) +{ + struct page *first_page = get_first_page(page); + struct link_free *link; + + /* Insert this object in containing zspage's freelist */ + link = (struct link_free *)((unsigned char *)kmap_atomic(page) + + offset); + link->next = first_page->freelist; + kunmap_atomic(link); + first_page->freelist = (void *)obj; + + first_page->inuse--; +} + static void reset_page(struct page *page) { clear_bit(PG_private, &page->flags); @@ -1049,7 +1064,6 @@ EXPORT_SYMBOL_GPL(zs_malloc); void zs_free(struct zs_pool *pool, unsigned long obj) { - struct link_free *link; struct page *first_page, *f_page; unsigned long f_objidx, f_offset; @@ -1069,14 +1083,8 @@ void zs_free(struct zs_pool *pool, unsigned long obj) spin_lock(&class->lock); - /* Insert this object in containing zspage's freelist */ - link = (struct link_free *)((unsigned char *)kmap_atomic(f_page) - + f_offset); - link->next = first_page->freelist; - kunmap_atomic(link); - first_page->freelist = (void *)obj; + obj_free(obj, f_page, f_offset); - first_page->inuse--; fullness = fix_fullness_group(pool, first_page); spin_unlock(&class->lock); -- 1.8.3.1
WARNING: multiple messages have this Message-ID (diff)
From: Dan Streetman <ddstreet@ieee.org> To: Minchan Kim <minchan@kernel.org> Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Sergey Senozhatsky <sergey.senozhatsky@gmail.com>, Nitin Gupta <ngupta@vflare.org>, Seth Jennings <sjennings@variantweb.net>, Andrew Morton <akpm@linux-foundation.org>, Dan Streetman <ddstreet@ieee.org> Subject: [PATCH 04/10] zsmalloc: move zspage obj freeing to separate function Date: Thu, 11 Sep 2014 16:53:55 -0400 [thread overview] Message-ID: <1410468841-320-5-git-send-email-ddstreet@ieee.org> (raw) In-Reply-To: <1410468841-320-1-git-send-email-ddstreet@ieee.org> Move the code that frees a zspage object out of the zs_free() function and into its own obj_free() function. This is required by zsmalloc shrinking, which will also need to free objects during zspage reclaiming. Signed-off-by: Dan Streetman <ddstreet@ieee.org> Cc: Minchan Kim <minchan@kernel.org> --- mm/zsmalloc.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index 51db622..cff8935 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -584,6 +584,21 @@ static unsigned long obj_idx_to_offset(struct page *page, return off + obj_idx * class_size; } +static void obj_free(unsigned long obj, struct page *page, unsigned long offset) +{ + struct page *first_page = get_first_page(page); + struct link_free *link; + + /* Insert this object in containing zspage's freelist */ + link = (struct link_free *)((unsigned char *)kmap_atomic(page) + + offset); + link->next = first_page->freelist; + kunmap_atomic(link); + first_page->freelist = (void *)obj; + + first_page->inuse--; +} + static void reset_page(struct page *page) { clear_bit(PG_private, &page->flags); @@ -1049,7 +1064,6 @@ EXPORT_SYMBOL_GPL(zs_malloc); void zs_free(struct zs_pool *pool, unsigned long obj) { - struct link_free *link; struct page *first_page, *f_page; unsigned long f_objidx, f_offset; @@ -1069,14 +1083,8 @@ void zs_free(struct zs_pool *pool, unsigned long obj) spin_lock(&class->lock); - /* Insert this object in containing zspage's freelist */ - link = (struct link_free *)((unsigned char *)kmap_atomic(f_page) - + f_offset); - link->next = first_page->freelist; - kunmap_atomic(link); - first_page->freelist = (void *)obj; + obj_free(obj, f_page, f_offset); - first_page->inuse--; fullness = fix_fullness_group(pool, first_page); spin_unlock(&class->lock); -- 1.8.3.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:[~2014-09-11 20:55 UTC|newest] Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-09-11 20:53 [PATCH 00/10] implement zsmalloc shrinking Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:53 ` [PATCH 01/10] zsmalloc: fix init_zspage free obj linking Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-12 3:16 ` Seth Jennings 2014-09-12 4:59 ` Minchan Kim 2014-09-12 4:59 ` Minchan Kim 2014-09-12 16:43 ` Dan Streetman 2014-09-12 16:43 ` Dan Streetman 2014-09-14 23:24 ` Minchan Kim 2014-09-14 23:24 ` Minchan Kim 2014-09-15 20:58 ` [PATCH] zsmalloc: simplify " Dan Streetman 2014-09-15 20:58 ` Dan Streetman 2014-09-16 2:41 ` Minchan Kim 2014-09-16 2:41 ` Minchan Kim 2014-09-11 20:53 ` [PATCH 02/10] zsmalloc: add fullness group list for ZS_FULL zspages Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:53 ` [PATCH 03/10] zsmalloc: always update lru ordering of each zspage Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-12 3:20 ` Seth Jennings 2014-09-11 20:53 ` Dan Streetman [this message] 2014-09-11 20:53 ` [PATCH 04/10] zsmalloc: move zspage obj freeing to separate function Dan Streetman 2014-09-11 20:53 ` [PATCH 05/10] zsmalloc: add atomic index to find zspage to reclaim Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:53 ` [PATCH 06/10] zsmalloc: add zs_ops to zs_pool Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:53 ` [PATCH 07/10] zsmalloc: add obj_handle_is_free() Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:53 ` [PATCH 08/10] zsmalloc: add reclaim_zspage() Dan Streetman 2014-09-11 20:53 ` Dan Streetman 2014-09-11 20:54 ` [PATCH 09/10] zsmalloc: add zs_shrink() Dan Streetman 2014-09-11 20:54 ` Dan Streetman 2014-09-11 20:54 ` [PATCH 10/10] zsmalloc: implement zs_zpool_shrink() with zs_shrink() Dan Streetman 2014-09-11 20:54 ` Dan Streetman 2014-09-12 3:14 ` [PATCH 00/10] implement zsmalloc shrinking Seth Jennings 2014-09-12 5:46 ` Minchan Kim 2014-09-12 5:46 ` Minchan Kim 2014-09-12 17:05 ` Dan Streetman 2014-09-12 17:05 ` Dan Streetman 2014-09-15 0:00 ` Minchan Kim 2014-09-15 0:00 ` Minchan Kim 2014-09-15 14:29 ` Dan Streetman 2014-09-15 14:29 ` Dan Streetman
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=1410468841-320-5-git-send-email-ddstreet@ieee.org \ --to=ddstreet@ieee.org \ --cc=akpm@linux-foundation.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan@kernel.org \ --cc=ngupta@vflare.org \ --cc=sergey.senozhatsky@gmail.com \ --cc=sjennings@variantweb.net \ /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.