Skip to content

Commit b2d55d7

Browse files
yosrym93smb49
authored andcommitted
mm: zswap: fix crypto_free_acomp() deadlock in zswap_cpu_comp_dead()
BugLink: https://bugs.launchpad.net/bugs/2110173 commit c11bcbc upstream. 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/[email protected] Fixes: 12dcb0e ("mm: zswap: properly synchronize freeing resources during CPU hotunplug") Signed-off-by: Herbert Xu <[email protected]> Co-developed-by: Herbert Xu <[email protected]> Signed-off-by: Yosry Ahmed <[email protected]> Reported-by: [email protected] Closes: https://lore.kernel.org/all/[email protected]/ Acked-by: Herbert Xu <[email protected]> Reviewed-by: Chengming Zhou <[email protected]> Reviewed-by: Nhat Pham <[email protected]> Tested-by: Nhat Pham <[email protected]> Cc: David S. Miller <[email protected]> Cc: Eric Biggers <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Chris Murphy <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Noah Wager <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent b35585c commit b2d55d7

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

mm/zswap.c

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -885,18 +885,32 @@ static int zswap_cpu_comp_dead(unsigned int cpu, struct hlist_node *node)
885885
{
886886
struct zswap_pool *pool = hlist_entry(node, struct zswap_pool, node);
887887
struct crypto_acomp_ctx *acomp_ctx = per_cpu_ptr(pool->acomp_ctx, cpu);
888+
struct acomp_req *req;
889+
struct crypto_acomp *acomp;
890+
u8 *buffer;
891+
892+
if (IS_ERR_OR_NULL(acomp_ctx))
893+
return 0;
888894

889895
mutex_lock(&acomp_ctx->mutex);
890-
if (!IS_ERR_OR_NULL(acomp_ctx)) {
891-
if (!IS_ERR_OR_NULL(acomp_ctx->req))
892-
acomp_request_free(acomp_ctx->req);
893-
acomp_ctx->req = NULL;
894-
if (!IS_ERR_OR_NULL(acomp_ctx->acomp))
895-
crypto_free_acomp(acomp_ctx->acomp);
896-
kfree(acomp_ctx->buffer);
897-
}
896+
req = acomp_ctx->req;
897+
acomp = acomp_ctx->acomp;
898+
buffer = acomp_ctx->buffer;
899+
acomp_ctx->req = NULL;
900+
acomp_ctx->acomp = NULL;
901+
acomp_ctx->buffer = NULL;
898902
mutex_unlock(&acomp_ctx->mutex);
899903

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

0 commit comments

Comments
 (0)