Commit 7b600411 authored by Yosry Ahmed's avatar Yosry Ahmed Committed by Andrew Morton
Browse files

mm: zpool: remove zpool_malloc_support_movable() 

zpool_malloc_support_movable() always returns true for zsmalloc, the only
remaining zpool driver.  Remove it and set the gfp flags in
zswap_compress() accordingly.  Opportunistically use GFP_NOWAIT instead of
__GFP_NOWARN | __GFP_KSWAPD_RECLAIM for conciseness as they are
equivalent.

Link: https://lkml.kernel.org/r/20250305061134.4105762-6-yosry.ahmed@linux.dev


Signed-off-by: default avatarYosry Ahmed <yosry.ahmed@linux.dev>
Reviewed-by: default avatarSergey Senozhatsky <senozhatsky@chromium.org>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Acked-by: default avatarNhat Pham <nphamcs@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 07864f1a

include/linux/zpool.h

+0 −3
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ const char *zpool_get_type(struct zpool *pool); 


void zpool_destroy_pool(struct zpool *pool);



bool zpool_malloc_support_movable(struct zpool *pool);



int zpool_malloc(struct zpool *pool, size_t size, gfp_t gfp,

			unsigned long *handle);
@@ -65,7 +63,6 @@ struct zpool_driver { 
	void *(*create)(const char *name, gfp_t gfp);

	void (*destroy)(void *pool);



	bool malloc_support_movable;

	int (*malloc)(void *pool, size_t size, gfp_t gfp,

				unsigned long *handle);

	void (*free)(void *pool, unsigned long handle);

mm/zpool.c

+0 −16
Original line number Diff line number Diff line
@@ -220,22 +220,6 @@ const char *zpool_get_type(struct zpool *zpool) 
	return zpool->driver->type;

}



/**

 * zpool_malloc_support_movable() - Check if the zpool supports

 *	allocating movable memory

 * @zpool:	The zpool to check

 *

 * This returns if the zpool supports allocating movable memory.

 *

 * Implementations must guarantee this to be thread-safe.

 *

 * Returns: true if the zpool supports allocating movable memory, false if not

 */

bool zpool_malloc_support_movable(struct zpool *zpool)

{

	return zpool->driver->malloc_support_movable;

}



/**

 * zpool_malloc() - Allocate memory

 * @zpool:	The zpool to allocate from.

mm/zsmalloc.c

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ static struct zpool_driver zs_zpool_driver = { 
	.owner =		  THIS_MODULE,

	.create =		  zs_zpool_create,

	.destroy =		  zs_zpool_destroy,

	.malloc_support_movable = true,

	.malloc =		  zs_zpool_malloc,

	.free =			  zs_zpool_free,

	.obj_read_begin =	  zs_zpool_obj_read_begin,

mm/zswap.c

+1 −3
Original line number Diff line number Diff line
@@ -964,9 +964,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry, 
		goto unlock;



	zpool = pool->zpool;

	gfp = __GFP_NORETRY | __GFP_NOWARN | __GFP_KSWAPD_RECLAIM;

	if (zpool_malloc_support_movable(zpool))

		gfp |= __GFP_HIGHMEM | __GFP_MOVABLE;

	gfp = GFP_NOWAIT | __GFP_NORETRY | __GFP_HIGHMEM | __GFP_MOVABLE;

	alloc_ret = zpool_malloc(zpool, dlen, gfp, &handle);

	if (alloc_ret)

		goto unlock;