[PATCH] Generic BUG implementation (7664c5a1) · Commits · 戴 / test

This patch adds common handling for kernel BUGs, for use by architectures as they wish. The code is derived from arch/powerpc. The advantages of having common BUG handling are: - consistent BUG reporting across architectures - shared implementation of out-of-line file/line data - implement CONFIG_DEBUG_BUGVERBOSE consistently This means that in inline impact of BUG is just the illegal instruction itself, which is an improvement for i386 and x86-64. A BUG is represented in the instruction stream as an illegal instruction, which has file/line information associated with it. This extra information is stored in the __bug_table section in the ELF file. When the kernel gets an illegal instruction, it first confirms it might possibly be from a BUG (ie, in kernel mode, the right illegal instruction). It then calls report_bug(). This searches __bug_table for a matching instruction pointer, and if found, prints the corresponding file/line information. If report_bug() determines that it wasn't a BUG which caused the trap, it returns BUG_TRAP_TYPE_NONE. Some architectures (powerpc) implement WARN using the same mechanism; if the illegal instruction was the result of a WARN, then report_bug(Q) returns CONFIG_DEBUG_BUGVERBOSE; otherwise it returns BUG_TRAP_TYPE_BUG. lib/bug.c keeps a list of loaded modules which can be searched for __bug_table entries. The architecture must call module_bug_finalize()/module_bug_cleanup() from its corresponding module_finalize/cleanup functions. Unsetting CONFIG_DEBUG_BUGVERBOSE will reduce the kernel size by some amount. At the very least, filename and line information will not be recorded for each but, but architectures may decide to store no extra information per BUG at all. Unfortunately, gcc doesn't have a general way to mark an asm() as noreturn, so architectures will generally have to include an infinite loop (or similar) in the BUG code, so that gcc knows execution won't continue beyond that point. gcc does have a __builtin_trap() operator which may be useful to achieve the same effect, unfortunately it cannot be used to actually implement the BUG itself, because there's no way to get the instruction's address for use in generating the __bug_table entry. [randy.dunlap@oracle.com: Handle BUG=n, GENERIC_BUG=n to prevent build errors] [bunk@stusta.de: include/linux/bug.h must always #include <linux/module.h] Signed-off-by:

Jeremy Fitzhardinge <jeremy@goop.org> Cc: Andi Kleen <ak@muc.de> Cc: Hugh Dickens <hugh@veritas.com> Cc: Michael Ellerman <michael@ellerman.id.au> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by:

Adrian Bunk <bunk@stusta.de> Signed-off-by:

Andrew Morton <akpm@osdl.org> Signed-off-by:

Linus Torvalds <torvalds@osdl.org>

include/asm-generic/bug.h

+16 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,22 @@
		#include <linux/compiler.h>

		#ifdef CONFIG_BUG

		#ifdef CONFIG_GENERIC_BUG
		#ifndef __ASSEMBLY__
		struct bug_entry {
		unsigned long bug_addr;
		#ifdef CONFIG_DEBUG_BUGVERBOSE
		const char *file;
		unsigned short line;
		#endif
		unsigned short flags;
		};
		#endif /* __ASSEMBLY__ */

		#define BUGFLAG_WARNING (1<<0)
		#endif /* CONFIG_GENERIC_BUG */

		#ifndef HAVE_ARCH_BUG
		#define BUG() do { \
		printk("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __FUNCTION__); \

include/asm-generic/vmlinux.lds.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -218,6 +218,14 @@
		.stab.indexstr 0 : { *(.stab.indexstr) } \
		.comment 0 : { *(.comment) }

		#define BUG_TABLE \
		. = ALIGN(8); \
		__bug_table : AT(ADDR(__bug_table) - LOAD_OFFSET) { \
		__start___bug_table = .; \
		*(__bug_table) \
		__stop___bug_table = .; \
		}

		#define NOTES \
		.notes : { (.note.) } :note

include/linux/bug.h

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		#ifndef _LINUX_BUG_H
		#define _LINUX_BUG_H

		#include <linux/module.h>
		#include <asm/bug.h>

		enum bug_trap_type {
		BUG_TRAP_TYPE_NONE = 0,
		BUG_TRAP_TYPE_WARN = 1,
		BUG_TRAP_TYPE_BUG = 2,
		};

		#ifdef CONFIG_GENERIC_BUG
		#include <asm-generic/bug.h>

		static inline int is_warning_bug(const struct bug_entry *bug)
		{
		return bug->flags & BUGFLAG_WARNING;
		}

		const struct bug_entry *find_bug(unsigned long bugaddr);

		enum bug_trap_type report_bug(unsigned long bug_addr);

		int module_bug_finalize(const Elf_Ehdr , const Elf_Shdr ,
		struct module *);
		void module_bug_cleanup(struct module *);

		/* These are defined by the architecture */
		int is_valid_bugaddr(unsigned long addr);

		#else /* !CONFIG_GENERIC_BUG */

		static inline enum bug_trap_type report_bug(unsigned long bug_addr)
		{
		return BUG_TRAP_TYPE_BUG;
		}
		static inline int module_bug_finalize(const Elf_Ehdr *hdr,
		const Elf_Shdr *sechdrs,
		struct module *mod)
		{
		return 0;
		}
		static inline void module_bug_cleanup(struct module *mod) {}

		#endif /* CONFIG_GENERIC_BUG */
		#endif /* _LINUX_BUG_H */

include/linux/module.h

+7 −0

Original line number	Diff line number	Diff line
		@@ -319,6 +319,13 @@ struct module

		unsigned int taints; /* same bits as kernel:tainted */

		#ifdef CONFIG_GENERIC_BUG
		/* Support for BUG */
		struct list_head bug_list;
		struct bug_entry *bug_table;
		unsigned num_bugs;
		#endif

		#ifdef CONFIG_MODULE_UNLOAD
		/* Reference counts */
		struct module_ref ref[NR_CPUS];

lib/Kconfig.debug

+1 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,7 @@ config DEBUG_HIGHMEM
		config DEBUG_BUGVERBOSE
		bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
		depends on BUG
		depends on ARM \|\| ARM26 \|\| AVR32 \|\| M32R \|\| M68K \|\| SPARC32 \|\| SPARC64 \|\| X86_32 \|\| FRV \|\| SUPERH
		depends on ARM \|\| ARM26 \|\| AVR32 \|\| M32R \|\| M68K \|\| SPARC32 \|\| SPARC64 \|\| X86_32 \|\| FRV \|\| SUPERH \|\| GENERIC_BUG
		default !EMBEDDED
		help
		Say Y here to make BUG() panics output the file name and line number

Admin message