]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
crypto: testmgr - add some more preemption points
authorEric Biggers <ebiggers@google.com>
Mon, 3 Jun 2019 05:42:33 +0000 (22:42 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 26 Jul 2019 07:12:35 +0000 (09:12 +0200)
[ Upstream commit e63e1b0dd0003dc31f73d875907432be3a2abe5d ]

Call cond_resched() after each fuzz test iteration.  This avoids stall
warnings if fuzz_iterations is set very high for testing purposes.

While we're at it, also call cond_resched() after finishing testing each
test vector.

Signed-off-by: Eric Biggers <ebiggers@google.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
crypto/testmgr.c

index 8386038d67c743dfff698390fccaca33cfb7d086..51540dbee23b436398421b957037fe9da9ea90a3 100644 (file)
@@ -1050,6 +1050,7 @@ static int test_hash_vec(const char *driver, const struct hash_testvec *vec,
                                                req, tsgl, hashstate);
                        if (err)
                                return err;
+                       cond_resched();
                }
        }
 #endif
@@ -1105,6 +1106,7 @@ static int __alg_test_hash(const struct hash_testvec *vecs,
                err = test_hash_vec(driver, &vecs[i], i, req, tsgl, hashstate);
                if (err)
                        goto out;
+               cond_resched();
        }
        err = 0;
 out:
@@ -1346,6 +1348,7 @@ static int test_aead_vec(const char *driver, int enc,
                                                &cfg, req, tsgls);
                        if (err)
                                return err;
+                       cond_resched();
                }
        }
 #endif
@@ -1365,6 +1368,7 @@ static int test_aead(const char *driver, int enc,
                                    tsgls);
                if (err)
                        return err;
+               cond_resched();
        }
        return 0;
 }
@@ -1679,6 +1683,7 @@ static int test_skcipher_vec(const char *driver, int enc,
                                                    &cfg, req, tsgls);
                        if (err)
                                return err;
+                       cond_resched();
                }
        }
 #endif
@@ -1698,6 +1703,7 @@ static int test_skcipher(const char *driver, int enc,
                                        tsgls);
                if (err)
                        return err;
+               cond_resched();
        }
        return 0;
 }