mm/zsmalloc: convert SetZsPageMovable and remove unused funcs

Convert SetZsPageMovable() to use zpdesc, and then remove unused funcs:
get_next_page()/get_first_page()/is_first_page().

Link: https://lkml.kernel.org/r/20241216150450.1228021-17-42.hyeyoo@gmail.com
Originally-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Signed-off-by: Alex Shi <alexs@kernel.org>
Signed-off-by: Hyeonggon Yoo <42.hyeyoo@gmail.com>
Acked-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Vishal Moola (Oracle) <vishal.moola@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 77fd4e0b5bb0a90cae3ac741457e2f54cb4b3b40..43b4f5772b1e2dd3661c1fbccd2f76d34c7b46f2 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -452,11 +452,6 @@ static DEFINE_PER_CPU(struct mapping_area, zs_map_area) = {
        .lock   = INIT_LOCAL_LOCK(lock),
 };
 
-static __maybe_unused int is_first_page(struct page *page)
-{
-       return PagePrivate(page);
-}
-
 static inline bool is_first_zpdesc(struct zpdesc *zpdesc)
 {
        return PagePrivate(zpdesc_page(zpdesc));
@@ -473,14 +468,6 @@ static inline void mod_zspage_inuse(struct zspage *zspage, int val)
        zspage->inuse += val;
 }
 
-static inline struct page *get_first_page(struct zspage *zspage)
-{
-       struct page *first_page = zpdesc_page(zspage->first_zpdesc);
-
-       VM_BUG_ON_PAGE(!is_first_page(first_page), first_page);
-       return first_page;
-}
-
 static struct zpdesc *get_first_zpdesc(struct zspage *zspage)
 {
        struct zpdesc *first_zpdesc = zspage->first_zpdesc;
@@ -765,16 +752,6 @@ static struct zspage *get_zspage(struct zpdesc *zpdesc)
        return zspage;
 }
 
-static struct page *get_next_page(struct page *page)
-{
-       struct zspage *zspage = get_zspage(page_zpdesc(page));
-
-       if (unlikely(ZsHugePage(zspage)))
-               return NULL;
-
-       return (struct page *)page->index;
-}
-
 static struct zpdesc *get_next_zpdesc(struct zpdesc *zpdesc)
 {
        struct zspage *zspage = get_zspage(zpdesc);
@@ -1936,13 +1913,13 @@ static void init_deferred_free(struct zs_pool *pool)
 
 static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage)
 {
-       struct page *page = get_first_page(zspage);
+       struct zpdesc *zpdesc = get_first_zpdesc(zspage);
 
        do {
-               WARN_ON(!trylock_page(page));
-               __SetPageMovable(page, &zsmalloc_mops);
-               unlock_page(page);
-       } while ((page = get_next_page(page)) != NULL);
+               WARN_ON(!zpdesc_trylock(zpdesc));
+               __zpdesc_set_movable(zpdesc, &zsmalloc_mops);
+               zpdesc_unlock(zpdesc);
+       } while ((zpdesc = get_next_zpdesc(zpdesc)) != NULL);
 }
 #else
 static inline void zs_flush_migration(struct zs_pool *pool) { }