[14/20] mm/zsmalloc: convert migrate_zspage() to use zpdesc

Message ID	20240628031138.429622-15-alexs@kernel.org (mailing list archive)
State	New
Headers	show Return-Path: <owner-linux-mm@kvack.org> 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 Cc: Alex Shi <alexs@kernel.org> Subject: [PATCH 14/20] mm/zsmalloc: convert migrate_zspage() to use zpdesc Date: Fri, 28 Jun 2024 11:11:29 +0800 Message-ID: <20240628031138.429622-15-alexs@kernel.org> In-Reply-To: <20240628031138.429622-1-alexs@kernel.org> References: <20240628031138.429622-1-alexs@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Precedence: bulk
Series	mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool \| expand [00/20] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool [01/20] mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool [02/20] mm/zsmalloc: use zpdesc in trylock_zspage/lock_zspage [03/20] mm/zsmalloc: convert __zs_map_object/__zs_unmap_object to use zpdesc [04/20] mm/zsmalloc: add and use pfn/zpdesc seeking funcs [05/20] mm/zsmalloc: convert obj_malloc() to use zpdesc [06/20] mm/zsmalloc: convert create_page_chain() and its users to use zpdesc [07/20] mm/zsmalloc: convert obj_allocated() and related helpers to use zpdesc [08/20] mm/zsmalloc: convert init_zspage() to use zpdesc [09/20] mm/zsmalloc: convert obj_to_page() and zs_free() to use zpdesc [10/20] mm/zsmalloc: add zpdesc_is_isolated/zpdesc_zone helper for zs_page_migrate [11/20] mm/zsmalloc: rename reset_page to reset_zpdesc and use zpdesc in it [12/20] mm/zsmalloc: convert __free_zspage() to use zdsesc [13/20] mm/zsmalloc: convert location_to_obj() to take zpdesc [14/20] mm/zsmalloc: convert migrate_zspage() to use zpdesc [15/20] mm/zsmalloc: convert get_zspage() to take zpdesc [16/20] mm/zsmalloc: convert SetZsPageMovable and remove unused funcs [17/20] mm/zsmalloc: convert get/set_first_obj_offset() to take zpdesc [18/20] mm/zsmalloc: introduce __zpdesc_clear_movable [19/20] mm/zsmalloc: introduce __zpdesc_clear_zsmalloc [20/20] mm/zsmalloc: introduce __zpdesc_set_zsmalloc()

Message ID

20240628031138.429622-15-alexs@kernel.org (mailing list archive)

State

New

Headers

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
Cc: Alex Shi <alexs@kernel.org>
Subject: [PATCH 14/20] mm/zsmalloc: convert migrate_zspage() to use zpdesc
Date: Fri, 28 Jun 2024 11:11:29 +0800
Message-ID: <20240628031138.429622-15-alexs@kernel.org>
In-Reply-To: <20240628031138.429622-1-alexs@kernel.org>
References: <20240628031138.429622-1-alexs@kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: owner-linux-mm@kvack.org
Precedence: bulk

Series

mm/zsmalloc: add zpdesc memory descriptor for zswap.zpool | expand

Commit Message

alexs@kernel.org June 28, 2024, 3:11 a.m. UTC

From: Hyeonggon Yoo <42.hyeyoo@gmail.com>

Use get_first_zpdesc/get_next_zpdesc to replace get_first/next_page. No
functional change.

Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Alex Shi <alexs@kernel.org>
---
 mm/zsmalloc.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index e8af01768ae0..a10af49d8d08 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1640,14 +1640,14 @@  static void migrate_zspage(struct zs_pool *pool, struct zspage *src_zspage,
 	unsigned long used_obj, free_obj;
 	unsigned long handle;
 	int obj_idx = 0;
-	struct page *s_page = get_first_page(src_zspage);
+	struct zpdesc *s_zpdesc = get_first_zpdesc(src_zspage);
 	struct size_class *class = pool->size_class[src_zspage->class];
 
 	while (1) {
-		handle = find_alloced_obj(class, page_zpdesc(s_page), &obj_idx);
+		handle = find_alloced_obj(class, s_zpdesc, &obj_idx);
 		if (!handle) {
-			s_page = get_next_page(s_page);
-			if (!s_page)
+			s_zpdesc = get_next_zpdesc(s_zpdesc);
+			if (!s_zpdesc)
 				break;
 			obj_idx = 0;
 			continue;

[14/20] mm/zsmalloc: convert migrate_zspage() to use zpdesc

Commit Message

Patch