mm-zswap-reference-the-pool-by-id-to-shrink-struct-zswap_entry.patch removed from -mm tree
The quilt patch titled
Subject: mm/zswap: reference the pool by id to shrink struct zswap_entry
has been removed from the -mm tree. Its filename was
mm-zswap-reference-the-pool-by-id-to-shrink-struct-zswap_entry.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Jianyue Wu <[email protected]>
Subject: mm/zswap: reference the pool by id to shrink struct zswap_entry
Date: Sun, 06 Sep 2026 15:47:19 +0800
struct zswap_entry is one allocation per stored page, so its size is pure overhead. It currently embeds an 8-byte pool pointer, even though the live pools now sit in an allocating xarray keyed by a small integer id that fits in a u8.
Replace the per-entry pool pointer with that u8 id and resolve it through the xarray with xa_load(). xa_load() does its own RCU-protected lookup, so the caller needs no rcu_read_lock() section of its own. The resolved pool stays valid because a live entry pins it via percpu_ref (taken in zswap_store_page()), so its id cannot be reused. A live entry never uses the reserved id 0, so a zeroed id resolves to NULL and trips a WARN rather than aliasing a live pool.
The u8 fits in the padding after the bool referenced field, shrinking the entry from 56 to 48 bytes on 64-bit. This raises objs_per_slab from 73 to 85 and saves about 2MiB of metadata per 1GiB of data held in zswap.
---
mm/zswap.c | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-)
mm/zswap.c renamed from mm/zswap.c~mm-zswap-reference-the-pool-by-id-to-shrink-struct-zswap_entry +30 -7
@@ -194,7 +194,7 @@ static struct shrinker *zswap_shrinker;* writeback logic. The entry is only reclaimed by the writeback * logic if referenced is unset. See comments in the shrinker * section for context. -* pool - the zswap_pool the entry's data is in +* pool_idx - id of the zswap_pool that the entry's data is in. * handle - zsmalloc allocation handle that stores the compressed page data * objcg - the obj_cgroup that the compressed memory is charged to * lru - handle to the pool's lru used to evict pages.
@@ -203,12 +203,22 @@ struct zswap_entry {swp_entry_t swpentry;unsigned int length;bool referenced; -struct zswap_pool *pool; +u8 pool_idx;unsigned long handle;struct obj_cgroup *objcg;struct list_head lru; }; +/* +* No RCU section is needed around the returned pointer: a stored entry pins +* its pool via percpu_ref (taken in zswap_store_page()), so the id cannot be +* reused under us. Callers WARN and handle a NULL from a corrupt pool_idx. +*/ +static struct zswap_pool *zswap_entry_pool (struct zswap_entry *entry) +{ +return xa_load (&zswap_pools, entry->pool_idx); +} +static struct xarray *zswap_trees[MAX_SWAPFILES ];static unsigned int nr_zswap_trees[MAX_SWAPFILES ];
@@ -766,9 +776,13 @@ static void zswap_entry_cache_free(struc*/ static void zswap_entry_free (struct zswap_entry *entry) { +struct zswap_pool *pool =zswap_entry_pool (entry); +zswap_lru_del (entry); -zs_free (entry->pool->zs_pool, entry->handle); -zswap_pool_put (entry->pool); +if (!WARN_ON_ONCE (!pool)) { +zs_free (pool->zs_pool, entry->handle); +zswap_pool_put (pool); + }if (entry->objcg) {obj_cgroup_uncharge_zswap (entry->objcg, entry->length);obj_cgroup_put (entry->objcg);
@@ -924,12 +938,15 @@ unlock:static bool zswap_decompress (struct zswap_entry *entry,struct folio *folio) { -struct zswap_pool *pool = entry->pool; +struct zswap_pool *pool =zswap_entry_pool (entry);struct scatterlist input[2 ];/* zsmalloc returns an SG list 1-2 entries */ struct scatterlist output;struct crypto_acomp_ctx *acomp_ctx;int ret =0 , dlen; +if (WARN_ON_ONCE (!pool)) +return false; + acomp_ctx =raw_cpu_ptr (pool->acomp_ctx);mutex_lock (&acomp_ctx->mutex);zs_obj_read_sg_begin (pool->zs_pool, entry->handle, input, entry->length);
@@ -965,7 +982,7 @@ static bool zswap_decompress(struct zswapr_alert_ratelimited ("Decompression error from zswap (%d:%lu %s %u->%d)\n" ,swp_type (entry->swpentry),swp_offset (entry->swpentry), - entry->pool->tfm_name, + pool->tfm_name, entry->length, dlen);return false; }
@@ -1423,6 +1440,13 @@ static bool zswap_store_page(struct foliif (!zswap_compress (folio, index, entry, pool)) goto compress_failed; +/* +* Set pool_idx before the xa_store() below publishes the entry, or a +* concurrent reader could resolve a stale pool_idx left by slab reuse +* to an unrelated live pool. +*/ + entry->pool_idx = pool->idx; + old =xa_store (swap_zswap_tree (page_swpentry),swp_offset (page_swpentry), entry,GFP_KERNEL );
@@ -1468,7 +1492,6 @@ static bool zswap_store_page(struct foli* The publishing order matters to prevent writeback from seeing * an incoherent entry. */ - entry->pool = pool; entry->swpentry = page_swpentry; entry->objcg = objcg; entry->referenced = true;
_
Patches currently in -mm which might be from [email protected] are