From: Hyeonggon Yoo <42.hyeyoo@gmail.com>
To: Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Matthew Wilcox <willy@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com>
Subject: [RFC PATCH 17/25] mm/zsmalloc: convert location_to_obj() to use zsdesc
Date: Mon, 20 Feb 2023 13:22:10 +0000 [thread overview]
Message-ID: <20230220132218.546369-18-42.hyeyoo@gmail.com> (raw)
In-Reply-To: <20230220132218.546369-1-42.hyeyoo@gmail.com>
As all users of location_to_obj() now use zsdesc, convert
location_to_obj() to use zsdesc.
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
---
mm/zsmalloc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index affb2755d9d7..dbc404045487 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1038,15 +1038,15 @@ static void obj_to_zsdesc(unsigned long obj, struct zsdesc **zsdesc)
}
/**
- * location_to_obj - get obj value encoded from (<page>, <obj_idx>)
- * @page: page object resides in zspage
+ * location_to_obj - get obj value encoded from (<zsdesc>, <obj_idx>)
+ * @zsdesc object resides in zspage
* @obj_idx: object index
*/
-static unsigned long location_to_obj(struct page *page, unsigned int obj_idx)
+static unsigned long location_to_obj(struct zsdesc *zsdesc, unsigned int obj_idx)
{
unsigned long obj;
- obj = page_to_pfn(page) << OBJ_INDEX_BITS;
+ obj = zsdesc_pfn(zsdesc) << OBJ_INDEX_BITS;
obj |= obj_idx & OBJ_INDEX_MASK;
obj <<= OBJ_TAG_BITS;
@@ -1671,7 +1671,7 @@ static unsigned long obj_malloc(struct zs_pool *pool,
kunmap_atomic(vaddr);
mod_zspage_inuse(zspage, 1);
- obj = location_to_obj(zsdesc_page(m_zsdesc), obj);
+ obj = location_to_obj(m_zsdesc, obj);
return obj;
}
@@ -2252,7 +2252,7 @@ static int zs_page_migrate(struct page *newpage, struct page *page,
old_obj = handle_to_obj(handle);
obj_to_location(old_obj, &dummy, &obj_idx);
- new_obj = (unsigned long)location_to_obj(zsdesc_page(new_zsdesc),
+ new_obj = (unsigned long)location_to_obj(new_zsdesc,
obj_idx);
record_obj(handle, new_obj);
}
--
2.25.1
next prev parent reply other threads:[~2023-02-20 13:23 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-20 13:21 [RFC PATCH 00/25] mm/zsmalloc: Split zsdesc from struct page Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 01/25] mm/zsmalloc: create new struct zsdesc Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 02/25] mm/zsmalloc: add utility functions for zsdesc Hyeonggon Yoo
2023-02-27 15:30 ` Mike Rapoport
2023-03-01 6:19 ` Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 03/25] mm/zsmalloc: replace first_page to first_zsdesc in struct zspage Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 04/25] mm/zsmalloc: add alternatives of frequently used helper functions Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 05/25] mm/zsmalloc: convert {try,}lock_zspage() to use zsdesc Hyeonggon Yoo
2023-02-20 13:21 ` [RFC PATCH 06/25] mm/zsmalloc: convert __zs_{map,unmap}_object() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 07/25] mm/zsmalloc: convert obj_to_location() and its users " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 08/25] mm/zsmalloc: convert obj_malloc() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 09/25] mm/zsmalloc: convert create_page_chain() and its users " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 10/25] mm/zsmalloc: convert obj_tagged() and related helpers " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 11/25] mm/zsmalloc: convert init_zspage() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 12/25] mm/zsmalloc: convert obj_to_page() and zs_free() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 13/25] mm/zsmalloc: convert reset_page() to reset_zsdesc() Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 14/25] mm/zsmalloc: convert zs_page_{isolate,migrate,putback} to use zsdesc Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 15/25] mm/zsmalloc: convert __free_zspage() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 16/25] mm/zsmalloc: convert unlock_zspage() " Hyeonggon Yoo
2023-02-20 13:22 ` Hyeonggon Yoo [this message]
2023-02-20 13:22 ` [RFC PATCH 18/25] mm/zsmalloc: convert free_handles() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 19/25] mm/zsmalloc: convert zs_compact_control and its users " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 20/25] mm/zsmalloc: convert get_zspage() to take zsdesc Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 21/25] mm/zsmalloc: convert SetZsPageMovable() to use zsdesc Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 22/25] mm/zsmalloc: convert restore_freelist() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 23/25] mm/zsmalloc: convert zs_reclaim_page() " Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 24/25] mm/zsmalloc: remove now unused helper functions Hyeonggon Yoo
2023-02-20 13:22 ` [RFC PATCH 25/25] mm/zsmalloc: convert {get,set}_first_obj_offset() to use zsdesc Hyeonggon Yoo
2023-02-24 0:01 ` [RFC PATCH 00/25] mm/zsmalloc: Split zsdesc from struct page Minchan Kim
2023-02-28 0:32 ` Hyeonggon Yoo
2023-02-28 2:02 ` Sergey Senozhatsky
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=20230220132218.546369-18-42.hyeyoo@gmail.com \
--to=42.hyeyoo@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-mm@kvack.org \
--cc=minchan@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