diff options
| author | Tony Luck <tony.luck@intel.com> | 2020-10-06 14:09:06 -0700 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-10-07 11:08:59 +0200 |
| commit | a05d54c41ecfa1a322b229b4e5ce50c157284f74 (patch) | |
| tree | c5c0852daccf221f05a801f167e3850f4efb7754 /arch/x86/kernel/cpu/mce/severity.c | |
| parent | 41ce0564bfe2e129d56730418d8c0a9f9f2d31b5 (diff) | |
| download | linux-a05d54c41ecfa1a322b229b4e5ce50c157284f74.tar.bz2 | |
x86/mce: Provide method to find out the type of an exception handler
Avoid a proliferation of ex_has_*_handler() functions by having just
one function that returns the type of the handler (if any).
Drop the __visible attribute for this function. It is not called
from assembler so the attribute is not necessary.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201006210910.21062-3-tony.luck@intel.com
Diffstat (limited to 'arch/x86/kernel/cpu/mce/severity.c')
| -rw-r--r-- | arch/x86/kernel/cpu/mce/severity.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mce/severity.c b/arch/x86/kernel/cpu/mce/severity.c index 0b072dc231ad..c6494e6579c1 100644 --- a/arch/x86/kernel/cpu/mce/severity.c +++ b/arch/x86/kernel/cpu/mce/severity.c @@ -225,10 +225,13 @@ static struct severity { */ static int error_context(struct mce *m, struct pt_regs *regs) { + enum handler_type t; + if ((m->cs & 3) == 3) return IN_USER; - if (mc_recoverable(m->mcgstatus) && ex_has_fault_handler(m->ip)) { + t = ex_get_fault_handler_type(m->ip); + if (mc_recoverable(m->mcgstatus) && t == EX_HANDLER_FAULT) { m->kflags |= MCE_IN_KERNEL_RECOV; return IN_KERNEL_RECOV; } |