From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: Minchan Kim <minchan@kernel.org>,
Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Alex Shi <alexs@kernel.org>,
linux-mm@kvack.org, Hyeonggon Yoo <42.hyeyoo@gmail.com>
Subject: [PATCH v8 01/21] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool
Date: Thu, 5 Dec 2024 17:49:38 +0000 [thread overview]
Message-ID: <20241205175000.3187069-2-willy@infradead.org> (raw)
In-Reply-To: <20241205175000.3187069-1-willy@infradead.org>
From: Alex Shi <alexs@kernel.org>
The 1st patch introduces new memory descriptor zpdesc and rename
zspage.first_page to zspage.first_zpdesc, no functional change.
We removed PG_owner_priv_1 since it was moved to zspage after
commit a41ec880aa7b ("zsmalloc: move huge compressed obj from
page to zspage").
Originally-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Alex Shi <alexs@kernel.org>
---
mm/zpdesc.h | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++
mm/zsmalloc.c | 9 ++++---
2 files changed, 74 insertions(+), 4 deletions(-)
create mode 100644 mm/zpdesc.h
diff --git a/mm/zpdesc.h b/mm/zpdesc.h
new file mode 100644
index 000000000000..9ad232774469
--- /dev/null
+++ b/mm/zpdesc.h
@@ -0,0 +1,69 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* zpdesc.h: zswap.zpool memory descriptor
+ *
+ * Written by Alex Shi <alexs@kernel.org>
+ * Hyeonggon Yoo <42.hyeyoo@gmail.com>
+ */
+#ifndef __MM_ZPDESC_H__
+#define __MM_ZPDESC_H__
+
+/*
+ * struct zpdesc - Memory descriptor for zpool memory
+ * @flags: Page flags, mostly unused.
+ * @lru: Indirectly used by page migration
+ * @movable_ops: Used by page migration
+ * @next: Next zpdesc in a zspage in zsmalloc zpool
+ * @handle: For huge zspage in zsmalloc zpool
+ * @zspage: Points to the zspage this zpdesc is a part of
+ * @first_obj_offset: First object offset in zsmalloc zpool
+ * @_refcount: Indirectly used by page migration
+ * @memcg_data: Memory Control Group data.
+ *
+ * This struct overlays struct page for now. Do not modify without a good
+ * understanding of the issues. In particular, do not expand into
+ * the overlap with memcg_data.
+ *
+ * Page flags used:
+ * * PG_private identifies the first component page
+ * * PG_locked is used by page migration code
+ */
+struct zpdesc {
+ unsigned long flags;
+ struct list_head lru;
+ unsigned long movable_ops;
+ union {
+ struct zpdesc *next;
+ unsigned long handle;
+ };
+ struct zspage *zspage;
+ unsigned int first_obj_offset;
+ atomic_t _refcount;
+};
+#define ZPDESC_MATCH(pg, zp) \
+ static_assert(offsetof(struct page, pg) == offsetof(struct zpdesc, zp))
+
+ZPDESC_MATCH(flags, flags);
+ZPDESC_MATCH(lru, lru);
+ZPDESC_MATCH(mapping, movable_ops);
+ZPDESC_MATCH(index, next);
+ZPDESC_MATCH(index, handle);
+ZPDESC_MATCH(private, zspage);
+ZPDESC_MATCH(page_type, first_obj_offset);
+ZPDESC_MATCH(_refcount, _refcount);
+#undef ZPDESC_MATCH
+static_assert(sizeof(struct zpdesc) <= sizeof(struct page));
+
+#define zpdesc_page(zp) (_Generic((zp), \
+ const struct zpdesc *: (const struct page *)(zp), \
+ struct zpdesc *: (struct page *)(zp)))
+
+/* Using folio conversion to skip compound_head checking */
+#define zpdesc_folio(zp) (_Generic((zp), \
+ const struct zpdesc *: (const struct folio *)(zp), \
+ struct zpdesc *: (struct folio *)(zp)))
+
+#define page_zpdesc(p) (_Generic((p), \
+ const struct page *: (const struct zpdesc *)(p), \
+ struct page *: (struct zpdesc *)(p)))
+
+#endif
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 64b66a4d3e6e..469fda76ed8a 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -67,6 +67,7 @@
#include <linux/pagemap.h>
#include <linux/fs.h>
#include <linux/local_lock.h>
+#include "zpdesc.h"
#define ZSPAGE_MAGIC 0x58
@@ -254,7 +255,7 @@ struct zspage {
};
unsigned int inuse;
unsigned int freeobj;
- struct page *first_page;
+ struct zpdesc *first_zpdesc;
struct list_head list; /* fullness list */
struct zs_pool *pool;
rwlock_t lock;
@@ -459,7 +460,7 @@ static inline void mod_zspage_inuse(struct zspage *zspage, int val)
static inline struct page *get_first_page(struct zspage *zspage)
{
- struct page *first_page = zspage->first_page;
+ struct page *first_page = zpdesc_page(zspage->first_zpdesc);
VM_BUG_ON_PAGE(!is_first_page(first_page), first_page);
return first_page;
@@ -952,7 +953,7 @@ static void create_page_chain(struct size_class *class, struct zspage *zspage,
set_page_private(page, (unsigned long)zspage);
page->index = 0;
if (i == 0) {
- zspage->first_page = page;
+ zspage->first_zpdesc = page_zpdesc(page);
SetPagePrivate(page);
if (unlikely(class->objs_per_zspage == 1 &&
class->pages_per_zspage == 1))
@@ -1318,7 +1319,7 @@ static unsigned long obj_malloc(struct zs_pool *pool,
link->handle = handle | OBJ_ALLOCATED_TAG;
else
/* record handle to page->index */
- zspage->first_page->index = handle | OBJ_ALLOCATED_TAG;
+ zspage->first_zpdesc->handle = handle | OBJ_ALLOCATED_TAG;
kunmap_local(vaddr);
mod_zspage_inuse(zspage, 1);
--
2.45.2
next prev parent reply other threads:[~2024-12-05 17:50 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-05 17:49 [PATCH v8 00/21] Add " Matthew Wilcox (Oracle)
2024-12-05 17:49 ` Matthew Wilcox (Oracle) [this message]
2024-12-10 13:44 ` [PATCH v8 01/21] mm/zsmalloc: add " Hyeonggon Yoo
2024-12-05 17:49 ` [PATCH v8 02/21] mm/zsmalloc: use zpdesc in trylock_zspage()/lock_zspage() Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 03/21] mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 04/21] mm/zsmalloc: add and use pfn/zpdesc seeking funcs Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 05/21] mm/zsmalloc: convert obj_malloc() to use zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 06/21] mm/zsmalloc: convert create_page_chain() and its users " Matthew Wilcox (Oracle)
2024-12-10 13:53 ` Hyeonggon Yoo
2024-12-05 17:49 ` [PATCH v8 07/21] mm/zsmalloc: convert obj_allocated() and related helpers " Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 08/21] mm/zsmalloc: convert init_zspage() " Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 09/21] mm/zsmalloc: convert obj_to_page() and zs_free() " Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 10/21] mm/zsmalloc: add zpdesc_is_isolated()/zpdesc_zone() helper for zs_page_migrate() Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 11/21] mm/zsmalloc: rename reset_page to reset_zpdesc and use zpdesc in it Matthew Wilcox (Oracle)
2024-12-10 14:00 ` Hyeonggon Yoo
2024-12-05 17:49 ` [PATCH v8 12/21] mm/zsmalloc: convert __free_zspage() to use zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 13/21] mm/zsmalloc: convert location_to_obj() to take zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 14/21] mm/zsmalloc: convert migrate_zspage() to use zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 15/21] mm/zsmalloc: convert get_zspage() to take zpdesc Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 16/21] mm/zsmalloc: convert SetZsPageMovable and remove unused funcs Matthew Wilcox (Oracle)
2024-12-10 14:04 ` Hyeonggon Yoo
2024-12-05 17:49 ` [PATCH v8 17/21] mm/zsmalloc: convert get/set_first_obj_offset() to take zpdesc Matthew Wilcox (Oracle)
2024-12-10 14:10 ` Hyeonggon Yoo
2024-12-05 17:49 ` [PATCH v8 18/21] mm/zsmalloc: introduce __zpdesc_clear_movable Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 19/21] mm/zsmalloc: introduce __zpdesc_clear/set_zsmalloc() Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 20/21] mm/zsmalloc: introduce zpdesc_clear_first() helper Matthew Wilcox (Oracle)
2024-12-05 17:49 ` [PATCH v8 21/21] mm/zsmalloc: update comments for page->zpdesc changes Matthew Wilcox (Oracle)
2024-12-10 15:46 ` Hyeonggon Yoo
2024-12-11 4:37 ` Matthew Wilcox
2024-12-12 0:11 ` Hyeonggon Yoo
2024-12-13 2:25 ` Alex Shi
2024-12-09 11:59 ` [PATCH v8 0/21] Add zpdesc memory descriptor for zswap.zpool alexs
2024-12-10 5:54 ` [PATCH v8 00/21] " 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=20241205175000.3187069-2-willy@infradead.org \
--to=willy@infradead.org \
--cc=42.hyeyoo@gmail.com \
--cc=alexs@kernel.org \
--cc=linux-mm@kvack.org \
--cc=minchan@kernel.org \
--cc=senozhatsky@chromium.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