kunit: bail out early in __kunit_test_suites_init() if there are no suites to test
authorScott Mayhew <smayhew@redhat.com>
Thu, 21 Mar 2024 14:32:00 +0000 (10:32 -0400)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 6 May 2024 20:22:02 +0000 (14:22 -0600)
Commit c72a870926c2 added a mutex to prevent kunit tests from running
concurrently.  Unfortunately that mutex gets locked during module load
regardless of whether the module actually has any kunit tests.  This
causes a problem for kunit tests that might need to load other kernel
modules (e.g. gss_krb5_test loading the camellia module).

So check to see if there are actually any tests to run before locking
the kunit_run_lock mutex.

Fixes: c72a870926c2 ("kunit: add ability to run tests after boot using debugfs")
Reported-by: Nico Pache <npache@redhat.com>
Signed-off-by: Scott Mayhew <smayhew@redhat.com>
Reviewed-by: Rae Moar <rmoar@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
lib/kunit/test.c

index 1d1475578515c261fe74b454502f1a2a5ac3bb81..b8514dbb337c098977ef33dc49a1b9c799785d31 100644 (file)
@@ -712,6 +712,9 @@ int __kunit_test_suites_init(struct kunit_suite * const * const suites, int num_
 {
        unsigned int i;
 
+       if (num_suites == 0)
+               return 0;
+
        if (!kunit_enabled() && num_suites > 0) {
                pr_info("kunit: disabled\n");
                return 0;