mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
d19e789f06
Linus pointed out that compiler.h - which is a key header that gets included in every
single one of the 28,000+ kernel files during a kernel build - was bloated in:
6553896666: ("vmlinux.lds.h: Create section for protection against instrumentation")
Linus noted:
> I have pulled this, but do we really want to add this to a header file
> that is _so_ core that it gets included for basically every single
> file built?
>
> I don't even see those instrumentation_begin/end() things used
> anywhere right now.
>
> It seems excessive. That 53 lines is maybe not a lot, but it pushed
> that header file to over 12kB, and while it's mostly comments, it's
> extra IO and parsing basically for _every_ single file compiled in the
> kernel.
>
> For what appears to be absolutely zero upside right now, and I really
> don't see why this should be in such a core header file!
Move these primitives into a new header: <linux/instrumentation.h>, and include that
header in the headers that make use of it.
Unfortunately one of these headers is asm-generic/bug.h, which does get included
in a lot of places, similarly to compiler.h. So the de-bloating effect isn't as
good as we'd like it to be - but at least the interfaces are defined separately.
No change to functionality intended.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200604071921.GA1361070@gmail.com
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Peter Zijlstra <peterz@infradead.org>
95 lines
2.5 KiB
C
95 lines
2.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_X86_BUG_H
|
|
#define _ASM_X86_BUG_H
|
|
|
|
#include <linux/stringify.h>
|
|
#include <linux/instrumentation.h>
|
|
|
|
/*
|
|
* Despite that some emulators terminate on UD2, we use it for WARN().
|
|
*
|
|
* Since various instruction decoders/specs disagree on the encoding of
|
|
* UD0/UD1.
|
|
*/
|
|
|
|
#define ASM_UD0 ".byte 0x0f, 0xff" /* + ModRM (for Intel) */
|
|
#define ASM_UD1 ".byte 0x0f, 0xb9" /* + ModRM */
|
|
#define ASM_UD2 ".byte 0x0f, 0x0b"
|
|
|
|
#define INSN_UD0 0xff0f
|
|
#define INSN_UD2 0x0b0f
|
|
|
|
#define LEN_UD2 2
|
|
|
|
#ifdef CONFIG_GENERIC_BUG
|
|
|
|
#ifdef CONFIG_X86_32
|
|
# define __BUG_REL(val) ".long " __stringify(val)
|
|
#else
|
|
# define __BUG_REL(val) ".long " __stringify(val) " - 2b"
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
|
|
|
#define _BUG_FLAGS(ins, flags) \
|
|
do { \
|
|
asm_inline volatile("1:\t" ins "\n" \
|
|
".pushsection __bug_table,\"aw\"\n" \
|
|
"2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \
|
|
"\t" __BUG_REL(%c0) "\t# bug_entry::file\n" \
|
|
"\t.word %c1" "\t# bug_entry::line\n" \
|
|
"\t.word %c2" "\t# bug_entry::flags\n" \
|
|
"\t.org 2b+%c3\n" \
|
|
".popsection" \
|
|
: : "i" (__FILE__), "i" (__LINE__), \
|
|
"i" (flags), \
|
|
"i" (sizeof(struct bug_entry))); \
|
|
} while (0)
|
|
|
|
#else /* !CONFIG_DEBUG_BUGVERBOSE */
|
|
|
|
#define _BUG_FLAGS(ins, flags) \
|
|
do { \
|
|
asm_inline volatile("1:\t" ins "\n" \
|
|
".pushsection __bug_table,\"aw\"\n" \
|
|
"2:\t" __BUG_REL(1b) "\t# bug_entry::bug_addr\n" \
|
|
"\t.word %c0" "\t# bug_entry::flags\n" \
|
|
"\t.org 2b+%c1\n" \
|
|
".popsection" \
|
|
: : "i" (flags), \
|
|
"i" (sizeof(struct bug_entry))); \
|
|
} while (0)
|
|
|
|
#endif /* CONFIG_DEBUG_BUGVERBOSE */
|
|
|
|
#else
|
|
|
|
#define _BUG_FLAGS(ins, flags) asm volatile(ins)
|
|
|
|
#endif /* CONFIG_GENERIC_BUG */
|
|
|
|
#define HAVE_ARCH_BUG
|
|
#define BUG() \
|
|
do { \
|
|
instrumentation_begin(); \
|
|
_BUG_FLAGS(ASM_UD2, 0); \
|
|
unreachable(); \
|
|
} while (0)
|
|
|
|
/*
|
|
* This instrumentation_begin() is strictly speaking incorrect; but it
|
|
* suppresses the complaints from WARN()s in noinstr code. If such a WARN()
|
|
* were to trigger, we'd rather wreck the machine in an attempt to get the
|
|
* message out than not know about it.
|
|
*/
|
|
#define __WARN_FLAGS(flags) \
|
|
do { \
|
|
instrumentation_begin(); \
|
|
_BUG_FLAGS(ASM_UD2, BUGFLAG_WARNING|(flags)); \
|
|
annotate_reachable(); \
|
|
instrumentation_end(); \
|
|
} while (0)
|
|
|
|
#include <asm-generic/bug.h>
|
|
|
|
#endif /* _ASM_X86_BUG_H */
|