From: Jann Horn <jannh@google.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
"H. Peter Anvin" <hpa@zytor.com>,
x86@kernel.org, Andrey Ryabinin <aryabinin@virtuozzo.com>,
Alexander Potapenko <glider@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
kasan-dev@googlegroups.com, jannh@google.com
Cc: linux-kernel@vger.kernel.org,
Andrey Konovalov <andreyknvl@google.com>,
Andy Lutomirski <luto@kernel.org>,
Sean Christopherson <sean.j.christopherson@intel.com>,
Andi Kleen <ak@linux.intel.com>
Subject: [PATCH v3 3/4] x86/dumpstack: Split out header line printing from __die()
Date: Wed, 20 Nov 2019 11:36:12 +0100 [thread overview]
Message-ID: <20191120103613.63563-3-jannh@google.com> (raw)
In-Reply-To: <20191120103613.63563-1-jannh@google.com>
Split __die() into __die_header() and __die_body(). This allows callers to
insert extra information below the header line that initiates the bug
report.
This can e.g. be used by __die() callers to allow KASAN to print additional
information below the header line of the bug report.
Signed-off-by: Jann Horn <jannh@google.com>
---
Notes:
I think that it's nicer to have KASAN's notes about the
bug below the first oops line from the kernel.
This also means that tools that work with kernel oops
reports can just trigger on the "general protection fault"
line with the die counter and so on, and just include the
text from on there, and the KASAN message will automatically
be included.
But if you think that the code looks too ugly, I'd be
happy to change that back and drop this patch from the
series.
v3:
new patch
arch/x86/include/asm/kdebug.h | 3 +++
arch/x86/kernel/dumpstack.c | 13 ++++++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/arch/x86/include/asm/kdebug.h b/arch/x86/include/asm/kdebug.h
index 75f1e35e7c15..a0050fabce42 100644
--- a/arch/x86/include/asm/kdebug.h
+++ b/arch/x86/include/asm/kdebug.h
@@ -33,6 +33,9 @@ enum show_regs_mode {
};
extern void die(const char *, struct pt_regs *,long);
+extern void __die_header(const char *str, struct pt_regs *regs, long err);
+extern int __must_check __die_body(const char *str, struct pt_regs *regs,
+ long err);
extern int __must_check __die(const char *, struct pt_regs *, long);
extern void show_stack_regs(struct pt_regs *regs);
extern void __show_regs(struct pt_regs *regs, enum show_regs_mode);
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
index e07424e19274..6436f3f5f803 100644
--- a/arch/x86/kernel/dumpstack.c
+++ b/arch/x86/kernel/dumpstack.c
@@ -365,7 +365,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
}
NOKPROBE_SYMBOL(oops_end);
-int __die(const char *str, struct pt_regs *regs, long err)
+void __die_header(const char *str, struct pt_regs *regs, long err)
{
const char *pr = "";
@@ -384,7 +384,11 @@ int __die(const char *str, struct pt_regs *regs, long err)
IS_ENABLED(CONFIG_KASAN) ? " KASAN" : "",
IS_ENABLED(CONFIG_PAGE_TABLE_ISOLATION) ?
(boot_cpu_has(X86_FEATURE_PTI) ? " PTI" : " NOPTI") : "");
+}
+NOKPROBE_SYMBOL(__die_header);
+int __die_body(const char *str, struct pt_regs *regs, long err)
+{
show_regs(regs);
print_modules();
@@ -394,6 +398,13 @@ int __die(const char *str, struct pt_regs *regs, long err)
return 0;
}
+NOKPROBE_SYMBOL(__die_body);
+
+int __die(const char *str, struct pt_regs *regs, long err)
+{
+ __die_header(str, regs, err);
+ return __die_body(str, regs, err);
+}
NOKPROBE_SYMBOL(__die);
/*
--
2.24.0.432.g9d3f5f5b63-goog
next prev parent reply other threads:[~2019-11-20 10:36 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-20 10:36 [PATCH v3 1/4] x86/insn-eval: Add support for 64-bit kernel mode Jann Horn
2019-11-20 10:36 ` [PATCH v3 2/4] x86/traps: Print non-canonical address on #GP Jann Horn
2019-11-20 11:18 ` Ingo Molnar
2019-11-20 11:24 ` Borislav Petkov
2019-11-20 12:25 ` Jann Horn
2019-11-20 12:41 ` Borislav Petkov
2019-11-20 13:16 ` Ingo Molnar
2019-11-20 13:23 ` Jann Horn
2019-11-20 14:05 ` Ingo Molnar
2019-11-20 12:14 ` Jann Horn
2019-11-20 12:30 ` Ingo Molnar
2019-11-20 12:39 ` Borislav Petkov
2019-11-20 12:42 ` Jann Horn
2019-11-20 13:28 ` Ingo Molnar
2019-11-20 13:39 ` Borislav Petkov
2019-11-20 16:21 ` Sean Christopherson
2019-11-20 17:37 ` Borislav Petkov
2019-11-20 10:36 ` Jann Horn [this message]
2019-11-20 10:36 ` [PATCH v3 4/4] x86/kasan: Print original " Jann Horn
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=20191120103613.63563-3-jannh@google.com \
--to=jannh@google.com \
--cc=ak@linux.intel.com \
--cc=andreyknvl@google.com \
--cc=aryabinin@virtuozzo.com \
--cc=bp@alien8.de \
--cc=dvyukov@google.com \
--cc=glider@google.com \
--cc=hpa@zytor.com \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=sean.j.christopherson@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/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).