x86/entry: __always_inline debugreg for noinstr

Peter Zijlstra · KAGA-KOKO · commit 28eaf87121ab · 2020-06-11T15:15:26.000+02:00
vmlinux.o: warning: objtool: exc_debug()+0x21: call to native_get_debugreg() leaves .noinstr.text section Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lkml.kernel.org/r/20200603114051.954401211@infradead.org
diff --git a/arch/x86/include/asm/debugreg.h b/arch/x86/include/asm/debugreg.h
@@ -18,7 +18,7 @@ DECLARE_PER_CPU(unsigned long, cpu_dr7);
 	native_set_debugreg(register, value)
 #endif
 
-static inline unsigned long native_get_debugreg(int regno)
+static __always_inline unsigned long native_get_debugreg(int regno)
 {
 	unsigned long val = 0;	/* Damn you, gcc! */
 
@@ -47,7 +47,7 @@ static inline unsigned long native_get_debugreg(int regno)
 	return val;
 }
 
-static inline void native_set_debugreg(int regno, unsigned long value)
+static __always_inline void native_set_debugreg(int regno, unsigned long value)
 {
 	switch (regno) {
 	case 0:
@@ -85,7 +85,7 @@ static inline void hw_breakpoint_disable(void)
 	set_debugreg(0UL, 3);
 }
 
-static inline bool hw_breakpoint_active(void)
+static __always_inline bool hw_breakpoint_active(void)
 {
 	return __this_cpu_read(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;
 }

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ DECLARE_PER_CPU(unsigned long, cpu_dr7);`
`18`	`18`	`native_set_debugreg(register, value)`
`19`	`19`	`#endif`
`20`	`20`
`21`		`-static inline unsigned long native_get_debugreg(int regno)`
	`21`	`+static __always_inline unsigned long native_get_debugreg(int regno)`
`22`	`22`	`{`
`23`	`23`	`unsigned long val = 0; /* Damn you, gcc! */`
`24`	`24`
`@@ -47,7 +47,7 @@ static inline unsigned long native_get_debugreg(int regno)`
`47`	`47`	`return val;`
`48`	`48`	`}`
`49`	`49`
`50`		`-static inline void native_set_debugreg(int regno, unsigned long value)`
	`50`	`+static __always_inline void native_set_debugreg(int regno, unsigned long value)`
`51`	`51`	`{`
`52`	`52`	`switch (regno) {`
`53`	`53`	`case 0:`
`@@ -85,7 +85,7 @@ static inline void hw_breakpoint_disable(void)`
`85`	`85`	`set_debugreg(0UL, 3);`
`86`	`86`	`}`
`87`	`87`
`88`		`-static inline bool hw_breakpoint_active(void)`
	`88`	`+static __always_inline bool hw_breakpoint_active(void)`
`89`	`89`	`{`
`90`	`90`	`return __this_cpu_read(cpu_dr7) & DR_GLOBAL_ENABLE_MASK;`
`91`	`91`	`}`