From: Hyeonggon Yoo <42.hyeyoo@gmail.com>
To: Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Matthew Wilcox <willy@infradead.org>,
Mike Rapoport <rppt@kernel.org>,
Yosry Ahmed <yosryahmed@google.com>,
linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com>
Subject: [RFC PATCH v3 05/21] mm/zsmalloc: convert {try,}lock_zspage() to use zsdesc
Date: Thu, 30 Nov 2023 19:12:26 +0900 [thread overview]
Message-ID: <20231130101242.2590384-6-42.hyeyoo@gmail.com> (raw)
In-Reply-To: <20231130101242.2590384-1-42.hyeyoo@gmail.com>
Introduce trylock_zsdesc(), unlock_zsdesc(), wait_on_zsdesc_locked()
and convert trylock_zspage() and lock_zspage() to use zsdesc.
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
---
mm/zsmalloc.c | 55 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 35 insertions(+), 20 deletions(-)
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index c511539bee8c..91fccc67185b 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -307,6 +307,21 @@ static inline void zsdesc_put(struct zsdesc *zsdesc)
folio_put(folio);
}
+static inline int trylock_zsdesc(struct zsdesc *zsdesc)
+{
+ return trylock_page(zsdesc_page(zsdesc));
+}
+
+static inline void unlock_zsdesc(struct zsdesc *zsdesc)
+{
+ unlock_page(zsdesc_page(zsdesc));
+}
+
+static inline void wait_on_zsdesc_locked(struct zsdesc *zsdesc)
+{
+ wait_on_page_locked(zsdesc_page(zsdesc));
+}
+
struct zspage {
struct {
unsigned int huge:HUGE_BITS;
@@ -915,11 +930,11 @@ static void reset_page(struct page *page)
static int trylock_zspage(struct zspage *zspage)
{
- struct page *cursor, *fail;
+ struct zsdesc *cursor, *fail;
- for (cursor = get_first_page(zspage); cursor != NULL; cursor =
- get_next_page(cursor)) {
- if (!trylock_page(cursor)) {
+ for (cursor = get_first_zsdesc(zspage); cursor != NULL; cursor =
+ get_next_zsdesc(cursor)) {
+ if (!trylock_zsdesc(cursor)) {
fail = cursor;
goto unlock;
}
@@ -927,9 +942,9 @@ static int trylock_zspage(struct zspage *zspage)
return 1;
unlock:
- for (cursor = get_first_page(zspage); cursor != fail; cursor =
- get_next_page(cursor))
- unlock_page(cursor);
+ for (cursor = get_first_zsdesc(zspage); cursor != fail; cursor =
+ get_next_zsdesc(cursor))
+ unlock_zsdesc(cursor);
return 0;
}
@@ -1759,7 +1774,7 @@ static int putback_zspage(struct size_class *class, struct zspage *zspage)
*/
static void lock_zspage(struct zspage *zspage)
{
- struct page *curr_page, *page;
+ struct zsdesc *curr_zsdesc, *zsdesc;
/*
* Pages we haven't locked yet can be migrated off the list while we're
@@ -1771,24 +1786,24 @@ static void lock_zspage(struct zspage *zspage)
*/
while (1) {
migrate_read_lock(zspage);
- page = get_first_page(zspage);
- if (trylock_page(page))
+ zsdesc = get_first_zsdesc(zspage);
+ if (trylock_zsdesc(zsdesc))
break;
- get_page(page);
+ zsdesc_get(zsdesc);
migrate_read_unlock(zspage);
- wait_on_page_locked(page);
- put_page(page);
+ wait_on_zsdesc_locked(zsdesc);
+ zsdesc_put(zsdesc);
}
- curr_page = page;
- while ((page = get_next_page(curr_page))) {
- if (trylock_page(page)) {
- curr_page = page;
+ curr_zsdesc = zsdesc;
+ while ((zsdesc = get_next_zsdesc(curr_zsdesc))) {
+ if (trylock_zsdesc(zsdesc)) {
+ curr_zsdesc = zsdesc;
} else {
- get_page(page);
+ zsdesc_get(zsdesc);
migrate_read_unlock(zspage);
- wait_on_page_locked(page);
- put_page(page);
+ wait_on_zsdesc_locked(zsdesc);
+ zsdesc_put(zsdesc);
migrate_read_lock(zspage);
}
}
--
2.39.3
next prev parent reply other threads:[~2023-11-30 10:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-30 10:12 [RFC PATCH v3 00/21] mm/zsmalloc: Split zsdesc from struct page Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 01/21] mm/zsmalloc: create new struct zsdesc Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 02/21] mm/zsmalloc: add utility functions for zsdesc Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 03/21] mm/zsmalloc: replace first_page to first_zsdesc in struct zspage Hyeonggon Yoo
2023-12-01 19:23 ` Minchan Kim
2023-12-03 5:22 ` Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 04/21] mm/zsmalloc: add alternatives of frequently used helper functions Hyeonggon Yoo
2023-12-04 3:45 ` Matthew Wilcox
2023-12-05 0:35 ` Hyeonggon Yoo
2023-11-30 10:12 ` Hyeonggon Yoo [this message]
2023-11-30 10:12 ` [RFC PATCH v3 06/21] mm/zsmalloc: convert __zs_{map,unmap}_object() to use zsdesc Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 07/21] mm/zsmalloc: convert obj_to_location() and its users " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 08/21] mm/zsmalloc: convert obj_malloc() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 09/21] mm/zsmalloc: convert create_page_chain() and its users " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 10/21] mm/zsmalloc: convert obj_allocated() and related helpers " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 11/21] mm/zsmalloc: convert init_zspage() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 12/21] mm/zsmalloc: convert obj_to_page() and zs_free() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 13/21] mm/zsmalloc: convert reset_page() to reset_zsdesc() Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 14/21] mm/zsmalloc: convert zs_page_{isolate,migrate,putback} to use zsdesc Hyeonggon Yoo
2023-12-04 3:32 ` Sergey Senozhatsky
2023-12-05 0:21 ` Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 15/21] mm/zsmalloc: convert __free_zspage() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 16/21] mm/zsmalloc: convert location_to_obj() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 17/21] mm/zsmalloc: convert migrate_zspage() " Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 18/21] mm/zsmalloc: convert get_zspage() to take zsdesc Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 19/21] mm/zsmalloc: convert SetZsPageMovable() to use zsdesc Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 20/21] mm/zsmalloc: remove now unused helper functions Hyeonggon Yoo
2023-11-30 10:12 ` [RFC PATCH v3 21/21] mm/zsmalloc: convert {get,set}_first_obj_offset() to use zsdesc Hyeonggon Yoo
2023-12-01 19:28 ` [RFC PATCH v3 00/21] mm/zsmalloc: Split zsdesc from struct page Minchan Kim
2023-12-02 4:36 ` Sergey Senozhatsky
2023-12-02 22:46 ` Matthew Wilcox
2023-12-03 5:21 ` 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=20231130101242.2590384-6-42.hyeyoo@gmail.com \
--to=42.hyeyoo@gmail.com \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=rppt@kernel.org \
--cc=senozhatsky@chromium.org \
--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