Commit 97aa6139 authored by Mark Rutland's avatar Mark Rutland Committed by Paul E. McKenney
Browse files

kcsan: Fold panic() call into print_report() 



So that we can add more callers of print_report(), lets fold the panic()
call into print_report() so the caller doesn't have to handle this
explicitly.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarMarco Elver <elver@google.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 95f7524d

kernel/kcsan/report.c

+8 −13
Original line number Diff line number Diff line
@@ -325,10 +325,7 @@ static void print_verbose_info(struct task_struct *task) 
	print_irqtrace_events(task);

}



/*

 * Returns true if a report was generated, false otherwise.

 */

static bool print_report(enum kcsan_value_change value_change,

static void print_report(enum kcsan_value_change value_change,

			 enum kcsan_report_type type,

			 const struct access_info *ai,

			 const struct other_info *other_info)
@@ -344,7 +341,7 @@ static bool print_report(enum kcsan_value_change value_change, 
	 * Must check report filter rules before starting to print.

	 */

	if (skip_report(KCSAN_VALUE_CHANGE_TRUE, stack_entries[skipnr]))

		return false;

		return;



	if (type == KCSAN_REPORT_RACE_SIGNAL) {

		other_skipnr = get_stack_skipnr(other_info->stack_entries,
@@ -353,11 +350,11 @@ static bool print_report(enum kcsan_value_change value_change, 


		/* @value_change is only known for the other thread */

		if (skip_report(value_change, other_frame))

			return false;

			return;

	}



	if (rate_limit_report(this_frame, other_frame))

		return false;

		return;



	/* Print report header. */

	pr_err("==================================================================\n");
@@ -431,7 +428,8 @@ static bool print_report(enum kcsan_value_change value_change, 
	dump_stack_print_info(KERN_DEFAULT);

	pr_err("==================================================================\n");



	return true;

	if (panic_on_warn)

		panic("panic_on_warn set ...\n");

}



static void release_report(unsigned long *flags, struct other_info *other_info)
@@ -628,12 +626,9 @@ static void kcsan_report(const volatile void *ptr, size_t size, int access_type, 
		 * either TRUE or MAYBE. In case of MAYBE, further filtering may

		 * be done once we know the full stack trace in print_report().

		 */

		bool reported = value_change != KCSAN_VALUE_CHANGE_FALSE &&

		if (value_change != KCSAN_VALUE_CHANGE_FALSE)

			print_report(value_change, type, &ai, other_info);



		if (reported && panic_on_warn)

			panic("panic_on_warn set ...\n");



		release_report(&flags, other_info);

	}