github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mm/zswap: convert zswap_store_page() and zswap_compress() to take a folio

Browse Source 
Currently, zswap_store() iterates through a folio and extracts individual
struct page pointers using folio_page() to pass into zswap_store_page()
and zswap_compress().

Pass the folio and the page index directly into these functions instead. 
This eliminates the need to materialize struct page pointers inside the
zswap_store() loop and replaces legacy page-based accessors with their
folio equivalents:

- sg_set_page() -> sg_set_folio()
- kmap_local_page() -> kmap_local_folio()
- page_to_nid() -> folio_nid()
- page_swap_entry() -> calculated via folio->swap and index

Link: https://lore.kernel.org/20260904232108.3034333-1-wfelipe@google.com
Signed-off-by: Wilson Felipe Pereira <wfelipe@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Tal Zussman <tz2294@columbia.edu>
Cc: Chengming Zhou <chengming.zhou@linux.dev>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Nhat Pham <nphamcs@gmail.com>
This commit is contained in:
Wilson Felipe Pereira 2026-09-04 23:20:47 +00:00 committed by Andrew Morton
parent c1b11d76ea
commit bc82fb61d4
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
mm/zswap.c
View File

@ -824,8 +824,8 @@ static int zswap_cpu_comp_prepare(unsigned int cpu, struct hlist_node *node)
return ret;
}
static bool zswap_compress(struct page *page, struct zswap_entry *entry,
struct zswap_pool *pool)
static bool zswap_compress(struct folio *folio, long index,
struct zswap_entry *entry, struct zswap_pool *pool)
{
struct crypto_acomp_ctx *acomp_ctx;
struct scatterlist input, output;
@ -841,7 +841,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry,
dst = acomp_ctx->buffer;
sg_init_table(&input, 1);
sg_set_page(&input, page, PAGE_SIZE, 0);
sg_set_folio(&input, folio, PAGE_SIZE, index * PAGE_SIZE);
sg_init_one(&output, dst, PAGE_SIZE);
acomp_request_set_params(acomp_ctx->req, &input, &output, PAGE_SIZE, dlen);
@ -870,8 +870,7 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry,
*/
if (comp_ret || !dlen || dlen >= PAGE_SIZE) {
rcu_read_lock();
if (!mem_cgroup_zswap_writeback_enabled(
folio_memcg(page_folio(page)))) {
if (!mem_cgroup_zswap_writeback_enabled(folio_memcg(folio))) {
rcu_read_unlock();
comp_ret = comp_ret ? comp_ret : -EINVAL;
goto unlock;
@ -879,12 +878,12 @@ static bool zswap_compress(struct page *page, struct zswap_entry *entry,
rcu_read_unlock();
comp_ret = 0;
dlen = PAGE_SIZE;
dst = kmap_local_page(page);
dst = kmap_local_folio(folio, index * PAGE_SIZE);
mapped = true;
}
gfp = GFP_NOWAIT | __GFP_NORETRY | __GFP_HIGHMEM | __GFP_MOVABLE;
handle = zs_malloc(pool->zs_pool, dlen, gfp, page_to_nid(page));
handle = zs_malloc(pool->zs_pool, dlen, gfp, folio_nid(folio));
if (IS_ERR_VALUE(handle)) {
alloc_ret = PTR_ERR((void *)handle);
goto unlock;
@ -1392,21 +1391,22 @@ static void shrink_worker(struct work_struct *w)
* main API
**********************************/
static bool zswap_store_page(struct page *page,
static bool zswap_store_page(struct folio *folio, long index,
struct obj_cgroup *objcg,
struct zswap_pool *pool)
{
swp_entry_t page_swpentry = page_swap_entry(page);
swp_entry_t page_swpentry = swp_entry(swp_type(folio->swap),
swp_offset(folio->swap) + index);
struct zswap_entry *entry, *old;
/* allocate entry */
entry = zswap_entry_cache_alloc(GFP_KERNEL, page_to_nid(page));
entry = zswap_entry_cache_alloc(GFP_KERNEL, folio_nid(folio));
if (!entry) {
zswap_reject_kmemcache_fail++;
return false;
}
if (!zswap_compress(page, entry, pool))
if (!zswap_compress(folio, index, entry, pool))
goto compress_failed;
old = xa_store(swap_zswap_tree(page_swpentry),
@ -1515,9 +1515,7 @@ bool zswap_store(struct folio *folio)
}
for (index = 0; index < nr_pages; ++index) {
struct page *page = folio_page(folio, index);
if (!zswap_store_page(page, objcg, pool))
if (!zswap_store_page(folio, index, objcg, pool))
goto put_pool;
}