From: alexs@kernel.org
To: Vitaly Wool <vitaly.wool@konsulko.com>,
Miaohe Lin <linmiaohe@huawei.com>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
minchan@kernel.org, willy@infradead.org,
senozhatsky@chromium.org, david@redhat.com, 42.hyeyoo@gmail.com,
Yosry Ahmed <yosryahmed@google.com>,
nphamcs@gmail.com
Cc: Alex Shi <alexs@kernel.org>
Subject: [PATCH v7 15/21] mm/zsmalloc: convert get_zspage() to take zpdesc
Date: Mon, 2 Sep 2024 15:21:26 +0800 [thread overview]
Message-ID: <20240902072136.578720-16-alexs@kernel.org> (raw)
In-Reply-To: <20240902072136.578720-1-alexs@kernel.org>
From: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Now that all users except get_next_page() (which will be removed in
later patch) use zpdesc, convert get_zspage() to take zpdesc instead
of page.
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Alex Shi <alexs@kernel.org>
---
mm/zsmalloc.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index aeb8cab5767b..d9251450ec60 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -767,9 +767,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 zpdesc *zpdesc)
{
- struct zspage *zspage = (struct zspage *)page_private(page);
+ struct zspage *zspage = zpdesc->zspage;
BUG_ON(zspage->magic != ZSPAGE_MAGIC);
return zspage;
@@ -777,7 +777,7 @@ static struct zspage *get_zspage(struct page *page)
static struct page *get_next_page(struct page *page)
{
- struct zspage *zspage = get_zspage(page);
+ struct zspage *zspage = get_zspage(page_zpdesc(page));
if (unlikely(ZsHugePage(zspage)))
return NULL;
@@ -787,7 +787,7 @@ static struct page *get_next_page(struct page *page)
static struct zpdesc *get_next_zpdesc(struct zpdesc *zpdesc)
{
- struct zspage *zspage = get_zspage(zpdesc_page(zpdesc));
+ struct zspage *zspage = get_zspage(zpdesc);
if (unlikely(ZsHugePage(zspage)))
return NULL;
@@ -837,7 +837,7 @@ static inline bool obj_allocated(struct zpdesc *zpdesc, void *obj,
unsigned long *phandle)
{
unsigned long handle;
- struct zspage *zspage = get_zspage(zpdesc_page(zpdesc));
+ struct zspage *zspage = get_zspage(zpdesc);
if (unlikely(ZsHugePage(zspage))) {
VM_BUG_ON_PAGE(!is_first_zpdesc(zpdesc), zpdesc_page(zpdesc));
@@ -1252,7 +1252,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
read_lock(&pool->migrate_lock);
obj = handle_to_obj(handle);
obj_to_location(obj, &zpdesc, &obj_idx);
- zspage = get_zspage(zpdesc_page(zpdesc));
+ zspage = get_zspage(zpdesc);
/*
* migration cannot move any zpages in this zspage. Here, class->lock
@@ -1302,7 +1302,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
obj = handle_to_obj(handle);
obj_to_location(obj, &zpdesc, &obj_idx);
- zspage = get_zspage(zpdesc_page(zpdesc));
+ zspage = get_zspage(zpdesc);
class = zspage_class(pool, zspage);
off = offset_in_page(class->size * obj_idx);
@@ -1466,7 +1466,7 @@ static void obj_free(int class_size, unsigned long obj)
obj_to_location(obj, &f_zpdesc, &f_objidx);
f_offset = offset_in_page(class_size * f_objidx);
- zspage = get_zspage(zpdesc_page(f_zpdesc));
+ zspage = get_zspage(f_zpdesc);
vaddr = zpdesc_kmap_atomic(f_zpdesc);
link = (struct link_free *)(vaddr + f_offset);
@@ -1500,7 +1500,7 @@ void zs_free(struct zs_pool *pool, unsigned long handle)
read_lock(&pool->migrate_lock);
obj = handle_to_obj(handle);
obj_to_zpdesc(obj, &f_zpdesc);
- zspage = get_zspage(zpdesc_page(f_zpdesc));
+ zspage = get_zspage(f_zpdesc);
class = zspage_class(pool, zspage);
spin_lock(&class->lock);
read_unlock(&pool->migrate_lock);
@@ -1833,7 +1833,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,
__SetPageZsmalloc(zpdesc_page(newzpdesc));
/* The page is locked, so this pointer must remain valid */
- zspage = get_zspage(zpdesc_page(zpdesc));
+ zspage = get_zspage(zpdesc);
pool = zspage->pool;
/*
--
2.46.0
next prev parent reply other threads:[~2024-09-02 7:17 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-02 7:21 [PATCH v7 00/21] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool alexs
2024-09-02 7:21 ` [PATCH v7 01/21] " alexs
2024-12-03 16:51 ` Matthew Wilcox
2024-09-02 7:21 ` [PATCH v7 02/21] mm/zsmalloc: use zpdesc in trylock_zspage()/lock_zspage() alexs
2024-09-02 7:21 ` [PATCH v7 03/21] mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc alexs
2024-09-02 7:21 ` [PATCH v7 04/21] mm/zsmalloc: add and use pfn/zpdesc seeking funcs alexs
2024-09-02 7:21 ` [PATCH v7 05/21] mm/zsmalloc: convert obj_malloc() to use zpdesc alexs
2024-09-02 7:21 ` [PATCH v7 06/21] mm/zsmalloc: convert create_page_chain() and its users " alexs
2024-09-02 7:21 ` [PATCH v7 07/21] mm/zsmalloc: convert obj_allocated() and related helpers " alexs
2024-09-02 7:21 ` [PATCH v7 08/21] mm/zsmalloc: convert init_zspage() " alexs
2024-09-02 7:21 ` [PATCH v7 09/21] mm/zsmalloc: convert obj_to_page() and zs_free() " alexs
2024-09-02 7:21 ` [PATCH v7 10/21] mm/zsmalloc: add zpdesc_is_isolated()/zpdesc_zone() helper for zs_page_migrate() alexs
2024-09-02 7:21 ` [PATCH v7 11/21] mm/zsmalloc: rename reset_page to reset_zpdesc and use zpdesc in it alexs
2024-09-02 7:21 ` [PATCH v7 12/21] mm/zsmalloc: convert __free_zspage() to use zdsesc alexs
2024-09-02 7:21 ` [PATCH v7 13/21] mm/zsmalloc: convert location_to_obj() to take zpdesc alexs
2024-09-02 7:21 ` [PATCH v7 14/21] mm/zsmalloc: convert migrate_zspage() to use zpdesc alexs
2024-09-02 7:21 ` alexs [this message]
2024-09-02 7:21 ` [PATCH v7 16/21] mm/zsmalloc: convert SetZsPageMovable and remove unused funcs alexs
2024-09-02 7:21 ` [PATCH v7 17/21] mm/zsmalloc: convert get/set_first_obj_offset() to take zpdesc alexs
2024-09-02 7:21 ` [PATCH v7 18/21] mm/zsmalloc: introduce __zpdesc_clear_movable alexs
2024-09-02 7:21 ` [PATCH v7 19/21] mm/zsmalloc: introduce __zpdesc_clear/set_zsmalloc() alexs
2024-09-02 7:21 ` [PATCH v7 20/21] mm/zsmalloc: introduce zpdesc_clear_first() helper alexs
2024-09-02 7:21 ` [PATCH v7 21/21] mm/zsmalloc: update comments for page->zpdesc changes alexs
2024-09-03 3:35 ` [PATCH v7 00/21] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool Sergey Senozhatsky
2024-09-03 3:45 ` Sergey Senozhatsky
2024-09-03 8:01 ` Alex Shi
2024-09-04 6:54 ` Alex Shi
2024-09-04 20:04 ` Vishal Moola
2024-09-12 2:28 ` Alex Shi
2024-12-02 20:05 ` Vishal Moola
2024-12-03 13:58 ` Alex Shi
2024-12-04 14:01 ` Hyeonggon Yoo
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=20240902072136.578720-16-alexs@kernel.org \
--to=alexs@kernel.org \
--cc=42.hyeyoo@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=david@redhat.com \
--cc=linmiaohe@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=nphamcs@gmail.com \
--cc=senozhatsky@chromium.org \
--cc=vitaly.wool@konsulko.com \
--cc=willy@infradead.org \
--cc=yosryahmed@google.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: 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;
as well as URLs for NNTP newsgroup(s).