stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
	Ingo Molnar <mingo@kernel.org>, Sasha Levin <sashal@kernel.org>,
	frederic@kernel.org, paulmck@kernel.org, mingo@redhat.com,
	will@kernel.org, pmladek@suse.com, keescook@chromium.org,
	mcgrof@kernel.org, akpm@linux-foundation.org,
	gpiccoli@igalia.com, daniel.vetter@ffwll.ch, davidgow@google.com,
	tangmeng@uniontech.com, yangtiezhu@loongson.cn,
	mark.rutland@arm.com, jpoimboe@kernel.org, mpe@ellerman.id.au,
	svens@linux.ibm.com
Subject: [PATCH AUTOSEL 6.1 20/21] cpuidle: lib/bug: Disable rcu_is_watching() during WARN/BUG
Date: Sat, 25 Feb 2023 22:42:55 -0500	[thread overview]
Message-ID: <20230226034256.771769-20-sashal@kernel.org> (raw)
In-Reply-To: <20230226034256.771769-1-sashal@kernel.org>

From: Peter Zijlstra <peterz@infradead.org>

[ Upstream commit 5a5d7e9badd2cb8065db171961bd30bd3595e4b6 ]

In order to avoid WARN/BUG from generating nested or even recursive
warnings, force rcu_is_watching() true during
WARN/lockdep_rcu_suspicious().

Notably things like unwinding the stack can trigger rcu_dereference()
warnings, which then triggers more unwinding which then triggers more
warnings etc..

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230126151323.408156109@infradead.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 include/linux/context_tracking.h | 27 +++++++++++++++++++++++++++
 kernel/locking/lockdep.c         |  3 +++
 kernel/panic.c                   |  5 +++++
 lib/bug.c                        | 15 ++++++++++++++-
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/include/linux/context_tracking.h b/include/linux/context_tracking.h
index dcef4a9e4d63e..d4afa8508a806 100644
--- a/include/linux/context_tracking.h
+++ b/include/linux/context_tracking.h
@@ -130,9 +130,36 @@ static __always_inline unsigned long ct_state_inc(int incby)
 	return arch_atomic_add_return(incby, this_cpu_ptr(&context_tracking.state));
 }
 
+static __always_inline bool warn_rcu_enter(void)
+{
+	bool ret = false;
+
+	/*
+	 * Horrible hack to shut up recursive RCU isn't watching fail since
+	 * lots of the actual reporting also relies on RCU.
+	 */
+	preempt_disable_notrace();
+	if (rcu_dynticks_curr_cpu_in_eqs()) {
+		ret = true;
+		ct_state_inc(RCU_DYNTICKS_IDX);
+	}
+
+	return ret;
+}
+
+static __always_inline void warn_rcu_exit(bool rcu)
+{
+	if (rcu)
+		ct_state_inc(RCU_DYNTICKS_IDX);
+	preempt_enable_notrace();
+}
+
 #else
 static inline void ct_idle_enter(void) { }
 static inline void ct_idle_exit(void) { }
+
+static __always_inline bool warn_rcu_enter(void) { return false; }
+static __always_inline void warn_rcu_exit(bool rcu) { }
 #endif /* !CONFIG_CONTEXT_TRACKING_IDLE */
 
 #endif
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index e3375bc40dadc..50d4863974e7a 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -55,6 +55,7 @@
 #include <linux/rcupdate.h>
 #include <linux/kprobes.h>
 #include <linux/lockdep.h>
+#include <linux/context_tracking.h>
 
 #include <asm/sections.h>
 
@@ -6555,6 +6556,7 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
 {
 	struct task_struct *curr = current;
 	int dl = READ_ONCE(debug_locks);
+	bool rcu = warn_rcu_enter();
 
 	/* Note: the following can be executed concurrently, so be careful. */
 	pr_warn("\n");
@@ -6595,5 +6597,6 @@ void lockdep_rcu_suspicious(const char *file, const int line, const char *s)
 	lockdep_print_held_locks(curr);
 	pr_warn("\nstack backtrace:\n");
 	dump_stack();
+	warn_rcu_exit(rcu);
 }
 EXPORT_SYMBOL_GPL(lockdep_rcu_suspicious);
diff --git a/kernel/panic.c b/kernel/panic.c
index 7834c9854e026..5864f356ee576 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -33,6 +33,7 @@
 #include <linux/ratelimit.h>
 #include <linux/debugfs.h>
 #include <linux/sysfs.h>
+#include <linux/context_tracking.h>
 #include <trace/events/error_report.h>
 #include <asm/sections.h>
 
