hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kernel/printk: use symbolic defines for console loglevels 

... instead of naked numbers.

Stuff in sysrq.c used to set it to 8 which is supposed to mean above
default level so set it to DEBUG instead as we're terminating/killing all
tasks and we want to be verbose there.

Also, correct the check in x86_64_start_kernel which should be >= as
we're clearly issuing the string there for all debug levels, not only
the magical 10.

Signed-off-by: Borislav Petkov <bp@suse.de>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Joe Perches <joe@perches.com>
Cc: Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Borislav Petkov 2014-06-04 16:11:46 -07:00 committed by Linus Torvalds
parent 84b5ec8a9d
commit a8fe19ebfb
10 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/head64.c
View File

@ -172,7 +172,7 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
*/ */
load_ucode_bsp(); load_ucode_bsp();
if (console_loglevel == 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
early_printk("Kernel alive\n"); early_printk("Kernel alive\n");
clear_page(init_level4_pgt); clear_page(init_level4_pgt);

2
arch/x86/platform/uv/uv_nmi.c
View File

@ -85,7 +85,7 @@ static cpumask_var_t uv_nmi_cpu_mask;
* Default is all stack dumps go to the console and buffer. * Default is all stack dumps go to the console and buffer.
* Lower level to send to log buffer only. * Lower level to send to log buffer only.
*/ */
static int uv_nmi_loglevel = 7; static int uv_nmi_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
module_param_named(dump_loglevel, uv_nmi_loglevel, int, 0644); module_param_named(dump_loglevel, uv_nmi_loglevel, int, 0644);
/* /*

18
drivers/nubus/nubus.c
View File

@ -473,7 +473,7 @@ static struct nubus_dev* __init
if (slot == 0 && (unsigned long)dir.base % 2) if (slot == 0 && (unsigned long)dir.base % 2)
dir.base += 1; dir.base += 1;
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_functional_resource: parent is 0x%p, dir is 0x%p\n", printk(KERN_DEBUG "nubus_get_functional_resource: parent is 0x%p, dir is 0x%p\n",
parent->base, dir.base); parent->base, dir.base);
@ -568,7 +568,7 @@ static int __init nubus_get_vidnames(struct nubus_board* board,
printk(KERN_INFO " video modes supported:\n"); printk(KERN_INFO " video modes supported:\n");
nubus_get_subdir(parent, &dir); nubus_get_subdir(parent, &dir);
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_vidnames: parent is 0x%p, dir is 0x%p\n", printk(KERN_DEBUG "nubus_get_vidnames: parent is 0x%p, dir is 0x%p\n",
parent->base, dir.base); parent->base, dir.base);
@ -629,7 +629,7 @@ static int __init nubus_get_vendorinfo(struct nubus_board* board,
printk(KERN_INFO " vendor info:\n"); printk(KERN_INFO " vendor info:\n");
nubus_get_subdir(parent, &dir); nubus_get_subdir(parent, &dir);
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_vendorinfo: parent is 0x%p, dir is 0x%p\n", printk(KERN_DEBUG "nubus_get_vendorinfo: parent is 0x%p, dir is 0x%p\n",
parent->base, dir.base); parent->base, dir.base);
@ -654,7 +654,7 @@ static int __init nubus_get_board_resource(struct nubus_board* board, int slot,
struct nubus_dirent ent; struct nubus_dirent ent;
nubus_get_subdir(parent, &dir); nubus_get_subdir(parent, &dir);
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_board_resource: parent is 0x%p, dir is 0x%p\n", printk(KERN_DEBUG "nubus_get_board_resource: parent is 0x%p, dir is 0x%p\n",
parent->base, dir.base); parent->base, dir.base);
@ -753,19 +753,19 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
if (nubus_readdir(&dir, &ent) == -1) if (nubus_readdir(&dir, &ent) == -1)
goto badrom; goto badrom;
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* This one takes us to where we want to go. */ /* This one takes us to where we want to go. */
if (nubus_readdir(&dir, &ent) == -1) if (nubus_readdir(&dir, &ent) == -1)
goto badrom; goto badrom;
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
nubus_get_subdir(&ent, &dir); nubus_get_subdir(&ent, &dir);
/* Resource ID 01, also an "Unknown Macintosh" */ /* Resource ID 01, also an "Unknown Macintosh" */
if (nubus_readdir(&dir, &ent) == -1) if (nubus_readdir(&dir, &ent) == -1)
goto badrom; goto badrom;
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* FIXME: the first one is *not* always the right one. We /* FIXME: the first one is *not* always the right one. We
@ -780,7 +780,7 @@ static void __init nubus_find_rom_dir(struct nubus_board* board)
path to that address... */ path to that address... */
if (nubus_readdir(&dir, &ent) == -1) if (nubus_readdir(&dir, &ent) == -1)
goto badrom; goto badrom;
if (console_loglevel >= 10) if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data); printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* Bwahahahaha... */ /* Bwahahahaha... */
@ -816,7 +816,7 @@ static struct nubus_board* __init nubus_add_board(int slot, int bytelanes)
board->fblock = rp; board->fblock = rp;
/* Dump the format block for debugging purposes */ /* Dump the format block for debugging purposes */
if (console_loglevel >= 10) { if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG) {
int i; int i;
printk(KERN_DEBUG "Slot %X, format block at 0x%p\n", printk(KERN_DEBUG "Slot %X, format block at 0x%p\n",
slot, rp); slot, rp);

8
drivers/tty/sysrq.c
View File

@ -88,7 +88,7 @@ static void sysrq_handle_loglevel(int key)
int i; int i;
i = key - '0'; i = key - '0';
console_loglevel = 7; console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
printk("Loglevel set to %d\n", i); printk("Loglevel set to %d\n", i);
console_loglevel = i; console_loglevel = i;
} }
@ -343,7 +343,7 @@ static void send_sig_all(int sig)
static void sysrq_handle_term(int key) static void sysrq_handle_term(int key)
{ {
send_sig_all(SIGTERM); send_sig_all(SIGTERM);
console_loglevel = 8; console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
} }
static struct sysrq_key_op sysrq_term_op = { static struct sysrq_key_op sysrq_term_op = {
.handler = sysrq_handle_term, .handler = sysrq_handle_term,
@ -387,7 +387,7 @@ static struct sysrq_key_op sysrq_thaw_op = {
static void sysrq_handle_kill(int key) static void sysrq_handle_kill(int key)
{ {
send_sig_all(SIGKILL); send_sig_all(SIGKILL);
console_loglevel = 8; console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
} }
static struct sysrq_key_op sysrq_kill_op = { static struct sysrq_key_op sysrq_kill_op = {
.handler = sysrq_handle_kill, .handler = sysrq_handle_kill,
@ -520,7 +520,7 @@ void __handle_sysrq(int key, bool check_mask)
* routing in the consumers of /proc/kmsg. * routing in the consumers of /proc/kmsg.
*/ */
orig_log_level = console_loglevel; orig_log_level = console_loglevel;
console_loglevel = 7; console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
printk(KERN_INFO "SysRq : "); printk(KERN_INFO "SysRq : ");
op_p = __sysrq_get_key_op(key); op_p = __sysrq_get_key_op(key);

15
include/linux/printk.h
View File

@ -30,6 +30,17 @@ static inline const char *printk_skip_level(const char *buffer)
return buffer; return buffer;
} }
/* printk's without a loglevel use this.. */
#define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
/* We show everything that is MORE important than this.. */
#define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */
#define CONSOLE_LOGLEVEL_MIN 1 /* Minimum loglevel we let people use */
#define CONSOLE_LOGLEVEL_QUIET 4 /* Shhh ..., when booted with "quiet" */
#define CONSOLE_LOGLEVEL_DEFAULT 7 /* anything MORE serious than KERN_DEBUG */
#define CONSOLE_LOGLEVEL_DEBUG 10 /* issue debug messages */
#define CONSOLE_LOGLEVEL_MOTORMOUTH 15 /* You can't shut this one up */
extern int console_printk[]; extern int console_printk[];
#define console_loglevel (console_printk[0]) #define console_loglevel (console_printk[0])
@ -39,13 +50,13 @@ extern int console_printk[];
static inline void console_silent(void) static inline void console_silent(void)
{ {
console_loglevel = 0; console_loglevel = CONSOLE_LOGLEVEL_SILENT;
} }
static inline void console_verbose(void) static inline void console_verbose(void)
{ {
if (console_loglevel) if (console_loglevel)
console_loglevel = 15; console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
} }
struct va_format { struct va_format {

4
init/main.c
View File

@ -203,13 +203,13 @@ EXPORT_SYMBOL(loops_per_jiffy);
static int __init debug_kernel(char *str) static int __init debug_kernel(char *str)
{ {
console_loglevel = 10; console_loglevel = CONSOLE_LOGLEVEL_DEBUG;
return 0; return 0;
} }
static int __init quiet_kernel(char *str) static int __init quiet_kernel(char *str)
{ {
console_loglevel = 4; console_loglevel = CONSOLE_LOGLEVEL_QUIET;
return 0; return 0;
} }

2
kernel/debug/kdb/kdb_bt.c
View File

@ -21,7 +21,7 @@
static void kdb_show_stack(struct task_struct *p, void *addr) static void kdb_show_stack(struct task_struct *p, void *addr)
{ {
int old_lvl = console_loglevel; int old_lvl = console_loglevel;
console_loglevel = 15; console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
kdb_trap_printk++; kdb_trap_printk++;
kdb_set_current_task(p); kdb_set_current_task(p);
if (addr) { if (addr) {

2
kernel/debug/kdb/kdb_io.c
View File

@ -710,7 +710,7 @@ kdb_printit:
} }
if (logging) { if (logging) {
saved_loglevel = console_loglevel; saved_loglevel = console_loglevel;
console_loglevel = 0; console_loglevel = CONSOLE_LOGLEVEL_SILENT;
printk(KERN_INFO "%s", kdb_buffer); printk(KERN_INFO "%s", kdb_buffer);
} }

2
kernel/debug/kdb/kdb_main.c
View File

@ -1091,7 +1091,7 @@ static int kdb_reboot(int argc, const char **argv)
static void kdb_dumpregs(struct pt_regs *regs) static void kdb_dumpregs(struct pt_regs *regs)
{ {
int old_lvl = console_loglevel; int old_lvl = console_loglevel;
console_loglevel = 15; console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
kdb_trap_printk++; kdb_trap_printk++;
show_regs(regs); show_regs(regs);
kdb_trap_printk--; kdb_trap_printk--;

13
kernel/printk/printk.c
View File

@ -54,18 +54,11 @@
#include "console_cmdline.h" #include "console_cmdline.h"
#include "braille.h" #include "braille.h"
/* printk's without a loglevel use this.. */
#define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
/* We show everything that is MORE important than this.. */
#define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
#define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
int console_printk[4] = { int console_printk[4] = {
DEFAULT_CONSOLE_LOGLEVEL, /* console_loglevel */ CONSOLE_LOGLEVEL_DEFAULT, /* console_loglevel */
DEFAULT_MESSAGE_LOGLEVEL, /* default_message_loglevel */ DEFAULT_MESSAGE_LOGLEVEL, /* default_message_loglevel */
MINIMUM_CONSOLE_LOGLEVEL, /* minimum_console_loglevel */ CONSOLE_LOGLEVEL_MIN, /* minimum_console_loglevel */
DEFAULT_CONSOLE_LOGLEVEL, /* default_console_loglevel */ CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */
}; };
/* Deferred messaged from sched code are marked by this special level */ /* Deferred messaged from sched code are marked by this special level */