x86/xen: Fix noinstr fail in exc_xen_unknown_trap()

Peter Zijlstra · Ingo Molnar · commit 4c9c26f1e676 · 2021-06-22T13:56:42.000+02:00
Fix: vmlinux.o: warning: objtool: exc_xen_unknown_trap()+0x7: call to printk() leaves .noinstr.text section Fixes: 2e92493 ("x86/xen: avoid warning in Xen pv guest with CONFIG_AMD_MEM_ENCRYPT enabled") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/20210621120120.606560778@infradead.org
diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c
@@ -592,8 +592,10 @@ DEFINE_IDTENTRY_RAW(xenpv_exc_debug)
 DEFINE_IDTENTRY_RAW(exc_xen_unknown_trap)
 {
 	/* This should never happen and there is no way to handle it. */
+	instrumentation_begin();
 	pr_err("Unknown trap in Xen PV mode.");
 	BUG();
+	instrumentation_end();
 }
 
 #ifdef CONFIG_X86_MCE

Original file line number	Diff line number	Diff line change
`@@ -592,8 +592,10 @@ DEFINE_IDTENTRY_RAW(xenpv_exc_debug)`
`592`	`592`	`DEFINE_IDTENTRY_RAW(exc_xen_unknown_trap)`
`593`	`593`	`{`
`594`	`594`	`/* This should never happen and there is no way to handle it. */`
	`595`	`+ instrumentation_begin();`
`595`	`596`	`pr_err("Unknown trap in Xen PV mode.");`
`596`	`597`	`BUG();`
	`598`	`+ instrumentation_end();`
`597`	`599`	`}`
`598`	`600`
`599`	`601`	`#ifdef CONFIG_X86_MCE`