Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05e36006 authored by Liu, Jinsong's avatar Liu, Jinsong Committed by Konrad Rzeszutek Wilk
Browse files

xen/mce: Register native mce handler as vMCE bounce back point 



When Xen hypervisor inject vMCE to guest, use native mce handler
to handle it

Signed-off-by: default avatarKe, Liping <liping.ke@intel.com>
Signed-off-by: default avatarJiang, Yunhong <yunhong.jiang@intel.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarLiu, Jinsong <jinsong.liu@intel.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent a8fccdb0

arch/x86/xen/enlighten.c

+7 −3
Original line number Diff line number Diff line
@@ -626,8 +626,8 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val, 
	/*

	 * Look for known traps using IST, and substitute them

	 * appropriately.  The debugger ones are the only ones we care

	 * about.  Xen will handle faults like double_fault and

	 * machine_check, so we should never see them.  Warn if

	 * about.  Xen will handle faults like double_fault,

	 * so we should never see them.  Warn if

	 * there's an unexpected IST-using fault handler.

	 */

	if (addr == (unsigned long)debug)
@@ -642,7 +642,11 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val, 
		return 0;

#ifdef CONFIG_X86_MCE

	} else if (addr == (unsigned long)machine_check) {

		return 0;

		/*

		 * when xen hypervisor inject vMCE to guest,

		 * use native mce handler to handle it

		 */

		;

#endif

	} else {

		/* Some other trap using IST? */