From: Hyeonggon Yoo <42.hyeyoo@gmail.com>
To: Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Matthew Wilcox <willy@infradead.org>,
Mike Rapoport <rppt@kernel.org>,
Hyeonggon Yoo <42.hyeyoo@gmail.com>
Subject: [RFC PATCH v2 18/21] mm/zsmalloc: convert get_zspage() to take zsdesc
Date: Thu, 13 Jul 2023 13:20:33 +0900 [thread overview]
Message-ID: <20230713042037.980211-19-42.hyeyoo@gmail.com> (raw)
In-Reply-To: <20230713042037.980211-1-42.hyeyoo@gmail.com>
Now that all users except get_next_page() (which will be removed in
later patch) use zsdesc, convert get_zspage() to take zsdesc instead
of page.
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
---
mm/zsmalloc.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index db43a5d05233..6cb216b8564a 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -899,9 +899,9 @@ static int fix_fullness_group(struct size_class *class, struct zspage *zspage)
return newfg;
}
-static struct zspage *get_zspage(struct page *page)
+static struct zspage *get_zspage(struct zsdesc *zsdesc)
{
- struct zspage *zspage = (struct zspage *)page_private(page);
+ struct zspage *zspage = zsdesc->zspage;
BUG_ON(zspage->magic != ZSPAGE_MAGIC);
return zspage;
@@ -909,7 +909,7 @@ static struct zspage *get_zspage(struct page *page)
static __maybe_unused struct page *get_next_page(struct page *page)
{
- struct zspage *zspage = get_zspage(page);
+ struct zspage *zspage = get_zspage(page_zsdesc(page));
if (unlikely(ZsHugePage(zspage)))
return NULL;
@@ -919,7 +919,7 @@ static __maybe_unused struct page *get_next_page(struct page *page)
static __maybe_unused struct zsdesc *get_next_zsdesc(struct zsdesc *zsdesc)
{
- struct zspage *zspage = get_zspage(zsdesc_page(zsdesc));
+ struct zspage *zspage = get_zspage(zsdesc);
if (unlikely(ZsHugePage(zspage)))
return NULL;
@@ -972,7 +972,7 @@ static inline bool obj_allocated(struct zsdesc *zsdesc, void *obj,
unsigned long *phandle)
{
unsigned long handle;
- struct zspage *zspage = get_zspage(zsdesc_page(zsdesc));
+ struct zspage *zspage = get_zspage(zsdesc);
if (unlikely(ZsHugePage(zspage))) {
VM_BUG_ON_PAGE(!is_first_zsdesc(zsdesc), zsdesc_page(zsdesc));
@@ -1377,7 +1377,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
spin_lock(&pool->lock);
obj = handle_to_obj(handle);
obj_to_location(obj, &zsdesc, &obj_idx);
- zspage = get_zspage(zsdesc_page(zsdesc));
+ zspage = get_zspage(zsdesc);
/*
* migration cannot move any zpages in this zspage. Here, pool->lock
@@ -1427,7 +1427,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
obj = handle_to_obj(handle);
obj_to_location(obj, &zsdesc, &obj_idx);
- zspage = get_zspage(zsdesc_page(zsdesc));
+ zspage = get_zspage(zsdesc);
class = zspage_class(pool, zspage);
off = offset_in_page(class->size * obj_idx);
@@ -1591,7 +1591,7 @@ static void obj_free(int class_size, unsigned long obj)
obj_to_location(obj, &f_zsdesc, &f_objidx);
f_offset = offset_in_page(class_size * f_objidx);
- zspage = get_zspage(zsdesc_page(f_zsdesc));
+ zspage = get_zspage(f_zsdesc);
vaddr = zsdesc_kmap_atomic(f_zsdesc);
link = (struct link_free *)(vaddr + f_offset);
@@ -1625,7 +1625,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle)
spin_lock(&pool->lock);
obj = handle_to_obj(handle);
obj_to_zsdesc(obj, &f_zsdesc);
- zspage = get_zspage(zsdesc_page(f_zsdesc));
+ zspage = get_zspage(f_zsdesc);
class = zspage_class(pool, zspage);
class_stat_dec(class, ZS_OBJS_INUSE, 1);
@@ -1951,7 +1951,7 @@ static bool zs_page_isolate(struct page *page, isolate_mode_t mode)
*/
VM_BUG_ON_PAGE(zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc));
- zspage = get_zspage(zsdesc_page(zsdesc));
+ zspage = get_zspage(zsdesc);
migrate_write_lock(zspage);
inc_zspage_isolation(zspage);
migrate_write_unlock(zspage);
@@ -1985,7 +1985,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,
VM_BUG_ON_PAGE(!zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc));
/* The page is locked, so this pointer must remain valid */
- zspage = get_zspage(zsdesc_page(zsdesc));
+ zspage = get_zspage(zsdesc);
pool = zspage->pool;
/*
@@ -2049,7 +2049,7 @@ static void zs_page_putback(struct page *page)
VM_BUG_ON_PAGE(!zsdesc_is_isolated(zsdesc), zsdesc_page(zsdesc));
- zspage = get_zspage(zsdesc_page(zsdesc));
+ zspage = get_zspage(zsdesc);
migrate_write_lock(zspage);
dec_zspage_isolation(zspage);
migrate_write_unlock(zspage);
--
2.41.0
next prev parent reply other threads:[~2023-07-13 4:21 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-13 4:20 [RFC PATCH v2 00/21] mm/zsmalloc: Split zsdesc from struct page Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 01/21] mm/zsmalloc: create new struct zsdesc Hyeonggon Yoo
2023-07-20 7:47 ` Sergey Senozhatsky
2023-07-13 4:20 ` [RFC PATCH v2 02/21] mm/zsmalloc: add utility functions for zsdesc Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 03/21] mm/zsmalloc: replace first_page to first_zsdesc in struct zspage Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 04/21] mm/zsmalloc: add alternatives of frequently used helper functions Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 05/21] mm/zsmalloc: convert {try,}lock_zspage() to use zsdesc Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 06/21] mm/zsmalloc: convert __zs_{map,unmap}_object() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 07/21] mm/zsmalloc: convert obj_to_location() and its users " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 08/21] mm/zsmalloc: convert obj_malloc() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 09/21] mm/zsmalloc: convert create_page_chain() and its user " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 10/21] mm/zsmalloc: convert obj_allocated() and related helpers " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 11/21] mm/zsmalloc: convert init_zspage() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 12/21] mm/zsmalloc: convert obj_to_page() and zs_free() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 13/21] mm/zsmalloc: convert reset_page() to reset_zsdesc() Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 14/21] mm/zsmalloc: convert zs_page_{isolate,migrate,putback} to use zsdesc Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 15/21] mm/zsmalloc: convert __free_zspage() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 16/21] mm/zsmalloc: convert location_to_obj() " Hyeonggon Yoo
2023-07-20 7:49 ` Sergey Senozhatsky
2023-07-13 4:20 ` [RFC PATCH v2 17/21] mm/zsmalloc: convert migrate_zspage() " Hyeonggon Yoo
2023-07-13 4:20 ` Hyeonggon Yoo [this message]
2023-07-13 4:20 ` [RFC PATCH v2 19/21] mm/zsmalloc: convert SetZsPageMovable() " Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 20/21] mm/zsmalloc: remove now unused helper functions Hyeonggon Yoo
2023-07-13 4:20 ` [RFC PATCH v2 21/21] mm/zsmalloc: convert {get,set}_first_obj_offset() to use zsdesc Hyeonggon Yoo
2023-07-20 7:18 ` [RFC PATCH v2 00/21] mm/zsmalloc: Split zsdesc from struct page Sergey Senozhatsky
2023-07-20 7:54 ` Yosry Ahmed
2023-07-20 11:34 ` Hyeonggon Yoo
2023-07-20 18:31 ` Yosry Ahmed
2023-07-20 21:33 ` Hyeonggon Yoo
2023-07-20 21:38 ` Yosry Ahmed
2023-07-20 21:52 ` Hyeonggon Yoo
2023-07-20 21:57 ` Yosry Ahmed
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=20230713042037.980211-19-42.hyeyoo@gmail.com \
--to=42.hyeyoo@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=rppt@kernel.org \
--cc=senozhatsky@chromium.org \
--cc=willy@infradead.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox