x86/boot: Add a message about ignored early NMIs
PATCH 1/1 x86/boot: Add a message about ignored early NMIs
Commit 78a509fba9c9 ("x86/boot: Ignore NMIs during very early boot") added empty handler in early boot stage to avoid boot failure by spurious NMIs.
Add a diagnostic message in case we need to know whether early NMIs have occurred and/or what happened to them.
arch/x86/boot/compressed/ident_map_64.c +3 -0
@@ -387,7 +387,10 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)kernel_add_identity_map (address, end); } +extern int spurious_nmi_count; +void do_boot_nmi_trap (struct pt_regs *regs,unsigned long error_code) {/* Empty handler to ignore NMI during early boot */ + spurious_nmi_count++; }
arch/x86/boot/compressed/misc.c +8 -0
@@ -357,6 +357,8 @@ unsigned long decompress_kernel(unsigned char *outbuf, unsigned long virt_addr,return entry; } +int spurious_nmi_count; +/* * The compressed kernel image (ZO), has been moved so that its position * is against the end of the buffer used to hold the uncompressed kernel
@@ -493,6 +495,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)/* Disable exception handling before booting the kernel */ cleanup_exception_handling (); +if (spurious_nmi_count) { +error_putstr ("Spurious early NMI ignored. Number of NMIs: 0x" ); +error_puthex (spurious_nmi_count); +error_putstr ("\n" ); + } +return output + entry_offset; }
Quoted 15 lines · NOMURA JUNICHI(野村 淳一)
Commit
78a509fba9c9("x86/boot: Ignore NMIs during very early boot") added empty handler in early boot stage to avoid boot failure by spurious NMIs.Add a diagnostic message in case we need to know whether early NMIs have occurred and/or what happened to them.
arch/x86/boot/compressed/ident_map_64.c void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code) · line 391
Quoted 5 lines
arch/x86/boot/compressed/ident_map_64.c +2
-0@@ -387,7 +387,10 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)kernel_add_identity_map (address, end); } +extern int spurious_nmi_count; +
It has to be in a header file.
Quoted 9 lines
arch/x86/boot/compressed/ident_map_64.c +1
-0void do_boot_nmi_trap (struct pt_regs *regs,unsigned long error_code) {/* Empty handler to ignore NMI during early boot */ + spurious_nmi_count++; }
arch/x86/boot/compressed/misc.c unsigned long decompress_kernel(unsigned char *outbuf, unsigned long virt_addr, · line 361
Quoted 5 lines
arch/x86/boot/compressed/misc.c +2
-0@@ -357,6 +357,8 @@ unsigned long decompress_kernel(unsigned char *outbuf, unsigned long virt_addr,return entry; } +int spurious_nmi_count; +
It is not a right place to define a variable. Do it next to rest of variables at the beginning of the file.
Quoted 16 lines
arch/x86/boot/compressed/misc.c +6
-0/* * The compressed kernel image (ZO), has been moved so that its position * is against the end of the buffer used to hold the uncompressed kernel @@ -493,6 +495,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)/* Disable exception handling before booting the kernel */ cleanup_exception_handling (); +if (spurious_nmi_count) { +error_putstr ("Spurious early NMI ignored. Number of NMIs: 0x" ); +error_puthex (spurious_nmi_count); +error_putstr ("\n" ); + } +return output + entry_offset; }
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
PATCH v2 1/1 x86/boot: Add a message about ignored early NMIs
Commit 78a509fba9c9 ("x86/boot: Ignore NMIs during very early boot") added empty handler in early boot stage to avoid boot failure by spurious NMIs.
Add a diagnostic message in case we need to know whether early NMIs have occurred and/or what happened to them.
--
v2
* Moved variable declaration and definition to the right place based on comments from Kirill.
No functional changes.
arch/x86/boot/compressed/ident_map_64.c +1 -0
@@ -390,4 +390,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)void do_boot_nmi_trap (struct pt_regs *regs,unsigned long error_code) {/* Empty handler to ignore NMI during early boot */ + spurious_nmi_count++; }
arch/x86/boot/compressed/misc.c +7 -0
@@ -52,6 +52,7 @@ struct port_io_ops pio_ops;memptr free_mem_ptr;memptr free_mem_end_ptr; +int spurious_nmi_count;static char *vidmem;static int vidport;
@@ -493,6 +494,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)/* Disable exception handling before booting the kernel */ cleanup_exception_handling (); +if (spurious_nmi_count) { +error_putstr ("Spurious early NMI ignored. Number of NMIs: 0x" ); +error_puthex (spurious_nmi_count); +error_putstr ("\n" ); + } +return output + entry_offset; }
arch/x86/boot/compressed/misc.h +1 -0
@@ -59,6 +59,7 @@ extern char _head[], _end[];/* misc.c */ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr; +extern int spurious_nmi_count;void *malloc (int size);void free (void *where);void __putstr (const char *s);
Quoted 9 lines · NOMURA JUNICHI(野村 淳一)
Commit
78a509fba9c9("x86/boot: Ignore NMIs during very early boot") added empty handler in early boot stage to avoid boot failure by spurious NMIs.Add a diagnostic message in case we need to know whether early NMIs have occurred and/or what happened to them.
Signed-off-by Jun'ichi Nomura <[email protected]>Suggested-by Borislav Petkov <[email protected]>Suggested-by H. Peter Anvin <[email protected]>
Signature · 1 line
Kiryl Shutsemau / Kirill A. Shutemov
Review
Quoted 4 lines · NOMURA JUNICHI(野村 淳一)
(quoted diff) +4
-0+ if (spurious_nmi_count) { + error_putstr("Spurious early NMI ignored. Number of NMIs: 0x"); + error_puthex(spurious_nmi_count); + error_putstr("\n");
Uff, that's just silly:
Spurious early NMIs ignored: 0x0000000000000017
Would you like to add a error_putnum() or so in a prepatch which would make this output
Spurious early NMIs ignored: 23.
?
So that it is human readable and doesn't make me wonder what that hex value is supposed to mean?
Thx.
Btw, please use this version when sending next time:
---
From: =?UTF-8?q?NOMURA=20JUNICHI=28=E9=87=8E=E6=9D=91=20=E6=B7=B3=E4=B8=80?=
=?UTF-8?q?=29?= <[email protected]>
Date: Mon, 15 Jan 2024 08:57:45 +0000
Subject: [PATCH] x86/boot: Add a message about ignored early NMIs
Commit
78a509fba9c9 ("x86/boot: Ignore NMIs during very early boot")
added an empty handler in early boot stage to avoid boot failure due to spurious NMIs.
Add a diagnostic message to show when early NMIs have occurred and/or what happened to them.
[ bp: Touchups. ]
--- arch/x86/boot/compressed/ident_map_64.c | 2 +- arch/x86/boot/compressed/misc.c | 7 +++++++ arch/x86/boot/compressed/misc.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)
arch/x86/boot/compressed/ident_map_64.c +1 -1
@@ -389,5 +389,5 @@ void do_boot_page_fault(struct pt_regs *regs, unsigned long error_code)void do_boot_nmi_trap (struct pt_regs *regs,unsigned long error_code) { -/* Empty handler to ignore NMI during early boot */ + spurious_nmi_count++; }
arch/x86/boot/compressed/misc.c +7 -0
@@ -52,6 +52,7 @@ struct port_io_ops pio_ops;memptr free_mem_ptr;memptr free_mem_end_ptr; +int spurious_nmi_count;static char *vidmem;static int vidport;
@@ -493,6 +494,12 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output)/* Disable exception handling before booting the kernel */ cleanup_exception_handling (); +if (spurious_nmi_count) { +error_putstr ("Spurious early NMIs ignored: 0x" ); +error_puthex (spurious_nmi_count); +error_putstr ("\n" ); + } +return output + entry_offset; }
arch/x86/boot/compressed/misc.h +1 -0
@@ -59,6 +59,7 @@ extern char _head[], _end[];/* misc.c */ extern memptr free_mem_ptr;extern memptr free_mem_end_ptr; +extern int spurious_nmi_count;void *malloc (int size);void free (void *where);void __putstr (const char *s);
Signature · 9 lines
2.43.0
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteQuoted 14 lines
From: Borislav Petkov <[email protected]>
arch/x86/boot/compressed/misc.c asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output) · line 500
Quoted 4 lines · NOMURA JUNICHI(野村 淳一)
arch/x86/boot/compressed/misc.c +4
-0+if (spurious_nmi_count) { +error_putstr ("Spurious early NMI ignored. Number of NMIs: 0x" ); +error_puthex (spurious_nmi_count); +error_putstr ("\n" );Uff, that's just silly:
Spurious early NMIs ignored:
0x0000000000000017Would you like to add a
error_putnum()or so in a prepatch which would make this output
Quoted 6 lines
Spurious early NMIs ignored: 23.
?
So that it is human readable and doesn't make me wonder what that hex value is supposed to mean?
Yes, it would be nicer to print that way. I used the existing error_puthex() just to keep the patch minimal. I will try to add error_putnum().
Quoted 1 line
Btw, please use this version when sending next time:
Thank you.
--
Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd.
H. Peter Anvin
reviewerQuoted 16 lines · NOMURA JUNICHI(野村 淳一)
Quoted 16 lines
From: Borislav Petkov <[email protected]>
Review
Quoted 4 lines · NOMURA JUNICHI(野村 淳一)
(quoted diff) +4
-0+ if (spurious_nmi_count) { + error_putstr("Spurious early NMI ignored. Number of NMIs: 0x"); + error_puthex(spurious_nmi_count); + error_putstr("\n");Uff, that's just silly:
Spurious early NMIs ignored:
0x0000000000000017Would you like to add a
error_putnum()or so in a prepatch which would make this outputSpurious early NMIs ignored: 23.
Quoted 10 lines
Quoted 4 lines
?
So that it is human readable and doesn't make me wonder what that hex value is supposed to mean?
Yes, it would be nicer to print that way. I used the existing
error_puthex()just to keep the patch minimal. I will try to adderror_putnum().Quoted 1 line
Btw, please use this version when sending next time:
Here is a *completely* untested patch for you...
-hpa
arch/x86/boot/compressed/misc.c +23 -10
@@ -164,21 +164,34 @@ void __putstr(const char *s)outb (0xff & (pos >>1 ), vidport+1 ); } -void __puthex (unsigned long value) +static noinline void __putnum(unsigned long value, unsigned int base, +int mindig) { -char alpha[2 ] ="0" ; -int bits; +char buf[8 *sizeof (value)+1 ]; +char *p; -for (bits =sizeof (value) *8 -4 ; bits >=0 ; bits -=4 ) { -unsigned long digit = (value >> bits) &0xf ; + p = buf +sizeof (buf); + *--p ='\0' ; -if (digit <0xA ) - alpha[0 ] ='0' + digit; -else - alpha[0 ] ='a' + (digit -0xA ); +while (mindig-- >0 || value) { +unsigned char digit = value % base; + digit += (digit >=10 ) ? ('a' -10 ) :'0' ; + *--p = digit; -__putstr (alpha); + value /= base; } + +__putstr (p); +} + +void __puthex (unsigned long value) +{ +__putnum (value,16 ,sizeof (value)*2 ); +} + +void __putdec (unsigned long value) +{ +__putnum (value,10 ,1 ); }#ifdef CONFIG_X86_NEED_RELOCS
arch/x86/boot/compressed/misc.h +2 -0
@@ -63,8 +63,10 @@ void *malloc(int size);void free (void *where);void __putstr (const char *s);void __puthex (unsigned long value); +void __putdec (unsigned long value);#define error_putstr (__x) __putstr(__x)#define error_puthex (__x) __puthex(__x) +#define error_putdec (__x) __putdec(__x)#ifdef CONFIG_X86_VERBOSE_BOOTUP
Quoted 23 lines
From: H. Peter Anvin <[email protected]>
Quoted 21 lines · NOMURA JUNICHI(野村 淳一)
Quoted 20 lines
From: Borislav Petkov <[email protected]>
Review
Quoted 4 lines · NOMURA JUNICHI(野村 淳一)
(quoted diff) +4
-0+ if (spurious_nmi_count) { + error_putstr("Spurious early NMI ignored. Number of NMIs: 0x"); + error_puthex(spurious_nmi_count); + error_putstr("\n");Uff, that's just silly:
Spurious early NMIs ignored:
0x0000000000000017Would you like to add a
error_putnum()or so in a prepatch which would make this outputSpurious early NMIs ignored: 23.
?
So that it is human readable and doesn't make me wonder what that hex value is supposed to mean?
Quoted 6 lines
Quoted 4 lines
Yes, it would be nicer to print that way. I used the existing
error_puthex()just to keep the patch minimal. I will try to adderror_putnum().Quoted 1 line
Btw, please use this version when sending next time:
Here is a *completely* untested patch for you...
Ah, I was preparing decimal only version but yours is much better. I tested and it just works.
I would like to use yours as a prepatch. May I have your signed-off-by?
--
Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd.
H. Peter Anvin
reviewerQuoted 30 lines · NOMURA JUNICHI(野村 淳一)
Quoted 23 lines
From: H. Peter Anvin <[email protected]>
Quoted 21 lines · NOMURA JUNICHI(野村 淳一)
Quoted 20 lines
From: Borislav Petkov <[email protected]>
Review
Quoted 4 lines · NOMURA JUNICHI(野村 淳一)
(quoted diff) +4
-0+ if (spurious_nmi_count) { + error_putstr("Spurious early NMI ignored. Number of NMIs: 0x"); + error_puthex(spurious_nmi_count); + error_putstr("\n");Uff, that's just silly:
Spurious early NMIs ignored:
0x0000000000000017Would you like to add a
error_putnum()or so in a prepatch which would make this outputSpurious early NMIs ignored: 23.
?
So that it is human readable and doesn't make me wonder what that hex value is supposed to mean?
Quoted 6 lines
Quoted 4 lines
Yes, it would be nicer to print that way. I used the existing
error_puthex()just to keep the patch minimal. I will try to adderror_putnum().Quoted 1 line
Btw, please use this version when sending next time:
Here is a *completely* untested patch for you...
Quoted 7 lines
Ah, I was preparing decimal only version but yours is much better. I tested and it just works.
I would like to use yours as a prepatch. May I have your signed-off-by?
--
Jun'ichi Nomura, NEC Corporation / NEC Solution Innovators, Ltd.