Skip to contentSkip to conversation

crypto: algboss - don't wait during notifier callback

PATCH In review Eric Biggers 2 participants 3 messages Jun 4, 2020 – Jun 12, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 crypto: algboss - don't wait during notifier callback

From: Eric Biggers <[email protected]>

When a crypto template needs to be instantiated, CRYPTO_MSG_ALG_REQUEST is sent to crypto_chain. cryptomgr_schedule_probe() handles this by starting a thread to instantiate the template, then waiting for this thread to complete via crypto_larval::completion.

This can deadlock because instantiating the template may require loading modules, and this (apparently depending on userspace) may need to wait for the crc-t10dif module (lib/crc-t10dif.c) to be loaded. But crc-t10dif's module_init function uses crypto_register_notifier() and therefore takes crypto_chain.rwsem for write. That can't proceed until the notifier callback has finished, as it holds this semaphore for read.

Fix this by removing the wait on crypto_larval::completion from within cryptomgr_schedule_probe(). It's actually unnecessary because crypto_alg_mod_lookup() calls crypto_larval_wait() itself after sending CRYPTO_MSG_ALG_REQUEST.

This only actually became a problem in v4.20 due to commit b76377543b73 ("crc-t10dif: Pick better transform if one becomes available"), but the unnecessary wait was much older.

Fixes 398710379f51 ("crypto: algapi - Move larval completion into algboss")
Cc <[email protected]> # v3.6+
Cc Martin K. Petersen <[email protected]>
---
 crypto/algboss.c | 2 --
 1 file changed, 2 deletions(-)
crypto/algboss.c +0 -2
index 535f1f87e6c1..5ebccbd6b74e 100644
@@ -178,8 +178,6 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 	if (IS_ERR(thread))
 		goto err_put_larval;
 
-	wait_for_completion_interruptible(&larval->completion);
-
 	return NOTIFY_STOP;
 
 err_put_larval:
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
#1 lore raw
Quoted 19 lines · Eric Biggers

From: Eric Biggers <[email protected]>

When a crypto template needs to be instantiated, CRYPTO_MSG_ALG_REQUEST is sent to crypto_chain. cryptomgr_schedule_probe() handles this by starting a thread to instantiate the template, then waiting for this thread to complete via crypto_larval::completion.

This can deadlock because instantiating the template may require loading modules, and this (apparently depending on userspace) may need to wait for the crc-t10dif module (lib/crc-t10dif.c) to be loaded. But crc-t10dif's module_init function uses crypto_register_notifier() and therefore takes crypto_chain.rwsem for write. That can't proceed until the notifier callback has finished, as it holds this semaphore for read.

Fix this by removing the wait on crypto_larval::completion from within cryptomgr_schedule_probe(). It's actually unnecessary because crypto_alg_mod_lookup() calls crypto_larval_wait() itself after sending CRYPTO_MSG_ALG_REQUEST.

Quoted 6 lines

This only actually became a problem in v4.20 due to commit b76377543b73 ("crc-t10dif: Pick better transform if one becomes available"), but the unnecessary wait was much older.

I forgot about the person who originally filed the bugzilla bug. Kai, if you're okay with it, let's also add:

Quoted 24 lines
Fixes 398710379f51 ("crypto: algapi - Move larval completion into algboss")
Cc <[email protected]> # v3.6+
Cc Martin K. Petersen <[email protected]>
---
 crypto/algboss.c | 2 --
 1 file changed, 2 deletions(-)
crypto/algboss.c +0 -2
index 535f1f87e6c1..5ebccbd6b74e 100644
@@ -178,8 +178,6 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 	if (IS_ERR(thread))
 		goto err_put_larval;
 
-	wait_for_completion_interruptible(&larval->completion);
-
 	return NOTIFY_STOP;
 
 err_put_larval:
Signature · 1 line
2.27.0.rc2.251.g90737beb825-goog
maintainer
#2 lore raw
In reply to Eric Biggers
Quoted 29 lines · Eric Biggers

From: Eric Biggers <[email protected]>

When a crypto template needs to be instantiated, CRYPTO_MSG_ALG_REQUEST is sent to crypto_chain. cryptomgr_schedule_probe() handles this by starting a thread to instantiate the template, then waiting for this thread to complete via crypto_larval::completion.

This can deadlock because instantiating the template may require loading modules, and this (apparently depending on userspace) may need to wait for the crc-t10dif module (lib/crc-t10dif.c) to be loaded. But crc-t10dif's module_init function uses crypto_register_notifier() and therefore takes crypto_chain.rwsem for write. That can't proceed until the notifier callback has finished, as it holds this semaphore for read.

Fix this by removing the wait on crypto_larval::completion from within cryptomgr_schedule_probe(). It's actually unnecessary because crypto_alg_mod_lookup() calls crypto_larval_wait() itself after sending CRYPTO_MSG_ALG_REQUEST.

This only actually became a problem in v4.20 due to commit b76377543b73 ("crc-t10dif: Pick better transform if one becomes available"), but the unnecessary wait was much older.

Fixes 398710379f51 ("crypto: algapi - Move larval completion into algboss")
Cc <[email protected]> # v3.6+
Cc Martin K. Petersen <[email protected]>
Quoted 3 lines
---
 crypto/algboss.c | 2 --
 1 file changed, 2 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt