Commit f4afb713 authored by Peter Zijlstra's avatar Peter Zijlstra
Browse files

x86/xen: Make get_debugreg() noinstr 



vmlinux.o: warning: objtool: pv_ops[1]: xen_get_debugreg
vmlinux.o: warning: objtool: pv_ops[1]: native_get_debugreg
vmlinux.o: warning: objtool: exc_debug()+0x25: call to pv_ops[1]() leaves .noinstr.text section

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20210624095148.625523645@infradead.org
parent 209cfd0c

arch/x86/include/asm/paravirt.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static inline void __cpuid(unsigned int *eax, unsigned int *ebx, 
/*

 * These special macros can be used to get or set a debugging register

 */

static inline unsigned long paravirt_get_debugreg(int reg)

static __always_inline unsigned long paravirt_get_debugreg(int reg)

{

	return PVOP_CALL1(unsigned long, cpu.get_debugreg, reg);

}

arch/x86/include/asm/xen/hypercall.h

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ HYPERVISOR_set_debugreg(int reg, unsigned long value) 
	return _hypercall2(int, set_debugreg, reg, value);

}



static inline unsigned long

static __always_inline unsigned long

HYPERVISOR_get_debugreg(int reg)

{

	return _hypercall1(unsigned long, get_debugreg, reg);

arch/x86/kernel/paravirt.c

+6 −2
Original line number Diff line number Diff line
@@ -228,6 +228,11 @@ static noinstr void pv_native_write_cr2(unsigned long val) 
{

	native_write_cr2(val);

}



static noinstr unsigned long pv_native_get_debugreg(int regno)

{

	return native_get_debugreg(regno);

}

#endif



enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
@@ -254,7 +259,7 @@ struct paravirt_patch_template pv_ops = { 


#ifdef CONFIG_PARAVIRT_XXL

	.cpu.cpuid		= native_cpuid,

	.cpu.get_debugreg	= native_get_debugreg,

	.cpu.get_debugreg	= pv_native_get_debugreg,

	.cpu.set_debugreg	= native_set_debugreg,

	.cpu.read_cr0		= native_read_cr0,

	.cpu.write_cr0		= native_write_cr0,
@@ -382,7 +387,6 @@ struct paravirt_patch_template pv_ops = { 


#ifdef CONFIG_PARAVIRT_XXL

/* At this point, native_get/set_debugreg has real function entries */

NOKPROBE_SYMBOL(native_get_debugreg);

NOKPROBE_SYMBOL(native_set_debugreg);

NOKPROBE_SYMBOL(native_load_idt);

arch/x86/xen/enlighten_pv.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static void xen_set_debugreg(int reg, unsigned long val) 
	HYPERVISOR_set_debugreg(reg, val);

}



static unsigned long xen_get_debugreg(int reg)

static noinstr unsigned long xen_get_debugreg(int reg)

{

	return HYPERVISOR_get_debugreg(reg);

}