From: Christophe Leroy <christophe.leroy@c-s.fr>
To: Michael Ellerman <mpe@ellerman.id.au>, linuxppc-dev@ozlabs.org
Subject: Re: [PATCH v2 1/3] powerpc: Stop using pr_cont() in __die()
Date: Thu, 10 Jan 2019 14:40:37 +0100 [thread overview]
Message-ID: <996253a4-3deb-c320-f78a-15c8de261217@c-s.fr> (raw)
In-Reply-To: <20190110115737.30931-1-mpe@ellerman.id.au>
Le 10/01/2019 à 12:57, Michael Ellerman a écrit :
> Using pr_cont() risks having our output interleaved with other output
> from other CPUs. Instead print everything in a single printk() call.
>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Reviewed-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
> arch/powerpc/kernel/traps.c | 26 ++++++++------------------
> 1 file changed, 8 insertions(+), 18 deletions(-)
>
> v2: Use a single printk with (mostly) compile time checks rather than
> constructing the string with seq_buf.
>
> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
> index 64936b60d521..164fc92895be 100644
> --- a/arch/powerpc/kernel/traps.c
> +++ b/arch/powerpc/kernel/traps.c
> @@ -257,24 +257,14 @@ static int __die(const char *str, struct pt_regs *regs, long err)
> {
> printk("Oops: %s, sig: %ld [#%d]\n", str, err, ++die_counter);
Maybe this printk() should also be merge with the following to further
limit risks of interleaving ?
Christophe
>
> - if (IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN))
> - printk("LE ");
> - else
> - printk("BE ");
> -
> - if (IS_ENABLED(CONFIG_PREEMPT))
> - pr_cont("PREEMPT ");
> -
> - if (IS_ENABLED(CONFIG_SMP))
> - pr_cont("SMP NR_CPUS=%d ", NR_CPUS);
> -
> - if (debug_pagealloc_enabled())
> - pr_cont("DEBUG_PAGEALLOC ");
> -
> - if (IS_ENABLED(CONFIG_NUMA))
> - pr_cont("NUMA ");
> -
> - pr_cont("%s\n", ppc_md.name ? ppc_md.name : "");
> + printk("%s %s%s%s%s%s %s\n",
> + IS_ENABLED(CONFIG_CPU_LITTLE_ENDIAN) ? "LE" : "BE",
> + IS_ENABLED(CONFIG_PREEMPT) ? " PREEMPT" : "",
> + IS_ENABLED(CONFIG_SMP) ? " SMP" : "",
> + IS_ENABLED(CONFIG_SMP) ? (" NR_CPUS=" __stringify(NR_CPUS)) : "",
> + debug_pagealloc_enabled() ? " DEBUG_PAGEALLOC" : "",
> + IS_ENABLED(CONFIG_NUMA) ? " NUMA" : "",
> + ppc_md.name ? ppc_md.name : "");
>
> if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)
> return 1;
>
next prev parent reply other threads:[~2019-01-10 13:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-10 11:57 [PATCH v2 1/3] powerpc: Stop using pr_cont() in __die() Michael Ellerman
2019-01-10 11:57 ` [PATCH v2 2/3] powerpc: Show PAGE_SIZE in __die() output Michael Ellerman
2019-01-10 13:40 ` Christophe Leroy
2019-01-10 11:57 ` [PATCH v2 3/3] powerpc/64s: Add MMU type to " Michael Ellerman
2019-01-10 13:41 ` Christophe Leroy
2019-01-10 13:40 ` Christophe Leroy [this message]
2019-01-11 10:30 ` [PATCH v2 1/3] powerpc: Stop using pr_cont() in __die() Michael Ellerman
2019-01-24 3:40 ` [v2,1/3] " Michael Ellerman
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=996253a4-3deb-c320-f78a-15c8de261217@c-s.fr \
--to=christophe.leroy@c-s.fr \
--cc=linuxppc-dev@ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).