UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/64s: Better printing of machine check info for guest MCEs 

This adds an "in_guest" parameter to machine_check_print_event_info()
so that we can avoid trying to translate guest NIP values into
symbolic form using the host kernel's symbol table.

Reviewed-by: Aravinda Prasad <aravinda@linux.vnet.ibm.com>
Reviewed-by: Mahesh Salgaonkar <mahesh@linux.vnet.ibm.com>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Paul Mackerras 2019-02-21 13:40:20 +11:00 committed by Michael Ellerman
parent 884dfb722d
commit c057720184
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/include/asm/mce.h
View File

@ -209,7 +209,7 @@ extern int get_mce_event(struct machine_check_event *mce, bool release);
extern void release_mce_event(void); extern void release_mce_event(void);
extern void machine_check_queue_event(void); extern void machine_check_queue_event(void);
extern void machine_check_print_event_info(struct machine_check_event *evt, extern void machine_check_print_event_info(struct machine_check_event *evt,
bool user_mode); bool user_mode, bool in_guest);
#ifdef CONFIG_PPC_BOOK3S_64 #ifdef CONFIG_PPC_BOOK3S_64
void flush_and_reload_slb(void); void flush_and_reload_slb(void);
#endif /* CONFIG_PPC_BOOK3S_64 */ #endif /* CONFIG_PPC_BOOK3S_64 */

8
arch/powerpc/kernel/mce.c
View File

@ -301,13 +301,13 @@ static void machine_check_process_queued_event(struct irq_work *work)
while (__this_cpu_read(mce_queue_count) > 0) { while (__this_cpu_read(mce_queue_count) > 0) {
index = __this_cpu_read(mce_queue_count) - 1; index = __this_cpu_read(mce_queue_count) - 1;
evt = this_cpu_ptr(&mce_event_queue[index]); evt = this_cpu_ptr(&mce_event_queue[index]);
machine_check_print_event_info(evt, false); machine_check_print_event_info(evt, false, false);
__this_cpu_dec(mce_queue_count); __this_cpu_dec(mce_queue_count);
} }
} }
void machine_check_print_event_info(struct machine_check_event *evt, void machine_check_print_event_info(struct machine_check_event *evt,
bool user_mode) bool user_mode, bool in_guest)
{ {
const char *level, *sevstr, *subtype; const char *level, *sevstr, *subtype;
static const char *mc_ue_types[] = { static const char *mc_ue_types[] = {
@ -387,7 +387,9 @@ void machine_check_print_event_info(struct machine_check_event *evt,
evt->disposition == MCE_DISPOSITION_RECOVERED ? evt->disposition == MCE_DISPOSITION_RECOVERED ?
"Recovered" : "Not recovered"); "Recovered" : "Not recovered");
if (user_mode) { if (in_guest) {
printk("%s Guest NIP: %016llx\n", level, evt->srr0);
} else if (user_mode) {
printk("%s NIP: [%016llx] PID: %d Comm: %s\n", level, printk("%s NIP: [%016llx] PID: %d Comm: %s\n", level,
evt->srr0, current->pid, current->comm); evt->srr0, current->pid, current->comm);
} else { } else {

4
arch/powerpc/kvm/book3s_hv.c
View File

@ -1216,7 +1216,7 @@ static int kvmppc_handle_exit_hv(struct kvm_run *run, struct kvm_vcpu *vcpu,
break; break;
case BOOK3S_INTERRUPT_MACHINE_CHECK: case BOOK3S_INTERRUPT_MACHINE_CHECK:
/* Print the MCE event to host console. */ /* Print the MCE event to host console. */
machine_check_print_event_info(&vcpu->arch.mce_evt, false); machine_check_print_event_info(&vcpu->arch.mce_evt, false, true);
/* /*
* If the guest can do FWNMI, exit to userspace so it can * If the guest can do FWNMI, exit to userspace so it can
@ -1406,7 +1406,7 @@ static int kvmppc_handle_nested_exit(struct kvm_run *run, struct kvm_vcpu *vcpu)
/* Pass the machine check to the L1 guest */ /* Pass the machine check to the L1 guest */
r = RESUME_HOST; r = RESUME_HOST;
/* Print the MCE event to host console. */ /* Print the MCE event to host console. */
machine_check_print_event_info(&vcpu->arch.mce_evt, false); machine_check_print_event_info(&vcpu->arch.mce_evt, false, true);
break; break;
/* /*
* We get these next two if the guest accesses a page which it thinks * We get these next two if the guest accesses a page which it thinks

2
arch/powerpc/platforms/powernv/opal.c
View File

@ -587,7 +587,7 @@ int opal_machine_check(struct pt_regs *regs)
evt.version); evt.version);
return 0; return 0;
} }
machine_check_print_event_info(&evt, user_mode(regs)); machine_check_print_event_info(&evt, user_mode(regs), false);
if (opal_recover_mce(regs, &evt)) if (opal_recover_mce(regs, &evt))
return 1; return 1;