* [PATCH v2 1/1] x86/kernel: Update bug_at() head message
@ 2017-01-10 16:43 Andy Shevchenko
2017-01-12 8:41 ` Ingo Molnar
2017-01-12 10:07 ` [tip:locking/core] locking/jump_labels: Update bug_at() boot message tip-bot for Andy Shevchenko
0 siblings, 2 replies; 3+ messages in thread
From: Andy Shevchenko @ 2017-01-10 16:43 UTC (permalink / raw)
To: Ingo Molnar, Thomas Gleixner, H . Peter Anvin, linux-kernel, x86
Cc: Andy Shevchenko
First of all, %*ph specifier allows to dump data in hex format using the
pointer to a buffer. This is suitable to use here.
Besides that Thomas suggested to move it to critical level and replace __FILE__
by explicit mention of "jumplabel".
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
arch/x86/kernel/jump_label.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index fc25f698d792..32f126e726f5 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -32,8 +32,7 @@ static void bug_at(unsigned char *ip, int line)
* Something went wrong. Crash the box, as something could be
* corrupting the kernel.
*/
- pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
- ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
+ pr_crit("jumplabel: Unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line);
BUG();
}
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] x86/kernel: Update bug_at() head message
2017-01-10 16:43 [PATCH v2 1/1] x86/kernel: Update bug_at() head message Andy Shevchenko
@ 2017-01-12 8:41 ` Ingo Molnar
2017-01-12 10:07 ` [tip:locking/core] locking/jump_labels: Update bug_at() boot message tip-bot for Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: Ingo Molnar @ 2017-01-12 8:41 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Ingo Molnar, Thomas Gleixner, H . Peter Anvin, linux-kernel, x86
* Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote:
> First of all, %*ph specifier allows to dump data in hex format using the
> pointer to a buffer. This is suitable to use here.
>
> Besides that Thomas suggested to move it to critical level and replace __FILE__
> by explicit mention of "jumplabel".
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> arch/x86/kernel/jump_label.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
> index fc25f698d792..32f126e726f5 100644
> --- a/arch/x86/kernel/jump_label.c
> +++ b/arch/x86/kernel/jump_label.c
> @@ -32,8 +32,7 @@ static void bug_at(unsigned char *ip, int line)
> * Something went wrong. Crash the box, as something could be
> * corrupting the kernel.
> */
> - pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
> - ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
> + pr_crit("jumplabel: Unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line);
> BUG();
What is 'jumplabel'? Nobody calls it that in the kernel - everyone calls it
'jump_label' ...
(Fixed that in patch, no need to resend.)
Thanks,
Ingo
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:locking/core] locking/jump_labels: Update bug_at() boot message
2017-01-10 16:43 [PATCH v2 1/1] x86/kernel: Update bug_at() head message Andy Shevchenko
2017-01-12 8:41 ` Ingo Molnar
@ 2017-01-12 10:07 ` tip-bot for Andy Shevchenko
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Andy Shevchenko @ 2017-01-12 10:07 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, tglx, peterz, andriy.shevchenko, torvalds, mingo
Commit-ID: 6e03f66c001790d6ca853c68a56c87460bc86467
Gitweb: http://git.kernel.org/tip/6e03f66c001790d6ca853c68a56c87460bc86467
Author: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
AuthorDate: Tue, 10 Jan 2017 18:43:54 +0200
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 12 Jan 2017 09:43:07 +0100
locking/jump_labels: Update bug_at() boot message
First of all, %*ph specifier allows to dump data in hex format using the
pointer to a buffer. This is suitable to use here.
Besides that Thomas suggested to move it to critical level and replace __FILE__
by explicit mention of "jumplabel".
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20170110164354.47372-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/jump_label.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index fc25f69..c37bd0f 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -32,8 +32,7 @@ static void bug_at(unsigned char *ip, int line)
* Something went wrong. Crash the box, as something could be
* corrupting the kernel.
*/
- pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
- ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
+ pr_crit("jump_label: Fatal kernel bug, unexpected op at %pS [%p] (%5ph) %d\n", ip, ip, ip, line);
BUG();
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-12 10:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-10 16:43 [PATCH v2 1/1] x86/kernel: Update bug_at() head message Andy Shevchenko
2017-01-12 8:41 ` Ingo Molnar
2017-01-12 10:07 ` [tip:locking/core] locking/jump_labels: Update bug_at() boot message tip-bot for Andy Shevchenko
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).