Re: [PATCH 1/2] Make lib/bug.c WARN implementation match thekernel/panic.c one

[Kirill A. Shutemov]

On Sun, Jun 27, 2010 at 05:10:59AM +1000, Anton Blanchard wrote:
> 
> There are a few issues with the exception based WARN implementation in
> lib/bug.c:
> 
> - Inconsistent printk flags. The "cut here" line is printed at KERN_EMERG, so
>   the console and all logged in users see the single line:
> 
> ------------[ cut here ]------------
> 
>   for each WARN. Fix this so we print everything at KERN_WARNING to match the
>   kernel/panic.c version.
> 
> - The lib/bug.c WARN would print "Badness at". Change it to match the
>   kernel/panic.c version which prints "WARNING: at". 
> 
> - Print the list of modules, similar to kernel/panic.c of modules, similar to
>   kernel/panic.c
> 
> Signed-off-by: Anton Blanchard <anton@xxxxxxxxx>
> ---
> 
> Index: linux-2.6/lib/bug.c
> ===================================================================
> --- linux-2.6.orig/lib/bug.c	2010-06-26 06:09:59.000000000 +1000
> +++ linux-2.6/lib/bug.c	2010-06-26 06:24:28.000000000 +1000
> @@ -136,8 +136,6 @@ enum bug_trap_type report_bug(unsigned l
>  
>  	bug = find_bug(bugaddr);
>  
> -	printk(KERN_EMERG "------------[ cut here ]------------\n");
> -
>  	file = NULL;
>  	line = 0;
>  	warning = 0;
> @@ -156,19 +154,24 @@ enum bug_trap_type report_bug(unsigned l
>  
>  	if (warning) {
>  		/* this is a WARN_ON rather than BUG/BUG_ON */
> +		printk(KERN_WARNING "------------[ cut here ]------------\n");
> +
>  		if (file)
> -			printk(KERN_ERR "Badness at %s:%u\n",
> +			printk(KERN_WARNING "WARNING: at %s:%u\n",
>  			       file, line);
>  		else
> -			printk(KERN_ERR "Badness at %p "
> +			printk(KERN_WARNING "WARNING: at %p "
>  			       "[verbose debug info unavailable]\n",
>  			       (void *)bugaddr);
>  
> +        	print_modules();
>  		show_regs(regs);
>  		add_taint(BUG_GET_TAINT(bug));
>  		return BUG_TRAP_TYPE_WARN;
>  	}
>  
> +	printk(KERN_EMERG "------------[ cut here ]------------\n");
> +

Hm... Why do you use KERN_EMERG here?

>  	if (file)
>  		printk(KERN_CRIT "kernel BUG at %s:%u!\n",
>  		       file, line);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

-- 
 Kirill A. Shutemov
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/