* [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT @ 2020-11-09 3:40 Wang Qing 2020-11-09 6:24 ` Greg Kroah-Hartman 2020-11-10 6:18 ` Christophe Leroy 0 siblings, 2 replies; 4+ messages in thread From: Wang Qing @ 2020-11-09 3:40 UTC (permalink / raw) To: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Nicholas Piggin, Christophe Leroy, Alistair Popple, Jordan Niethe, Aneesh Kumar K.V, Wang Qing, Greg Kroah-Hartman, Peter Zijlstra, linuxppc-dev, linux-kernel Cc: tglx Add PREEMPT_RT output to die(). Signed-off-by: Wang Qing <wangqing@vivo.com> --- arch/powerpc/kernel/traps.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 5006dcb..6dfe567 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -258,6 +258,14 @@ static char *get_mmu_str(void) return ""; } +#ifdef CONFIG_PREEMPT +#define S_PREEMPT " PREEMPT" +#elif defined(CONFIG_PREEMPT_RT) +#define S_PREEMPT " PREEMPT_RT" +#else +#define S_PREEMPT "" +#endif + static int __die(const char *str, struct pt_regs *regs, long err) { printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); @@ -265,7 +273,7 @@ static int __die(const char *str, struct pt_regs *regs, long err) printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n", IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", PAGE_SIZE / 1024, get_mmu_str(), - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", + S_PREEMPT, IS_ENABLED(CONFIG_SMP) ? " SMP" : "", IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", -- 2.7.4 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT 2020-11-09 3:40 [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing @ 2020-11-09 6:24 ` Greg Kroah-Hartman 2020-11-10 6:18 ` Christophe Leroy 1 sibling, 0 replies; 4+ messages in thread From: Greg Kroah-Hartman @ 2020-11-09 6:24 UTC (permalink / raw) To: Wang Qing Cc: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Nicholas Piggin, Christophe Leroy, Alistair Popple, Jordan Niethe, Aneesh Kumar K.V, Peter Zijlstra, linuxppc-dev, linux-kernel, tglx On Mon, Nov 09, 2020 at 11:40:08AM +0800, Wang Qing wrote: > Add PREEMPT_RT output to die(). That says what you did, but not why you are doing this. Why are you doing this? That needs to go into the changelog text. greg k-h ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT 2020-11-09 3:40 [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing 2020-11-09 6:24 ` Greg Kroah-Hartman @ 2020-11-10 6:18 ` Christophe Leroy 2020-11-10 6:26 ` 王擎 1 sibling, 1 reply; 4+ messages in thread From: Christophe Leroy @ 2020-11-10 6:18 UTC (permalink / raw) To: Wang Qing Cc: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Nicholas Piggin, Alistair Popple, Jordan Niethe, Aneesh Kumar K.V, Greg Kroah-Hartman, Peter Zijlstra, linuxppc-dev, linux-kernel, tglx Quoting Wang Qing <wangqing@vivo.com>: > Add PREEMPT_RT output to die(). > > Signed-off-by: Wang Qing <wangqing@vivo.com> > --- > arch/powerpc/kernel/traps.c | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c > index 5006dcb..6dfe567 > --- a/arch/powerpc/kernel/traps.c > +++ b/arch/powerpc/kernel/traps.c > @@ -258,6 +258,14 @@ static char *get_mmu_str(void) > return ""; > } > > +#ifdef CONFIG_PREEMPT > +#define S_PREEMPT " PREEMPT" > +#elif defined(CONFIG_PREEMPT_RT) > +#define S_PREEMPT " PREEMPT_RT" > +#else > +#define S_PREEMPT "" > +#endif I don't like too much that forest of #ifdefs. IS_ENABLED() is prefered whenever possible. > + > static int __die(const char *str, struct pt_regs *regs, long err) > { > printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); > @@ -265,7 +273,7 @@ static int __die(const char *str, struct pt_regs > *regs, long err) > printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n", > IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", > PAGE_SIZE / 1024, get_mmu_str(), > - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", > + S_PREEMPT, > IS_ENABLED(CONFIG_SMP) ? " SMP" : "", > IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", > debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", > -- > 2.7.4 I'd prefer to remain in line with the existing and use IS_ENABLED() instead of #ifdefs, see below: diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 5006dcbe1d9f..dec7b81c72a4 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -262,10 +262,11 @@ static int __die(const char *str, struct pt_regs *regs, long err) { printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); - printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n", + printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n", IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", PAGE_SIZE / 1024, get_mmu_str(), IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", + IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : "", IS_ENABLED(CONFIG_SMP) ? " SMP" : "", IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", --- Christophe ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re:Re: [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT 2020-11-10 6:18 ` Christophe Leroy @ 2020-11-10 6:26 ` 王擎 0 siblings, 0 replies; 4+ messages in thread From: 王擎 @ 2020-11-10 6:26 UTC (permalink / raw) To: Christophe Leroy Cc: Michael Ellerman, Benjamin Herrenschmidt, Paul Mackerras, Nicholas Piggin, Alistair Popple, Jordan Niethe, Aneesh Kumar K.V, Greg Kroah-Hartman, Peter Zijlstra, linuxppc-dev, linux-kernel, tglx >Quoting Wang Qing <wangqing@vivo.com>: > >> Add PREEMPT_RT output to die(). >> >> Signed-off-by: Wang Qing <wangqing@vivo.com> >> --- >> arch/powerpc/kernel/traps.c | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c >> index 5006dcb..6dfe567 >> --- a/arch/powerpc/kernel/traps.c >> +++ b/arch/powerpc/kernel/traps.c >> @@ -258,6 +258,14 @@ static char *get_mmu_str(void) >> return ""; >> } >> >> +#ifdef CONFIG_PREEMPT >> +#define S_PREEMPT " PREEMPT" >> +#elif defined(CONFIG_PREEMPT_RT) >> +#define S_PREEMPT " PREEMPT_RT" >> +#else >> +#define S_PREEMPT "" >> +#endif > >I don't like too much that forest of #ifdefs. IS_ENABLED() is prefered >whenever possible. > >> + >> static int __die(const char *str, struct pt_regs *regs, long err) >> { >> printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); >> @@ -265,7 +273,7 @@ static int __die(const char *str, struct pt_regs >> *regs, long err) >> printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n", >> IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", >> PAGE_SIZE / 1024, get_mmu_str(), >> - IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", >> + S_PREEMPT, >> IS_ENABLED(CONFIG_SMP) ? " SMP" : "", >> IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", >> debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", >> -- >> 2.7.4 > >I'd prefer to remain in line with the existing and use IS_ENABLED() >instead of #ifdefs, see below: > >diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c >index 5006dcbe1d9f..dec7b81c72a4 100644 >--- a/arch/powerpc/kernel/traps.c >+++ b/arch/powerpc/kernel/traps.c >@@ -262,10 +262,11 @@ static int __die(const char *str, struct pt_regs >*regs, long err) > { > printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter); > >- printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s %s\n", >+ printk("%s PAGE_SIZE=%luK%s%s%s%s%s%s%s %s\n", > IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE", > PAGE_SIZE / 1024, get_mmu_str(), > IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "", >+ IS_ENABLED(CONFIG_PREEMPT_RT) ? " PREEMPT_RT" : "", > IS_ENABLED(CONFIG_SMP) ? " SMP" : "", > IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "", > debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "", >--- >Christophe Yeah, I agree with it. Wang Qing ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-10 6:26 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-11-09 3:40 [PATCH] sched/rt, powerpc: Prepare for PREEMPT_RT Wang Qing 2020-11-09 6:24 ` Greg Kroah-Hartman 2020-11-10 6:18 ` Christophe Leroy 2020-11-10 6:26 ` 王擎
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).