[PATCH i-g-t v3 3/6] lib/kunit: Unload base KUnit module only before reloading it

[Kamil Konieczny]

Hi Janusz,
On 2024-02-01 at 19:59:19 +0100, Janusz Krzysztofik wrote:
> In preparation for replacement of the current method of reloading base
> KUnit module with updating the module parameters via sysfs when a new set
> of those parameters is needed, unload the module right before it is now
> reloaded with new parameters, and stop unloading it in other places.
> A follow-up patch will remove all those unloads still left, but even then
> it will be shorter and more clean when based on top of this one.
> 
> Signed-off-by: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>

Reviewed-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>

> ---
>  lib/igt_kmod.c | 23 ++++++++++++-----------
>  1 file changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
> index d1091bdc79..d2c28d0a64 100644
> --- a/lib/igt_kmod.c
> +++ b/lib/igt_kmod.c
> @@ -1130,6 +1130,7 @@ static void kunit_get_tests(struct igt_list_head *tests,
>  	 * iterating over KTAP results collected from blind execution of all
>  	 * Kunit test cases provided by a Kunit test module.
>  	 */
> +	igt_ignore_warn(igt_kmod_unload("kunit", KMOD_REMOVE_FORCE));
>  	if (igt_debug_on(igt_kmod_load("kunit",
>  				       "filter=module=none filter_action=skip")))
>  		return;
> @@ -1167,7 +1168,6 @@ static void kunit_get_tests(struct igt_list_head *tests,
>  	}
>  
>  	igt_skip_on(kmod_module_remove_module(tst->kmod, KMOD_REMOVE_FORCE));
> -	igt_skip_on(igt_kmod_unload("kunit", KMOD_REMOVE_FORCE));
>  
>  	igt_skip_on_f(err,
>  		      "KTAP parser failed while getting a list of test cases\n");
> @@ -1200,6 +1200,17 @@ static void __igt_kunit(struct igt_ktest *tst,
>  			      t->case_name) {
>  
>  			if (!modprobe.thread) {
> +				/*
> +				 * Since we have successfully loaded the kunit
> +				 * base module with non-default parameters in
> +				 * order to get a list of test cases, now we
> +				 * have to unload it so it is then automatically
> +				 * reloaded with default parameter values when
> +				 * we load the test module again for execution.
> +				 */
> +				igt_skip_on(igt_kmod_unload("kunit",
> +							    KMOD_REMOVE_FORCE));
> +
>  				igt_assert_eq(pthread_mutexattr_init(&attr), 0);
>  				igt_assert_eq(pthread_mutexattr_setrobust(&attr,
>  							  PTHREAD_MUTEX_ROBUST),
> @@ -1364,15 +1375,6 @@ void igt_kunit(const char *module_name, const char *name, const char *opts)
>  		igt_skip_on(igt_ktest_init(&tst, module_name));
>  		igt_skip_on(igt_ktest_begin(&tst));
>  
> -		/*
> -		 * Since we need to load kunit base module with specific
> -		 * options in order to get a list of test cases, make
> -		 * sure that the module is not loaded.  However, since
> -		 * unload may fail if kunit base module is not loaded,
> -		 * ignore any failures, we'll fail later if still loaded.
> -		 */
> -		igt_ignore_warn(igt_kmod_unload("kunit", KMOD_REMOVE_FORCE));
> -
>  		igt_assert(igt_list_empty(&tests));
>  	}
>  
> @@ -1404,7 +1406,6 @@ void igt_kunit(const char *module_name, const char *name, const char *opts)
>  		kunit_results_free(&tests, &suite_name, &case_name);
>  
>  		igt_ktest_end(&tst);
> -		igt_debug_on(igt_kmod_unload("kunit", KMOD_REMOVE_FORCE));
>  	}
>  
>  	igt_ktest_fini(&tst);
> -- 
> 2.43.0
>