mirror of
https://gitee.com/bianbu-linux/linux-6.6
synced 2025-04-24 14:07:52 -04:00
69505e3d9a
With CONFIG_GENERIC_BUG_RELATIVE_POINTERS, the addr/file relative pointers are calculated weirdly: based on the beginning of the bug_entry struct address, rather than their respective pointer addresses. Make the relative pointers less surprising to both humans and tools by calculating them the normal way. Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Reviewed-by: Mark Rutland <mark.rutland@arm.com> Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Sven Schnelle <svens@linux.ibm.com> # s390 Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc) Acked-by: Catalin Marinas <catalin.marinas@arm.com> Tested-by: Mark Rutland <mark.rutland@arm.com> [arm64] Link: https://lkml.kernel.org/r/f0e05be797a16f4fc2401eeb88c8450dcbe61df6.1652362951.git.jpoimboe@kernel.org
89 lines
2.4 KiB
C
89 lines
2.4 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>
|
|
#include <linux/objtool.h>
|
|
|
|
/*
|
|
* Despite that some emulators terminate on UD2, we use it for WARN().
|
|
*/
|
|
#define ASM_UD2 ".byte 0x0f, 0x0b"
|
|
#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) " - ."
|
|
#endif
|
|
|
|
#ifdef CONFIG_DEBUG_BUGVERBOSE
|
|
|
|
#define _BUG_FLAGS(ins, flags, extra) \
|
|
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\n" \
|
|
extra \
|
|
: : "i" (__FILE__), "i" (__LINE__), \
|
|
"i" (flags), \
|
|
"i" (sizeof(struct bug_entry))); \
|
|
} while (0)
|
|
|
|
#else /* !CONFIG_DEBUG_BUGVERBOSE */
|
|
|
|
#define _BUG_FLAGS(ins, flags, extra) \
|
|
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\n" \
|
|
extra \
|
|
: : "i" (flags), \
|
|
"i" (sizeof(struct bug_entry))); \
|
|
} while (0)
|
|
|
|
#endif /* CONFIG_DEBUG_BUGVERBOSE */
|
|
|
|
#else
|
|
|
|
#define _BUG_FLAGS(ins, flags, extra) asm volatile(ins)
|
|
|
|
#endif /* CONFIG_GENERIC_BUG */
|
|
|
|
#define HAVE_ARCH_BUG
|
|
#define BUG() \
|
|
do { \
|
|
instrumentation_begin(); \
|
|
_BUG_FLAGS(ASM_UD2, 0, ""); \
|
|
__builtin_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 { \
|
|
__auto_type f = BUGFLAG_WARNING|(flags); \
|
|
instrumentation_begin(); \
|
|
_BUG_FLAGS(ASM_UD2, f, ASM_REACHABLE); \
|
|
instrumentation_end(); \
|
|
} while (0)
|
|
|
|
#include <asm-generic/bug.h>
|
|
|
|
#endif /* _ASM_X86_BUG_H */
|