| Message ID | 20210406133158.73700-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v1,1/1] kernel.h: Split out panic and oops helpers | expand |
On Tue 06 Apr 08:31 CDT 2021, 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. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn
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 <andriy.shevchenko@linux.intel.com> Acked-by: Mike Rapoport <rppt@linux.ibm.com> > --- > 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/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 <asm/irq_vectors.h> > #include <asm/cpu_entry_area.h> > > +#include <linux/debug_locks.h> This seems unrelated, but I might be missing something. > #include <linux/smp.h> > #include <linux/percpu.h> >
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. For the IPMI portion: Acked-by: Corey Minyard <cminyard@mvista.com> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > 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 <linux/export.h> > +#include <linux/panic_notifier.h> > #include <linux/string.h> > #include <linux/sched.h> > #include <linux/init.h> > 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 <asm/irq_vectors.h> > #include <asm/cpu_entry_area.h> > > +#include <linux/debug_locks.h> > #include <linux/smp.h> > #include <linux/percpu.h> > > 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 <linux/irq.h> > #include <linux/kexec.h> > #include <linux/i8253.h> > +#include <linux/panic_notifier.h> > #include <linux/random.h> > #include <asm/processor.h> > #include <asm/hypervisor.h> > 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 <linux/initrd.h> > #include <linux/iscsi_ibft.h> > #include <linux/memblock.h> > +#include <linux/panic_notifier.h> > #include <linux/pci.h> > #include <linux/root_dev.h> > #include <linux/hugetlb.h> > 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 <linux/module.h> > #include <linux/errno.h> > +#include <linux/panic_notifier.h> > #include <linux/poll.h> > #include <linux/sched.h> > #include <linux/seq_file.h> > 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 <linux/kernel.h> > #include <linux/module.h> > #include <linux/device.h> > +#include <linux/panic_notifier.h> > #include <linux/slab.h> > #include <linux/mutex.h> > #include <linux/dma-map-ops.h> > 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 <linux/kernel.h> > +#include <linux/panic.h> > +#include <linux/printk.h> > > #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 <linux/math.h> > #include <linux/minmax.h> > #include <linux/typecheck.h> > +#include <linux/panic.h> > #include <linux/printk.h> > #include <linux/build_bug.h> > #include <linux/static_call_types.h> > @@ -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 <linux/compiler_attributes.h> > +#include <linux/types.h> > + > +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 <linux/notifier.h> > +#include <linux/types.h> > + > +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 <linux/kthread.h> > #include <linux/lockdep.h> > #include <linux/export.h> > +#include <linux/panic_notifier.h> > #include <linux/sysctl.h> > #include <linux/suspend.h> > #include <linux/utsname.h> > 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 <linux/suspend.h> > #include <linux/device.h> > #include <linux/freezer.h> > +#include <linux/panic_notifier.h> > #include <linux/pm.h> > #include <linux/cpu.h> > #include <linux/uaccess.h> > 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 <linux/reboot.h> > #include <linux/delay.h> > #include <linux/kexec.h> > +#include <linux/panic_notifier.h> > #include <linux/sched.h> > #include <linux/sysrq.h> > #include <linux/init.h> > 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 <linux/export.h> > #include <linux/completion.h> > #include <linux/moduleparam.h> > +#include <linux/panic.h> > +#include <linux/panic_notifier.h> > #include <linux/percpu.h> > #include <linux/notifier.h> > #include <linux/cpu.h> > 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 <linux/sysctl.h> > #include <linux/bitmap.h> > #include <linux/signal.h> > +#include <linux/panic.h> > #include <linux/printk.h> > #include <linux/proc_fs.h> > #include <linux/security.h> > 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 <linux/slab.h> > #include <linux/ctype.h> > #include <linux/init.h> > +#include <linux/panic_notifier.h> > #include <linux/poll.h> > #include <linux/nmi.h> > #include <linux/fs.h> > -- > 2.30.2 >
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 <andriy.shevchenko@linux.intel.com> > --- (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 <christian.brauner@ubuntu.com> > 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 <linux/export.h> > +#include <linux/panic_notifier.h> > #include <linux/string.h> > #include <linux/sched.h> > #include <linux/init.h> > 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 <asm/irq_vectors.h> > #include <asm/cpu_entry_area.h> > > +#include <linux/debug_locks.h> > #include <linux/smp.h> > #include <linux/percpu.h> > > 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 <linux/irq.h> > #include <linux/kexec.h> > #include <linux/i8253.h> > +#include <linux/panic_notifier.h> > #include <linux/random.h> > #include <asm/processor.h> > #include <asm/hypervisor.h> > 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 <linux/initrd.h> > #include <linux/iscsi_ibft.h> > #include <linux/memblock.h> > +#include <linux/panic_notifier.h> > #include <linux/pci.h> > #include <linux/root_dev.h> > #include <linux/hugetlb.h> > 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 <linux/module.h> > #include <linux/errno.h> > +#include <linux/panic_notifier.h> > #include <linux/poll.h> > #include <linux/sched.h> > #include <linux/seq_file.h> > 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 <linux/kernel.h> > #include <linux/module.h> > #include <linux/device.h> > +#include <linux/panic_notifier.h> > #include <linux/slab.h> > #include <linux/mutex.h> > #include <linux/dma-map-ops.h> > 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 <linux/kernel.h> > +#include <linux/panic.h> > +#include <linux/printk.h> > > #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 <linux/math.h> > #include <linux/minmax.h> > #include <linux/typecheck.h> > +#include <linux/panic.h> > #include <linux/printk.h> > #include <linux/build_bug.h> > #include <linux/static_call_types.h> > @@ -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 <linux/compiler_attributes.h> > +#include <linux/types.h> > + > +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 <linux/notifier.h> > +#include <linux/types.h> > + > +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 <linux/kthread.h> > #include <linux/lockdep.h> > #include <linux/export.h> > +#include <linux/panic_notifier.h> > #include <linux/sysctl.h> > #include <linux/suspend.h> > #include <linux/utsname.h> > 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 <linux/suspend.h> > #include <linux/device.h> > #include <linux/freezer.h> > +#include <linux/panic_notifier.h> > #include <linux/pm.h> > #include <linux/cpu.h> > #include <linux/uaccess.h> > 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 <linux/reboot.h> > #include <linux/delay.h> > #include <linux/kexec.h> > +#include <linux/panic_notifier.h> > #include <linux/sched.h> > #include <linux/sysrq.h> > #include <linux/init.h> > 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 <linux/export.h> > #include <linux/completion.h> > #include <linux/moduleparam.h> > +#include <linux/panic.h> > +#include <linux/panic_notifier.h> > #include <linux/percpu.h> > #include <linux/notifier.h> > #include <linux/cpu.h> > 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 <linux/sysctl.h> > #include <linux/bitmap.h> > #include <linux/signal.h> > +#include <linux/panic.h> > #include <linux/printk.h> > #include <linux/proc_fs.h> > #include <linux/security.h> > 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 <linux/slab.h> > #include <linux/ctype.h> > #include <linux/init.h> > +#include <linux/panic_notifier.h> > #include <linux/poll.h> > #include <linux/nmi.h> > #include <linux/fs.h> > -- > 2.30.2 >
On Tue, Apr 6, 2021 at 3:31 PM Andy Shevchenko <andriy.shevchenko@linux.intel.com> 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 <andriy.shevchenko@linux.intel.com> Nice! Acked-by: Arnd Bergmann <arnd@arndb.de>
On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: > 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 <linux/notifier.h> > +#include <linux/types.h> > + > +extern struct atomic_notifier_head panic_notifier_list; > + > +extern bool crash_kexec_post_notifiers; > + > +#endif /* _LINUX_PANIC_NOTIFIERS_H */ Why is it worth it to add another file just for this? Seems like a very small file. Luis
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 <andriy.shevchenko@linux.intel.com> I like it! Do you have a multi-arch CI to do allmodconfig builds to double-check this? Acked-by: Kees Cook <keescook@chromium.org> -Kees
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 <andriy.shevchenko@linux.intel.com> Acked-by: Wei Liu <wei.liu@kernel.org>
On Wed, Apr 7, 2021 at 10:25 AM Luis Chamberlain <mcgrof@kernel.org> wrote: > > On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: > > 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 <linux/notifier.h> > > +#include <linux/types.h> > > + > > +extern struct atomic_notifier_head panic_notifier_list; > > + > > +extern bool crash_kexec_post_notifiers; > > + > > +#endif /* _LINUX_PANIC_NOTIFIERS_H */ > > Why is it worth it to add another file just for this? The main point is to break tons of loops that prevent having clean headers anymore. In this case, see bug.h, which is very important in this sense. > Seems like a very > small file. If it is an argument, it's kinda strange. We have much smaller headers.
On Wed, Apr 7, 2021 at 11:17 AM Kees Cook <keescook@chromium.org> wrote: > > 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 <andriy.shevchenko@linux.intel.com> > > I like it! Do you have a multi-arch CI to do allmodconfig builds to > double-check this? Unfortunately no, I rely on plenty of bots that are harvesting mailing lists. But I will appreciate it if somebody can run this through various build tests. > Acked-by: Kees Cook <keescook@chromium.org> Thanks!
On Wed, Apr 07, 2021 at 10:33:44AM +0300, Andy Shevchenko wrote: > On Wed, Apr 7, 2021 at 10:25 AM Luis Chamberlain <mcgrof@kernel.org> wrote: > > > > On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: > > > 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 <linux/notifier.h> > > > +#include <linux/types.h> > > > + > > > +extern struct atomic_notifier_head panic_notifier_list; > > > + > > > +extern bool crash_kexec_post_notifiers; > > > + > > > +#endif /* _LINUX_PANIC_NOTIFIERS_H */ > > > > Why is it worth it to add another file just for this? > > The main point is to break tons of loops that prevent having clean > headers anymore. > > In this case, see bug.h, which is very important in this sense. OK based on the commit log this was not clear, it seemed more of moving panic stuff to its own file, so just cleanup. > > Seems like a very > > small file. > > If it is an argument, it's kinda strange. We have much smaller headers. The motivation for such separate file was just not clear on the commit log. Luis
On Wed, Apr 7, 2021 at 5:30 PM Luis Chamberlain <mcgrof@kernel.org> wrote: > On Wed, Apr 07, 2021 at 10:33:44AM +0300, Andy Shevchenko wrote: > > On Wed, Apr 7, 2021 at 10:25 AM Luis Chamberlain <mcgrof@kernel.org> wrote: > > > On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: ... > > > Why is it worth it to add another file just for this? > > > > The main point is to break tons of loops that prevent having clean > > headers anymore. > > > > In this case, see bug.h, which is very important in this sense. > > OK based on the commit log this was not clear, it seemed more of moving > panic stuff to its own file, so just cleanup. Sorry for that. it should have mentioned the kernel folder instead of lib. But I think it won't clarify the above. In any case there are several purposes in this case - dropping dependency in bug.h - dropping a loop by moving out panic_notifier.h - unload kernel.h from something which has its own domain I think that you are referring to the commit message describing 3rd one, but not 1st and 2nd. I will amend this for the future splits, thanks! > > > Seems like a very > > > small file. > > > > If it is an argument, it's kinda strange. We have much smaller headers. > > The motivation for such separate file was just not clear on the commit > log.
On Wed, Apr 07, 2021 at 05:59:19PM +0300, Andy Shevchenko wrote: > On Wed, Apr 7, 2021 at 5:30 PM Luis Chamberlain <mcgrof@kernel.org> wrote: > > On Wed, Apr 07, 2021 at 10:33:44AM +0300, Andy Shevchenko wrote: > > > On Wed, Apr 7, 2021 at 10:25 AM Luis Chamberlain <mcgrof@kernel.org> wrote: > > > > On Tue, Apr 06, 2021 at 04:31:58PM +0300, Andy Shevchenko wrote: > > ... > > > > > Why is it worth it to add another file just for this? > > > > > > The main point is to break tons of loops that prevent having clean > > > headers anymore. > > > > > > In this case, see bug.h, which is very important in this sense. > > > > OK based on the commit log this was not clear, it seemed more of moving > > panic stuff to its own file, so just cleanup. > > Sorry for that. it should have mentioned the kernel folder instead of > lib. But I think it won't clarify the above. > > In any case there are several purposes in this case > - dropping dependency in bug.h > - dropping a loop by moving out panic_notifier.h > - unload kernel.h from something which has its own domain > > I think that you are referring to the commit message describing 3rd > one, but not 1st and 2nd. Right! > I will amend this for the future splits, thanks! Don't get me wrong, I love the motivation behind just the 3rd purpose, however I figured there might be something more when I saw panic_notifier.h. It was just not clear. But awesome stuff! Luis
On 06/04/2021 15.31, 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. Yay. Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> > 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. I think it would be good to have some place to note that "This #include is just for backwards compatibility, it will go away RealSoonNow, so if you rely on something from linux/panic.h, include that explicitly yourself TYVM. And if you're looking for a janitorial task, write a script to check that every file that uses some identifier defined in panic.h actually includes that file. When all offenders are found and dealt with, remove the #include and this note.". > + > +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]; While you're doing this, nothing outside of kernel/panic.c cares about the definition of struct taint_flag or use the taint_flags array, so could you make the definition private to that file and make the array static? (Another patch, of course.) > +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); I know you're just moving code, but it would be a nice opportunity to drop the redundant externs. Rasmus
On Thu, Apr 08, 2021 at 02:45:12PM +0200, Rasmus Villemoes wrote: > On 06/04/2021 15.31, 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. > > Yay. > > Acked-by: Rasmus Villemoes <linux@rasmusvillemoes.dk> Thanks! > > 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. > > I think it would be good to have some place to note that "This #include > is just for backwards compatibility, it will go away RealSoonNow, so if > you rely on something from linux/panic.h, include that explicitly > yourself TYVM. And if you're looking for a janitorial task, write a > script to check that every file that uses some identifier defined in > panic.h actually includes that file. When all offenders are found and > dealt with, remove the #include and this note.". Good and... > > +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]; > > While you're doing this, nothing outside of kernel/panic.c cares about > the definition of struct taint_flag or use the taint_flags array, so > could you make the definition private to that file and make the array > static? (Another patch, of course.) ...according to the above if *you are looking for a janitorial task*... :-)) > > +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); > > I know you're just moving code, but it would be a nice opportunity to > drop the redundant externs. As above. But for all these I have heard you. So, I'll keep this response as part of my always only growing TODO list.
On Wed, 7 Apr 2021 11:46:37 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > On Wed, Apr 7, 2021 at 11:17 AM Kees Cook <keescook@chromium.org> wrote: > > > > 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 <andriy.shevchenko@linux.intel.com> > > > > I like it! Do you have a multi-arch CI to do allmodconfig builds to > > double-check this? > > Unfortunately no, I rely on plenty of bots that are harvesting mailing lists. > > But I will appreciate it if somebody can run this through various build tests. > um, did you try x86_64 allmodconfig? I'm up to kernelh-split-out-panic-and-oops-helpers-fix-fix-fix-fix-fix-fix-fix.patch and counting. From: Andrew Morton <akpm@linux-foundation.org> Subject: kernelh-split-out-panic-and-oops-helpers-fix more files need panic_notifier.h Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- arch/x86/xen/enlighten.c | 1 + drivers/video/fbdev/hyperv_fb.c | 1 + 2 files changed, 2 insertions(+) --- a/arch/x86/xen/enlighten.c~kernelh-split-out-panic-and-oops-helpers-fix +++ a/arch/x86/xen/enlighten.c @@ -6,6 +6,7 @@ #include <linux/cpu.h> #include <linux/kexec.h> #include <linux/slab.h> +#include <linux/panic_notifier.h> #include <xen/xen.h> #include <xen/features.h> --- a/drivers/video/fbdev/hyperv_fb.c~kernelh-split-out-panic-and-oops-helpers-fix +++ a/drivers/video/fbdev/hyperv_fb.c @@ -52,6 +52,7 @@ #include <linux/completion.h> #include <linux/fb.h> #include <linux/pci.h> +#include <linux/panic_notifier.h> #include <linux/efi.h> #include <linux/console.h>
On Thu, Apr 08, 2021 at 11:23:03PM -0700, Andrew Morton wrote: > On Wed, 7 Apr 2021 11:46:37 +0300 Andy Shevchenko <andy.shevchenko@gmail.com> wrote: > > > On Wed, Apr 7, 2021 at 11:17 AM Kees Cook <keescook@chromium.org> wrote: > > > > > > 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 <andriy.shevchenko@linux.intel.com> > > > > > > I like it! Do you have a multi-arch CI to do allmodconfig builds to > > > double-check this? > > > > Unfortunately no, I rely on plenty of bots that are harvesting mailing lists. > > > > But I will appreciate it if somebody can run this through various build tests. > > > > um, did you try x86_64 allmodconfig? > > I'm up to > kernelh-split-out-panic-and-oops-helpers-fix-fix-fix-fix-fix-fix-fix.patch > and counting. I will try on my side and will fix those, thanks! > and.... drivers/leds/trigger/ledtrig-heartbeat.c as well. > > I'll drop it. No problem, thanks for the report.
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 <linux/export.h> +#include <linux/panic_notifier.h> #include <linux/string.h> #include <linux/sched.h> #include <linux/init.h> 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 <asm/irq_vectors.h> #include <asm/cpu_entry_area.h> +#include <linux/debug_locks.h> #include <linux/smp.h> #include <linux/percpu.h> 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 <linux/irq.h> #include <linux/kexec.h> #include <linux/i8253.h> +#include <linux/panic_notifier.h> #include <linux/random.h> #include <asm/processor.h> #include <asm/hypervisor.h> 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 <linux/initrd.h> #include <linux/iscsi_ibft.h> #include <linux/memblock.h> +#include <linux/panic_notifier.h> #include <linux/pci.h> #include <linux/root_dev.h> #include <linux/hugetlb.h> 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 <linux/module.h> #include <linux/errno.h> +#include <linux/panic_notifier.h> #include <linux/poll.h> #include <linux/sched.h> #include <linux/seq_file.h> 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 <linux/kernel.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/panic_notifier.h> #include <linux/slab.h> #include <linux/mutex.h> #include <linux/dma-map-ops.h> 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 <linux/kernel.h> +#include <linux/panic.h> +#include <linux/printk.h> #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 <linux/math.h> #include <linux/minmax.h> #include <linux/typecheck.h> +#include <linux/panic.h> #include <linux/printk.h> #include <linux/build_bug.h> #include <linux/static_call_types.h> @@ -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 <linux/compiler_attributes.h> +#include <linux/types.h> + +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 <linux/notifier.h> +#include <linux/types.h> + +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 <linux/kthread.h> #include <linux/lockdep.h> #include <linux/export.h> +#include <linux/panic_notifier.h> #include <linux/sysctl.h> #include <linux/suspend.h> #include <linux/utsname.h> 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 <linux/suspend.h> #include <linux/device.h> #include <linux/freezer.h> +#include <linux/panic_notifier.h> #include <linux/pm.h> #include <linux/cpu.h> #include <linux/uaccess.h> 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 <linux/reboot.h> #include <linux/delay.h> #include <linux/kexec.h> +#include <linux/panic_notifier.h> #include <linux/sched.h> #include <linux/sysrq.h> #include <linux/init.h> 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 <linux/export.h> #include <linux/completion.h> #include <linux/moduleparam.h> +#include <linux/panic.h> +#include <linux/panic_notifier.h> #include <linux/percpu.h> #include <linux/notifier.h> #include <linux/cpu.h> 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 <linux/sysctl.h> #include <linux/bitmap.h> #include <linux/signal.h> +#include <linux/panic.h> #include <linux/printk.h> #include <linux/proc_fs.h> #include <linux/security.h> 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 <linux/slab.h> #include <linux/ctype.h> #include <linux/init.h> +#include <linux/panic_notifier.h> #include <linux/poll.h> #include <linux/nmi.h> #include <linux/fs.h>
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 <andriy.shevchenko@linux.intel.com> --- 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