Skip to content

Commit c11bcbc

Browse files
Yosry Ahmedakpm00
Yosry Ahmed
authored andcommitted
mm: zswap: fix crypto_free_acomp() deadlock in zswap_cpu_comp_dead()
Currently, zswap_cpu_comp_dead() calls crypto_free_acomp() while holding the per-CPU acomp_ctx mutex. crypto_free_acomp() then holds scomp_lock (through crypto_exit_scomp_ops_async()). On the other hand, crypto_alloc_acomp_node() holds the scomp_lock (through crypto_scomp_init_tfm()), and then allocates memory. If the allocation results in reclaim, we may attempt to hold the per-CPU acomp_ctx mutex. The above dependencies can cause an ABBA deadlock. For example in the following scenario: (1) Task A running on CPU #1: crypto_alloc_acomp_node() Holds scomp_lock Enters reclaim Reads per_cpu_ptr(pool->acomp_ctx, 1) (2) Task A is descheduled (3) CPU #1 goes offline zswap_cpu_comp_dead(CPU #1) Holds per_cpu_ptr(pool->acomp_ctx, 1)) Calls crypto_free_acomp() Waits for scomp_lock (4) Task A running on CPU #2: Waits for per_cpu_ptr(pool->acomp_ctx, 1) // Read on CPU #1 DEADLOCK Since there is no requirement to call crypto_free_acomp() with the per-CPU acomp_ctx mutex held in zswap_cpu_comp_dead(), move it after the mutex is unlocked. Also move the acomp_request_free() and kfree() calls for consistency and to avoid any potential sublte locking dependencies in the future. With this, only setting acomp_ctx fields to NULL occurs with the mutex held. This is similar to how zswap_cpu_comp_prepare() only initializes acomp_ctx fields with the mutex held, after performing all allocations before holding the mutex. Opportunistically, move the NULL check on acomp_ctx so that it takes place before the mutex dereference. Link: https://lkml.kernel.org/r/20250226185625.2672936-1-yosry.ahmed@linux.dev Fixes: 12dcb0e ("mm: zswap: properly synchronize freeing resources during CPU hotunplug") Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Co-developed-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev> Reported-by: syzbot+1a517ccfcbc6a7ab0f82@syzkaller.appspotmail.com Closes: https://lore.kernel.org/all/67bcea51.050a0220.bbfd1.0096.GAE@google.com/ Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> Reviewed-by: Nhat Pham <nphamcs@gmail.com> Tested-by: Nhat Pham <nphamcs@gmail.com> Cc: David S. Miller <davem@davemloft.net> Cc: Eric Biggers <ebiggers@kernel.org> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Chris Murphy <lists@colorremedies.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 1ca77ff commit c11bcbc

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

mm/zswap.c

+22-8
Original file line numberDiff line numberDiff line change
@@ -883,18 +883,32 @@ static int zswap_cpu_comp_dead(unsigned int cpu, struct hlist_node *node)
883883
{
884884
struct zswap_pool *pool = hlist_entry(node, struct zswap_pool, node);
885885
struct crypto_acomp_ctx *acomp_ctx = per_cpu_ptr(pool->acomp_ctx, cpu);
886+
struct acomp_req *req;
887+
struct crypto_acomp *acomp;
888+
u8 *buffer;
889+
890+
if (IS_ERR_OR_NULL(acomp_ctx))
891+
return 0;
886892

887893
mutex_lock(&acomp_ctx->mutex);
888-
if (!IS_ERR_OR_NULL(acomp_ctx)) {
889-
if (!IS_ERR_OR_NULL(acomp_ctx->req))
890-
acomp_request_free(acomp_ctx->req);
891-
acomp_ctx->req = NULL;
892-
if (!IS_ERR_OR_NULL(acomp_ctx->acomp))
893-
crypto_free_acomp(acomp_ctx->acomp);
894-
kfree(acomp_ctx->buffer);
895-
}
894+
req = acomp_ctx->req;
895+
acomp = acomp_ctx->acomp;
896+
buffer = acomp_ctx->buffer;
897+
acomp_ctx->req = NULL;
898+
acomp_ctx->acomp = NULL;
899+
acomp_ctx->buffer = NULL;
896900
mutex_unlock(&acomp_ctx->mutex);
897901

902+
/*
903+
* Do the actual freeing after releasing the mutex to avoid subtle
904+
* locking dependencies causing deadlocks.
905+
*/
906+
if (!IS_ERR_OR_NULL(req))
907+
acomp_request_free(req);
908+
if (!IS_ERR_OR_NULL(acomp))
909+
crypto_free_acomp(acomp);
910+
kfree(buffer);
911+
898912
return 0;
899913
}
900914

0 commit comments

Comments
 (0)