@@ -678,6 +679,7 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
 void warn_slowpath_fmt(const char *file, int line, unsigned taint,
 		       const char *fmt, ...)
 {
+	bool rcu = warn_rcu_enter();
 	struct warn_args args;
 
 	pr_warn(CUT_HERE);
@@ -692,11 +694,13 @@ void warn_slowpath_fmt(const char *file, int line, unsigned taint,
 	va_start(args.args, fmt);
 	__warn(file, line, __builtin_return_address(0), taint, NULL, &args);
 	va_end(args.args);
+	warn_rcu_exit(rcu);
 }
 EXPORT_SYMBOL(warn_slowpath_fmt);
 #else
 void __warn_printk(const char *fmt, ...)
 {
+	bool rcu = warn_rcu_enter();
 	va_list args;
 
 	pr_warn(CUT_HERE);
@@ -704,6 +708,7 @@ void __warn_printk(const char *fmt, ...)
 	va_start(args, fmt);
 	vprintk(fmt, args);
 	va_end(args);
+	warn_rcu_exit(rcu);
 }
 EXPORT_SYMBOL(__warn_printk);
 #endif
diff --git a/lib/bug.c b/lib/bug.c
index c223a2575b721..e0ff219899902 100644
--- a/lib/bug.c
+++ b/lib/bug.c
@@ -47,6 +47,7 @@
 #include <linux/sched.h>
 #include <linux/rculist.h>
 #include <linux/ftrace.h>
+#include <linux/context_tracking.h>
 
 extern struct bug_entry __start___bug_table[], __stop___bug_table[];
 
@@ -153,7 +154,7 @@ struct bug_entry *find_bug(unsigned long bugaddr)
 	return module_find_bug(bugaddr);
 }
 
-enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+static enum bug_trap_type __report_bug(unsigned long bugaddr, struct pt_regs *regs)
 {
 	struct bug_entry *bug;
 	const char *file;
@@ -209,6 +210,18 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
 	return BUG_TRAP_TYPE_BUG;
 }
 
+enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
+{
+	enum bug_trap_type ret;
+	bool rcu = false;
+
+	rcu = warn_rcu_enter();
+	ret = __report_bug(bugaddr, regs);
+	warn_rcu_exit(rcu);
+
+	return ret;
+}
+
 static void clear_once_table(struct bug_entry *start, struct bug_entry *end)
 {
 	struct bug_entry *bug;
-- 
2.39.0


  parent reply	other threads:[~2023-02-26  3:45 UTC|newest]

Thread overview: 102+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-26  3:42 [PATCH AUTOSEL 6.1 01/21] ARM: OMAP2+: omap4-common: Fix refcount leak bug Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 02/21] arm64: dts: qcom: msm8996: Add additional A2NoC clocks Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 03/21] udf: Define EFSCORRUPTED error code Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 04/21] context_tracking: Fix noinstr vs KASAN Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 05/21] exit: Detect and fix irq disabled state in oops Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 06/21] ARM: dts: exynos: Use Exynos5420 compatible for the MIPI video phy Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 07/21] fs: Use CHECK_DATA_CORRUPTION() when kernel bugs are detected Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 08/21] blk-iocost: fix divide by 0 error in calc_lcoefs() Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 09/21] blk-cgroup: dropping parent refcount after pd_free_fn() is done Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 10/21] blk-cgroup: synchronize pd_free_fn() from blkg_free_workfn() and blkcg_deactivate_policy() Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 11/21] trace/blktrace: fix memory leak with using debugfs_lookup() Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 12/21] fs/super.c: stop calling fscrypt_destroy_keyring() from __put_super() Sasha Levin
2023-02-26  4:07   ` Eric Biggers
2023-02-26  5:30     ` Eric Biggers
2023-02-26 19:24       ` Eric Biggers
2023-02-26 19:33         ` Slade Watkins
2023-02-27 14:18         ` Sasha Levin
2023-02-27 17:47           ` AUTOSEL process Eric Biggers
2023-02-27 18:06             ` Eric Biggers
2023-02-27 20:39               ` Sasha Levin
2023-02-27 21:38                 ` Eric Biggers
2023-02-27 22:35                   ` Sasha Levin
2023-02-27 22:59                     ` Matthew Wilcox
2023-02-28  0:52                       ` Sasha Levin
2023-02-28  1:25                         ` Eric Biggers
2023-02-28  4:25                           ` Willy Tarreau
2023-03-30  0:08                         ` Eric Biggers
2023-03-30 14:05                           ` Sasha Levin
2023-03-30 17:22                             ` Eric Biggers
2023-03-30 17:50                               ` Sasha Levin
2023-02-28  0:32                     ` Eric Biggers
2023-02-28  1:53                       ` Sasha Levin
2023-02-28  3:41                         ` Eric Biggers
2023-02-28 10:41                           ` Amir Goldstein
2023-02-28 11:28                             ` Greg KH
2023-03-01  2:05                               ` Slade Watkins
2023-03-01  5:13                                 ` Eric Biggers
2023-03-01  6:09                                   ` Greg KH
2023-03-01  7:22                                     ` Eric Biggers
2023-03-01  7:40                                       ` Willy Tarreau
2023-03-01  8:31                                         ` Eric Biggers
2023-03-01  8:43                                           ` Greg KH
2023-03-01  6:06                                 ` Greg KH
2023-03-01  7:05                                   ` Eric Biggers
2023-03-01 10:31                               ` Thorsten Leemhuis
2023-03-01 13:26                               ` Mark Brown
2023-02-28 17:03                           ` Sasha Levin
2023-03-10 23:07                           ` Eric Biggers
2023-03-11 13:41                             ` Sasha Levin
2023-03-11 15:54                               ` James Bottomley
2023-03-11 18:07                                 ` Sasha Levin
2023-03-12 19:03                                   ` Theodore Ts'o
2023-03-07 21:18               ` Pavel Machek
2023-03-07 21:45                 ` Eric Biggers
2023-03-11  6:25                   ` Matthew Wilcox
2023-03-11  8:11                     ` Willy Tarreau
2023-03-11 11:45                       ` Pavel Machek
2023-03-11 12:29                         ` Greg KH
2023-03-21 12:41                           ` Maciej W. Rozycki
2023-03-11 14:06                     ` Sasha Levin
2023-03-11 16:16                       ` Theodore Ts'o
2023-03-11 17:48                         ` Eric Biggers
2023-03-11 18:26                           ` Sasha Levin
2023-03-11 18:54                             ` Eric Biggers
2023-03-11 19:01                               ` Eric Biggers
2023-03-11 21:14                               ` Sasha Levin
2023-03-12  8:04                                 ` Amir Goldstein
2023-03-12 16:00                                   ` Sasha Levin
2023-03-13 17:41                               ` Greg KH
2023-03-13 18:54                                 ` Eric Biggers
2023-03-14 18:26                                   ` Greg KH
2023-03-11 20:17                             ` Eric Biggers
2023-03-11 21:02                               ` Sasha Levin
2023-03-12  4:23                                 ` Willy Tarreau
2023-03-11 18:33                           ` Willy Tarreau
2023-03-11 19:24                             ` Eric Biggers
2023-03-11 19:46                               ` Eric Biggers
2023-03-11 20:19                                 ` Willy Tarreau
2023-03-11 20:59                                   ` Sasha Levin
2023-03-11 20:11                               ` Willy Tarreau
2023-03-11 20:53                                 ` Eric Biggers
2023-03-12  4:32                                   ` Willy Tarreau
2023-03-12  5:21                                     ` Eric Biggers
2023-03-12  5:48                                       ` Willy Tarreau
2023-03-12  7:42                                       ` Amir Goldstein
2023-03-12 13:34                                         ` Mark Brown
2023-03-12 15:57                                         ` Sasha Levin
2023-03-12 13:55                                 ` Mark Brown
2023-03-11 22:38                       ` David Laight
2023-03-12  4:41                         ` Willy Tarreau
2023-03-12  5:09                           ` Theodore Ts'o
2023-03-14 14:12                             ` Jan Kara
2023-03-13  3:37             ` Bagas Sanjaya
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 13/21] sched/fair: sanitize vruntime of entity being placed Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 14/21] btrfs: scrub: improve tree block error reporting Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 15/21] arm64: zynqmp: Enable hs termination flag for USB dwc3 controller Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 16/21] cpuidle, intel_idle: Fix CPUIDLE_FLAG_INIT_XSTATE Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 17/21] entry, kasan, x86: Disallow overriding mem*() functions Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 18/21] x86/fpu: Don't set TIF_NEED_FPU_LOAD for PF_IO_WORKER threads Sasha Levin
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 19/21] cpuidle: drivers: firmware: psci: Dont instrument suspend code Sasha Levin
2023-02-26  3:42 ` Sasha Levin [this message]
2023-02-26  3:42 ` [PATCH AUTOSEL 6.1 21/21] perf/x86/intel/uncore: Add Meteor Lake support Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230226034256.771769-20-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=daniel.vetter@ffwll.ch \
    --cc=davidgow@google.com \
    --cc=frederic@kernel.org \
    --cc=gpiccoli@igalia.com \
    --cc=jpoimboe@kernel.org \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mcgrof@kernel.org \
    --cc=mingo@kernel.org \
    --cc=mingo@redhat.com \
    --cc=mpe@ellerman.id.au \
    --cc=paulmck@kernel.org \
    --cc=peterz@infradead.org \
    --cc=pmladek@suse.com \
    --cc=stable@vger.kernel.org \
    --cc=svens@linux.ibm.com \
    --cc=tangmeng@uniontech.com \
    --cc=will@kernel.org \
    --cc=yangtiezhu@loongson.cn \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).