crypto: algapi - Move larval completion into algboss

It has been observed that sometimes the crypto allocation code
will get stuck for 60 seconds or multiples thereof.  This is
usually caused by an algorithm failing to pass the self-test.

If an algorithm fails to be constructed, we will immediately notify
all larval waiters.  However, if it succeeds in construction, but
then fails the self-test, we won't notify anyone at all.

This patch fixes this by merging the notification in the case
where the algorithm fails to be constructed with that of the
the case where it pases the self-test.  This way regardless of
what happens, we'll give the larval waiters an answer.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 9 insertions, 8 deletions

diff --git a/crypto/algboss.c b/crypto/algboss.c
index 791d194958fa..f97027e7d996 100644
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -11,6 +11,7 @@
  */
 
 #include <crypto/internal/aead.h>
+#include <linux/completion.h>
 #include <linux/ctype.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -47,6 +48,8 @@ struct cryptomgr_param {
         char larval[CRYPTO_MAX_ALG_NAME];
         char template[CRYPTO_MAX_ALG_NAME];
 
+        struct completion *completion;
+
         u32 otype;
         u32 omask;
 };
@@ -66,7 +69,7 @@ static int cryptomgr_probe(void *data)
 
         tmpl = crypto_lookup_template(param->template);
         if (!tmpl)
-                goto err;
+                goto out;
 
         do {
                 if (tmpl->create) {
@@ -83,16 +86,10 @@ static int cryptomgr_probe(void *data)
 
         crypto_tmpl_put(tmpl);
 
-        if (err)
-                goto err;
-
 out:
+        complete(param->completion);
         kfree(param);
         module_put_and_exit(0);
-
-err:
-        crypto_larval_error(param->larval, param->otype, param->omask);
-        goto out;
 }
 
 static int cryptomgr_schedule_probe(struct crypto_larval *larval)
@@ -192,10 +189,14 @@ static int cryptomgr_schedule_probe(struct crypto_larval *larval)
 
         memcpy(param->larval, larval->alg.cra_name, CRYPTO_MAX_ALG_NAME);
 
+        param->completion = &larval->completion;
+
         thread = kthread_run(cryptomgr_probe, param, "cryptomgr_probe");
         if (IS_ERR(thread))
                 goto err_free_param;
 
+        wait_for_completion_interruptible(&larval->completion);
+
         return NOTIFY_STOP;
 
 err_free_param: