Commit 5693fa74 authored by Valentin Schneider's avatar Valentin Schneider Committed by Peter Zijlstra
Browse files

kcsan: Use preemption model accessors 



Per PREEMPT_DYNAMIC, checking CONFIG_PREEMPT doesn't tell you the actual
preemption model of the live kernel. Use the newly-introduced accessors
instead.

Signed-off-by: default avatarValentin Schneider <valentin.schneider@arm.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarMarco Elver <elver@google.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20211112185203.280040-4-valentin.schneider@arm.com
parent cfe43f47

kernel/kcsan/kcsan_test.c

+3 −2
Original line number Diff line number Diff line
@@ -1380,13 +1380,14 @@ static const void *nthreads_gen_params(const void *prev, char *desc) 
	else

		nthreads *= 2;



	if (!IS_ENABLED(CONFIG_PREEMPT) || !IS_ENABLED(CONFIG_KCSAN_INTERRUPT_WATCHER)) {

	if (!preempt_model_preemptible() ||

	    !IS_ENABLED(CONFIG_KCSAN_INTERRUPT_WATCHER)) {

		/*

		 * Without any preemption, keep 2 CPUs free for other tasks, one

		 * of which is the main test case function checking for

		 * completion or failure.

		 */

		const long min_unused_cpus = IS_ENABLED(CONFIG_PREEMPT_NONE) ? 2 : 0;

		const long min_unused_cpus = preempt_model_none() ? 2 : 0;

		const long min_required_cpus = 2 + min_unused_cpus;



		if (num_online_cpus() < min_required_cpus) {