Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp287170pxf; Tue, 6 Apr 2021 22:35:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzINOKgW+G8gIk8yt0lLJTseFyAfMmKAqL2HHd09j6EVDvLHfMSP+ga0i689qL6Q3qPSRJY X-Received: by 2002:a92:d02:: with SMTP id 2mr1430681iln.159.1617773744902; Tue, 06 Apr 2021 22:35:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617773744; cv=none; d=google.com; s=arc-20160816; b=sNNgcVczv+UuEoeadejeLH0lo9jNAEKxH4wBlxsxjJZD0X38S6zARiYEmdwFFmwhdC cETKQ3UrEvBmIv59gOTU5whFdHCEnR1jVFOJOLkck36cmZ8CuHhaWxrWs4Ggo19cZMt6 L7rOUbwgXTSvr99/wNgP2hD/V+tqSsP5mPl8yx/QaeOt3xkcKBcfIcIYrjHi3J8MKBzJ gC2Yr9mvp3+8yw0CwnOYWvGnIzjfmvTI0C7ExKzZCDklCeNKqllMuot9B7FoRLwWZ4UG Jbm2NbsCX62Y1FMRvi7SSDkfjZ1vE6gLSz0KuhOqm14swuql8JVok3e/eSPt7cdt+89+ nl5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=IvEB7Hw3Md8E6pOogZJOqFR+HElyAsEjGIpxbEc8I9Y=; b=xNif7ZFvOLxHpXxMbImvwKirUS2B4f8xzNdfq0tlxz2C+4GC4LLeFPPiwXhkd3ufbG GLwN8fcOZIi2ebNYFc912b+oj494jQmjQ1m1by4PRZRRGfWlZBvhxfD/cMJ9xU08XYW1 XsK/Fv9/grbFa2sP3HtYo/Mv/wWAibHHKtw92K0BCrtmvVkmbA/AZMYoae4T85W4Zaxd qQJgfjQ+zzspDiAPj2WbZ46XgHVkKLOw96It2z6MOanXfSmnTmRgZZgMk6GIOHNdPtLl 6OIklCraSMIKDsIJTxAhFUjPOSLKVmj+QIvVaVp7TWZ5Ckvw8AVLRjoojQ/74s/Ii8Y+ SKWg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v12si21082169jas.56.2021.04.06.22.35.32; Tue, 06 Apr 2021 22:35:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345287AbhDFOnr (ORCPT + 99 others); Tue, 6 Apr 2021 10:43:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:47620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345263AbhDFOnp (ORCPT ); Tue, 6 Apr 2021 10:43:45 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3D38761158; Tue, 6 Apr 2021 14:43:27 +0000 (UTC) Date: Tue, 6 Apr 2021 16:43:24 +0200 From: Christian Brauner To: Andy Shevchenko Cc: Michael Ellerman , Joerg Roedel , Wei Liu , Michael Kelley , Mike Rapoport , Corey Minyard , Bjorn Andersson , Mathieu Poirier , Andrew Morton , Tetsuo Handa , Vlastimil Babka , "Paul E. McKenney" , "Steven Rostedt (VMware)" , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org, openipmi-developer@lists.sourceforge.net, linux-remoteproc@vger.kernel.org, linux-arch@vger.kernel.org, kexec@lists.infradead.org, rcu@vger.kernel.org, linux-fsdevel@vger.kernel.org, Benjamin Herrenschmidt , Paul Mackerras , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , "K. Y. Srinivasan" , Haiyang Zhang , Stephen Hemminger , Corey Minyard , Ohad Ben-Cohen , Arnd Bergmann , Eric Biederman , Josh Triplett , Mathieu Desnoyers , Lai Jiangshan , Joel Fernandes , Luis Chamberlain , Kees Cook , Iurii Zaikin Subject: Re: [PATCH v1 1/1] kernel.h: Split out panic and oops helpers Message-ID: <20210406144324.bmc22gborwj3zjvv@wittgenstein> References: <20210406133158.73700-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20210406133158.73700-1-andriy.shevchenko@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: > kernel.h is being used as a dump for all kinds of stuff for a long time. > Here is the attempt to start cleaning it up by splitting out panic and > oops helpers. > > At the same time convert users in header and lib folder to use new header. > Though for time being include new header back to kernel.h to avoid twisted > indirected includes for existing users. > > Signed-off-by: Andy Shevchenko > --- (I think David has tried something like this a few years ago too?) Good idea in any case. (Be good to see kbuild do an allmodconfig build of this though.) Acked-by: Christian Brauner > arch/powerpc/kernel/setup-common.c | 1 + > arch/x86/include/asm/desc.h | 1 + > arch/x86/kernel/cpu/mshyperv.c | 1 + > arch/x86/kernel/setup.c | 1 + > drivers/char/ipmi/ipmi_msghandler.c | 1 + > drivers/remoteproc/remoteproc_core.c | 1 + > include/asm-generic/bug.h | 3 +- > include/linux/kernel.h | 84 +----------------------- > include/linux/panic.h | 98 ++++++++++++++++++++++++++++ > include/linux/panic_notifier.h | 12 ++++ > kernel/hung_task.c | 1 + > kernel/kexec_core.c | 1 + > kernel/panic.c | 1 + > kernel/rcu/tree.c | 2 + > kernel/sysctl.c | 1 + > kernel/trace/trace.c | 1 + > 16 files changed, 126 insertions(+), 84 deletions(-) > create mode 100644 include/linux/panic.h > create mode 100644 include/linux/panic_notifier.h > > diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c > index 74a98fff2c2f..046fe21b5c3b 100644 > --- a/arch/powerpc/kernel/setup-common.c > +++ b/arch/powerpc/kernel/setup-common.c > @@ -9,6 +9,7 @@ > #undef DEBUG > > #include > +#include > #include > #include > #include > diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h > index 476082a83d1c..ceb12683b6d1 100644 > --- a/arch/x86/include/asm/desc.h > +++ b/arch/x86/include/asm/desc.h > @@ -9,6 +9,7 @@ > #include > #include > > +#include > #include > #include > > diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c > index 22f13343b5da..9e5c6f2b044d 100644 > --- a/arch/x86/kernel/cpu/mshyperv.c > +++ b/arch/x86/kernel/cpu/mshyperv.c > @@ -17,6 +17,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c > index 59e5e0903b0c..570699eecf90 100644 > --- a/arch/x86/kernel/setup.c > +++ b/arch/x86/kernel/setup.c > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c > index 8a0e97b33cae..e96cb5c4f97a 100644 > --- a/drivers/char/ipmi/ipmi_msghandler.c > +++ b/drivers/char/ipmi/ipmi_msghandler.c > @@ -16,6 +16,7 @@ > > #include > #include > +#include > #include > #include > #include > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 626a6b90fba2..76dd8e2b1e7e 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -20,6 +20,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h > index 76a10e0dca9f..719410b93f99 100644 > --- a/include/asm-generic/bug.h > +++ b/include/asm-generic/bug.h > @@ -17,7 +17,8 @@ > #endif > > #ifndef __ASSEMBLY__ > -#include > +#include > +#include > > #ifdef CONFIG_BUG > > diff --git a/include/linux/kernel.h b/include/linux/kernel.h > index 09035ac67d4b..6c5a05ac1ecb 100644 > --- a/include/linux/kernel.h > +++ b/include/linux/kernel.h > @@ -14,6 +14,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -70,7 +71,6 @@ > #define lower_32_bits(n) ((u32)((n) & 0xffffffff)) > > struct completion; > -struct pt_regs; > struct user; > > #ifdef CONFIG_PREEMPT_VOLUNTARY > @@ -175,14 +175,6 @@ void __might_fault(const char *file, int line); > static inline void might_fault(void) { } > #endif > > -extern struct atomic_notifier_head panic_notifier_list; > -extern long (*panic_blink)(int state); > -__printf(1, 2) > -void panic(const char *fmt, ...) __noreturn __cold; > -void nmi_panic(struct pt_regs *regs, const char *msg); > -extern void oops_enter(void); > -extern void oops_exit(void); > -extern bool oops_may_print(void); > void do_exit(long error_code) __noreturn; > void complete_and_exit(struct completion *, long) __noreturn; > > @@ -368,52 +360,8 @@ extern int __kernel_text_address(unsigned long addr); > extern int kernel_text_address(unsigned long addr); > extern int func_ptr_is_kernel_text(void *ptr); > > -#ifdef CONFIG_SMP > -extern unsigned int sysctl_oops_all_cpu_backtrace; > -#else > -#define sysctl_oops_all_cpu_backtrace 0 > -#endif /* CONFIG_SMP */ > - > extern void bust_spinlocks(int yes); > -extern int panic_timeout; > -extern unsigned long panic_print; > -extern int panic_on_oops; > -extern int panic_on_unrecovered_nmi; > -extern int panic_on_io_nmi; > -extern int panic_on_warn; > -extern unsigned long panic_on_taint; > -extern bool panic_on_taint_nousertaint; > -extern int sysctl_panic_on_rcu_stall; > -extern int sysctl_max_rcu_stall_to_panic; > -extern int sysctl_panic_on_stackoverflow; > - > -extern bool crash_kexec_post_notifiers; > > -/* > - * panic_cpu is used for synchronizing panic() and crash_kexec() execution. It > - * holds a CPU number which is executing panic() currently. A value of > - * PANIC_CPU_INVALID means no CPU has entered panic() or crash_kexec(). > - */ > -extern atomic_t panic_cpu; > -#define PANIC_CPU_INVALID -1 > - > -/* > - * Only to be used by arch init code. If the user over-wrote the default > - * CONFIG_PANIC_TIMEOUT, honor it. > - */ > -static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) > -{ > - if (panic_timeout == arch_default_timeout) > - panic_timeout = timeout; > -} > -extern const char *print_tainted(void); > -enum lockdep_ok { > - LOCKDEP_STILL_OK, > - LOCKDEP_NOW_UNRELIABLE > -}; > -extern void add_taint(unsigned flag, enum lockdep_ok); > -extern int test_taint(unsigned flag); > -extern unsigned long get_taint(void); > extern int root_mountflags; > > extern bool early_boot_irqs_disabled; > @@ -432,36 +380,6 @@ extern enum system_states { > SYSTEM_SUSPEND, > } system_state; > > -/* This cannot be an enum because some may be used in assembly source. */ > -#define TAINT_PROPRIETARY_MODULE 0 > -#define TAINT_FORCED_MODULE 1 > -#define TAINT_CPU_OUT_OF_SPEC 2 > -#define TAINT_FORCED_RMMOD 3 > -#define TAINT_MACHINE_CHECK 4 > -#define TAINT_BAD_PAGE 5 > -#define TAINT_USER 6 > -#define TAINT_DIE 7 > -#define TAINT_OVERRIDDEN_ACPI_TABLE 8 > -#define TAINT_WARN 9 > -#define TAINT_CRAP 10 > -#define TAINT_FIRMWARE_WORKAROUND 11 > -#define TAINT_OOT_MODULE 12 > -#define TAINT_UNSIGNED_MODULE 13 > -#define TAINT_SOFTLOCKUP 14 > -#define TAINT_LIVEPATCH 15 > -#define TAINT_AUX 16 > -#define TAINT_RANDSTRUCT 17 > -#define TAINT_FLAGS_COUNT 18 > -#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) > - > -struct taint_flag { > - char c_true; /* character printed when tainted */ > - char c_false; /* character printed when not tainted */ > - bool module; /* also show as a per-module taint flag */ > -}; > - > -extern const struct taint_flag taint_flags[TAINT_FLAGS_COUNT]; > - > extern const char hex_asc[]; > #define hex_asc_lo(x) hex_asc[((x) & 0x0f)] > #define hex_asc_hi(x) hex_asc[((x) & 0xf0) >> 4] > diff --git a/include/linux/panic.h b/include/linux/panic.h > new file mode 100644 > index 000000000000..f5844908a089 > --- /dev/null > +++ b/include/linux/panic.h > @@ -0,0 +1,98 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _LINUX_PANIC_H > +#define _LINUX_PANIC_H > + > +#include > +#include > + > +struct pt_regs; > + > +extern long (*panic_blink)(int state); > +__printf(1, 2) > +void panic(const char *fmt, ...) __noreturn __cold; > +void nmi_panic(struct pt_regs *regs, const char *msg); > +extern void oops_enter(void); > +extern void oops_exit(void); > +extern bool oops_may_print(void); > + > +#ifdef CONFIG_SMP > +extern unsigned int sysctl_oops_all_cpu_backtrace; > +#else > +#define sysctl_oops_all_cpu_backtrace 0 > +#endif /* CONFIG_SMP */ > + > +extern int panic_timeout; > +extern unsigned long panic_print; > +extern int panic_on_oops; > +extern int panic_on_unrecovered_nmi; > +extern int panic_on_io_nmi; > +extern int panic_on_warn; > + > +extern unsigned long panic_on_taint; > +extern bool panic_on_taint_nousertaint; > + > +extern int sysctl_panic_on_rcu_stall; > +extern int sysctl_max_rcu_stall_to_panic; > +extern int sysctl_panic_on_stackoverflow; > + > +extern bool crash_kexec_post_notifiers; > + > +/* > + * panic_cpu is used for synchronizing panic() and crash_kexec() execution. It > + * holds a CPU number which is executing panic() currently. A value of > + * PANIC_CPU_INVALID means no CPU has entered panic() or crash_kexec(). > + */ > +extern atomic_t panic_cpu; > +#define PANIC_CPU_INVALID -1 > + > +/* > + * Only to be used by arch init code. If the user over-wrote the default > + * CONFIG_PANIC_TIMEOUT, honor it. > + */ > +static inline void set_arch_panic_timeout(int timeout, int arch_default_timeout) > +{ > + if (panic_timeout == arch_default_timeout) > + panic_timeout = timeout; > +} > + > +/* This cannot be an enum because some may be used in assembly source. */ > +#define TAINT_PROPRIETARY_MODULE 0 > +#define TAINT_FORCED_MODULE 1 > +#define TAINT_CPU_OUT_OF_SPEC 2 > +#define TAINT_FORCED_RMMOD 3 > +#define TAINT_MACHINE_CHECK 4 > +#define TAINT_BAD_PAGE 5 > +#define TAINT_USER 6 > +#define TAINT_DIE 7 > +#define TAINT_OVERRIDDEN_ACPI_TABLE 8 > +#define TAINT_WARN 9 > +#define TAINT_CRAP 10 > +#define TAINT_FIRMWARE_WORKAROUND 11 > +#define TAINT_OOT_MODULE 12 > +#define TAINT_UNSIGNED_MODULE 13 > +#define TAINT_SOFTLOCKUP 14 > +#define TAINT_LIVEPATCH 15 > +#define TAINT_AUX 16 > +#define TAINT_RANDSTRUCT 17 > +#define TAINT_FLAGS_COUNT 18 > +#define TAINT_FLAGS_MAX ((1UL << TAINT_FLAGS_COUNT) - 1) > + > +struct taint_flag { > + char c_true; /* character printed when tainted */ > + char c_false; /* character printed when not tainted */ > + bool module; /* also show as a per-module taint flag */ > +}; > + > +extern const struct taint_flag taint_flags[TAINT_FLAGS_COUNT]; > + > +enum lockdep_ok { > + LOCKDEP_STILL_OK, > + LOCKDEP_NOW_UNRELIABLE, > +}; > + > +extern const char *print_tainted(void); > +extern void add_taint(unsigned flag, enum lockdep_ok); > +extern int test_taint(unsigned flag); > +extern unsigned long get_taint(void); > + > +#endif /* _LINUX_PANIC_H */ > diff --git a/include/linux/panic_notifier.h b/include/linux/panic_notifier.h > new file mode 100644 > index 000000000000..41e32483d7a7 > --- /dev/null > +++ b/include/linux/panic_notifier.h > @@ -0,0 +1,12 @@ > +/* SPDX-License-Identifier: GPL-2.0 */ > +#ifndef _LINUX_PANIC_NOTIFIERS_H > +#define _LINUX_PANIC_NOTIFIERS_H > + > +#include > +#include > + > +extern struct atomic_notifier_head panic_notifier_list; > + > +extern bool crash_kexec_post_notifiers; > + > +#endif /* _LINUX_PANIC_NOTIFIERS_H */ > diff --git a/kernel/hung_task.c b/kernel/hung_task.c > index bb2e3e15c84c..2871076e4d29 100644 > --- a/kernel/hung_task.c > +++ b/kernel/hung_task.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/kernel/kexec_core.c b/kernel/kexec_core.c > index f099baee3578..4b34a9aa32bc 100644 > --- a/kernel/kexec_core.c > +++ b/kernel/kexec_core.c > @@ -26,6 +26,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/kernel/panic.c b/kernel/panic.c > index 332736a72a58..edad89660a2b 100644 > --- a/kernel/panic.c > +++ b/kernel/panic.c > @@ -23,6 +23,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c > index ce5b4cd6bd18..a58c9c86fa13 100644 > --- a/kernel/rcu/tree.c > +++ b/kernel/rcu/tree.c > @@ -32,6 +32,8 @@ > #include > #include > #include > +#include > +#include > #include > #include > #include > diff --git a/kernel/sysctl.c b/kernel/sysctl.c > index 3601786ddaeb..e5cf9c4ef5e1 100644 > --- a/kernel/sysctl.c > +++ b/kernel/sysctl.c > @@ -27,6 +27,7 @@ > #include > #include > #include > +#include > #include > #include > #include > diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c > index 507a30bf26e4..9612a1d8fa13 100644 > --- a/kernel/trace/trace.c > +++ b/kernel/trace/trace.c > @@ -39,6 +39,7 @@ > #include > #include > #include > +#include > #include > #include > #include > -- > 2.30.2 >