| Message ID | 20221109200050.3400857-1-keescook@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | exit: Put an upper limit on how often we can oops | expand |
On Wed, Nov 9, 2022 at 12:01 PM Kees Cook <keescook@chromium.org> wrote: > > In preparation for adding more sysctls directly in kernel/panic.c, split > CONFIG_SMP from the logic that adds sysctls. > > Cc: Petr Mladek <pmladek@suse.com> > Cc: Andrew Morton <akpm@linux-foundation.org> > Cc: tangmeng <tangmeng@uniontech.com> > Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com> > Cc: Tiezhu Yang <yangtiezhu@loongson.cn> > Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > Signed-off-by: Kees Cook <keescook@chromium.org> > --- > kernel/panic.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/kernel/panic.c b/kernel/panic.c > index da323209f583..129936511380 100644 > --- a/kernel/panic.c > +++ b/kernel/panic.c > @@ -75,8 +75,9 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); > > EXPORT_SYMBOL(panic_notifier_list); > > -#if defined(CONFIG_SMP) && defined(CONFIG_SYSCTL) > +#if CONFIG_SYSCTL Should this be "#ifdef CONFIG_SYSCTL"? > static struct ctl_table kern_panic_table[] = { > +#if defined(CONFIG_SMP) nit: This could be "#ifdef CONFIG_SMP" > { > .procname = "oops_all_cpu_backtrace", > .data = &sysctl_oops_all_cpu_backtrace, > @@ -86,6 +87,7 @@ static struct ctl_table kern_panic_table[] = { > .extra1 = SYSCTL_ZERO, > .extra2 = SYSCTL_ONE, > }, > +#endif > { } > }; > > -- > 2.34.1 >
On Wed, Nov 09, 2022 at 01:48:45PM -0800, Bill Wendling wrote: > On Wed, Nov 9, 2022 at 12:01 PM Kees Cook <keescook@chromium.org> wrote: > > > > In preparation for adding more sysctls directly in kernel/panic.c, split > > CONFIG_SMP from the logic that adds sysctls. > > > > Cc: Petr Mladek <pmladek@suse.com> > > Cc: Andrew Morton <akpm@linux-foundation.org> > > Cc: tangmeng <tangmeng@uniontech.com> > > Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com> > > Cc: Tiezhu Yang <yangtiezhu@loongson.cn> > > Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> > > Signed-off-by: Kees Cook <keescook@chromium.org> > > --- > > kernel/panic.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/kernel/panic.c b/kernel/panic.c > > index da323209f583..129936511380 100644 > > --- a/kernel/panic.c > > +++ b/kernel/panic.c > > @@ -75,8 +75,9 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); > > > > EXPORT_SYMBOL(panic_notifier_list); > > > > -#if defined(CONFIG_SMP) && defined(CONFIG_SYSCTL) > > +#if CONFIG_SYSCTL > > Should this be "#ifdef CONFIG_SYSCTL"? > > > static struct ctl_table kern_panic_table[] = { > > +#if defined(CONFIG_SMP) > > nit: This could be "#ifdef CONFIG_SMP" Whoops, yes. Thanks. I'll fix these for v3.
diff --git a/kernel/panic.c b/kernel/panic.c index da323209f583..129936511380 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -75,8 +75,9 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); EXPORT_SYMBOL(panic_notifier_list); -#if defined(CONFIG_SMP) && defined(CONFIG_SYSCTL) +#if CONFIG_SYSCTL static struct ctl_table kern_panic_table[] = { +#if defined(CONFIG_SMP) { .procname = "oops_all_cpu_backtrace", .data = &sysctl_oops_all_cpu_backtrace, @@ -86,6 +87,7 @@ static struct ctl_table kern_panic_table[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, +#endif { } };
In preparation for adding more sysctls directly in kernel/panic.c, split CONFIG_SMP from the logic that adds sysctls. Cc: Petr Mladek <pmladek@suse.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: tangmeng <tangmeng@uniontech.com> Cc: "Guilherme G. Piccoli" <gpiccoli@igalia.com> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Kees Cook <keescook@chromium.org> --- kernel/panic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)