ia64: tweak BREAK_LOGLEVEL and RESTORE_LOGLEVEL
PATCH 1/1 ia64: tweak BREAK_LOGLEVEL and RESTORE_LOGLEVEL
a) Do not pass console_loglevel to macros, use console_loglevel directly.
b) Use CONSOLE_LOGLEVEL_MOTORMOUTH instead of a naked number
c) Use bust_spinlocks() to set/clear oops_in_progress
d) Fix checkpatch error: Macros with multiple statements should be enclosed in a do - while loop
--- arch/ia64/kernel/mca.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)
arch/ia64/kernel/mca.c +20 -16
@@ -188,19 +188,23 @@ static unsigned int mlogbuf_finished = 0;static unsigned long mlogbuf_timestamp =0 ;static int loglevel_save =-1 ; -#define BREAK_LOGLEVEL (__console_loglevel) \ - oops_in_progress = 1; \ - if (loglevel_save < 0) \ - loglevel_save = __console_loglevel; \ - __console_loglevel = 15; - -#define RESTORE_LOGLEVEL (__console_loglevel) \ - if (loglevel_save >= 0) { \ - __console_loglevel = loglevel_save; \ - loglevel_save = -1; \ - } \ - mlogbuf_finished = 0; \ - oops_in_progress = 0; +#define BREAK_LOGLEVEL () \ + do { \ + bust_spinlocks(1); \ + if (loglevel_save < 0) \ + loglevel_save = __console_loglevel; \ + console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH; \ + } while (0) + +#define RESTORE_LOGLEVEL () \ + do { \ + if (loglevel_save >= 0) { \ + console_loglevel = loglevel_save; \ + loglevel_save = -1; \ + } \ + mlogbuf_finished = 0; \ + bust_spinlocks(0); \ + } while (0)/* * Push messages into buffer, print them later if not urgent.
@@ -287,7 +291,7 @@ EXPORT_SYMBOL(ia64_mlogbuf_dump);*/ static void ia64_mlogbuf_finish (int wait) { -BREAK_LOGLEVEL (console_loglevel); +BREAK_LOGLEVEL ();spin_lock_init (&mlogbuf_rlock);ia64_mlogbuf_dump ();
@@ -1616,7 +1620,7 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voi* To enable show_stack from INIT, we use oops_in_progress which should * be used in real oops. This would cause something wrong after INIT. */ -BREAK_LOGLEVEL (console_loglevel); +BREAK_LOGLEVEL ();ia64_mlogbuf_dump_from_init ();printk (KERN_ERR "Processes interrupted by INIT -" );
@@ -1641,7 +1645,7 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voiread_unlock (&tasklist_lock); }/* FIXME: This will not restore zapped printk locks. */ -RESTORE_LOGLEVEL (console_loglevel); +RESTORE_LOGLEVEL ();return NOTIFY_DONE ; }
Signature · 1 line
2.20.1
kbuild test robot
build botI love your patch! Yet something to improve:
Hi Sergey,
I love your patch! Yet something to improve:
[auto build test ERROR on ia64/next]
[also build test ERROR on v5.0-rc1]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Sergey-Senozhatsky/ia64-tweak-BREAK_LOGLEVEL-and-RESTORE_LOGLEVEL/20190107-191240 base: https://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git next config: ia64-allmodconfig (attached as .config) compiler: ia64-linux-gcc (GCC) 8.1.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
GCC_VERSION=8.1.0 make.cross ARCH=ia64
All errors (new ones prefixed by >>):
arch/ia64/kernel/mca.c: In function 'ia64_mlogbuf_finish':
>> arch/ia64/kernel/mca.c:195:20: error: '__console_loglevel' undeclared (first use in this function); did you mean 'console_loglevel'?
loglevel_save = __console_loglevel; \
^~~~~~~~~~~~~~~~~~
arch/ia64/kernel/mca.c:294:2: note: in expansion of macro 'BREAK_LOGLEVEL'
BREAK_LOGLEVEL();
^~~~~~~~~~~~~~
arch/ia64/kernel/mca.c:195:20: note: each undeclared identifier is reported only once for each function it appears in
loglevel_save = __console_loglevel; \
^~~~~~~~~~~~~~~~~~
arch/ia64/kernel/mca.c:294:2: note: in expansion of macro 'BREAK_LOGLEVEL'
BREAK_LOGLEVEL();
^~~~~~~~~~~~~~
arch/ia64/kernel/mca.c: In function 'default_monarch_init_process':
>> arch/ia64/kernel/mca.c:195:20: error: '__console_loglevel' undeclared (first use in this function); did you mean 'console_loglevel'?
loglevel_save = __console_loglevel; \
^~~~~~~~~~~~~~~~~~
arch/ia64/kernel/mca.c:1623:2: note: in expansion of macro 'BREAK_LOGLEVEL'
BREAK_LOGLEVEL();
^~~~~~~~~~~~~~vim +195 arch/ia64/kernel/mca.c
43ed3baf Hidetoshi Seto 2006-09-26 189
43ed3baf Hidetoshi Seto 2006-09-26 190 static int loglevel_save = -1;
5a53b9d7 Sergey Senozhatsky 2019-01-07 191 #define BREAK_LOGLEVEL() \
5a53b9d7 Sergey Senozhatsky 2019-01-07 192 do { \
5a53b9d7 Sergey Senozhatsky 2019-01-07 193 bust_spinlocks(1); \
43ed3baf Hidetoshi Seto 2006-09-26 194 if (loglevel_save < 0) \
43ed3baf Hidetoshi Seto 2006-09-26 @195 loglevel_save = __console_loglevel; \
5a53b9d7 Sergey Senozhatsky 2019-01-07 196 console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH; \
5a53b9d7 Sergey Senozhatsky 2019-01-07 197 } while (0)43ed3baf Hidetoshi Seto 2006-09-26 198
:::::: The code at line 195 was first introduced by commit
:::::: 43ed3baf623410b3fa6ca14a9d3f6deca3493c56 [IA64] printing support for MCA/INIT
:::::: TO: Hidetoshi Seto <[email protected]> :::::: CC: Tony Luck <[email protected]>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 3 lines · kbuild test robot
Hi Sergey,
I love your patch! Yet something to improve:
Well well well, guess who didn't compile test his patch; again. Thanks for the report! I will fix it up and resend. Sorry!
-ss
PATCH v2 1/1 ia64: tweak BREAK_LOGLEVEL and RESTORE_LOGLEVEL
In reply to Sergey SenozhatskyFrom: Sergey Senozhatsky <[email protected]>
a) Do not pass console_loglevel to macros, use console_loglevel directly.
b) Use CONSOLE_LOGLEVEL_MOTORMOUTH instead of a naked number
c) Use bust_spinlocks() to set/clear oops_in_progress
d) Fix checkpatch error: Macros with multiple statements should be enclosed in a do - while loop
--- arch/ia64/kernel/mca.c | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-)
arch/ia64/kernel/mca.c +20 -16
@@ -188,19 +188,23 @@ static unsigned int mlogbuf_finished = 0;static unsigned long mlogbuf_timestamp =0 ;static int loglevel_save =-1 ; -#define BREAK_LOGLEVEL (__console_loglevel) \ - oops_in_progress = 1; \ - if (loglevel_save < 0) \ - loglevel_save = __console_loglevel; \ - __console_loglevel = 15; - -#define RESTORE_LOGLEVEL (__console_loglevel) \ - if (loglevel_save >= 0) { \ - __console_loglevel = loglevel_save; \ - loglevel_save = -1; \ - } \ - mlogbuf_finished = 0; \ - oops_in_progress = 0; +#define BREAK_LOGLEVEL () \ + do { \ + bust_spinlocks(1); \ + if (loglevel_save < 0) \ + loglevel_save = console_loglevel; \ + console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH; \ + } while (0) + +#define RESTORE_LOGLEVEL () \ + do { \ + if (loglevel_save >= 0) { \ + console_loglevel = loglevel_save; \ + loglevel_save = -1; \ + } \ + mlogbuf_finished = 0; \ + bust_spinlocks(0); \ + } while (0)/* * Push messages into buffer, print them later if not urgent.
@@ -287,7 +291,7 @@ EXPORT_SYMBOL(ia64_mlogbuf_dump);*/ static void ia64_mlogbuf_finish (int wait) { -BREAK_LOGLEVEL (console_loglevel); +BREAK_LOGLEVEL ();spin_lock_init (&mlogbuf_rlock);ia64_mlogbuf_dump ();
@@ -1616,7 +1620,7 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voi* To enable show_stack from INIT, we use oops_in_progress which should * be used in real oops. This would cause something wrong after INIT. */ -BREAK_LOGLEVEL (console_loglevel); +BREAK_LOGLEVEL ();ia64_mlogbuf_dump_from_init ();printk (KERN_ERR "Processes interrupted by INIT -" );
@@ -1641,7 +1645,7 @@ default_monarch_init_process(struct notifier_block *self, unsigned long val, voiread_unlock (&tasklist_lock); }/* FIXME: This will not restore zapped printk locks. */ -RESTORE_LOGLEVEL (console_loglevel); +RESTORE_LOGLEVEL ();return NOTIFY_DONE ; }
Signature · 1 line
2.20.1