x86: Allow vmalloc faults from NMI context
Peter Zijlstra
maintainerJiri reported he hit vmalloc_faults()'s:
WARN_ON_ONCE(in_nmi());
The patch that added this ebc8827f75954 ("x86: Barf when vmalloc and kmemcheck faults happen in NMI") explains that this was done in order to avoid faults from NMI to cause nested NMIs.
We have, however, completely fixed this issue and can now safely take faults from NMI context.
Therefore remove this warning. We must still leave the kmemcheck warn in place since kmemcheck itself can't deal with NMI context yet.
--- arch/x86/mm/fault.c | 4 ---- 1 file changed, 4 deletions(-)
arch/x86/mm/fault.c +0 -4
@@ -271,8 +271,6 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Synchronize this task's top level page-table * with the 'reference' page table.
@@ -369,8 +367,6 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Copy kernel mappings over when needed. This can also * happen within a race in page table update. In the later
Quoted 8 lines · On Thu, 10 Apr 2014 16:40:03 +0200 Peter Zijlstra <[email protected]> wrote:
Jiri reported he hit vmalloc_faults()'s:
WARN_ON_ONCE(in_nmi());The patch that added this
ebc8827f75954("x86: Barf when vmalloc and kmemcheck faults happen in NMI") explains that this was done in order to avoid faults from NMI to cause nested NMIs.
Quoted 6 lines
We have, however, completely fixed this issue and can now safely take faults from NMI context.
Therefore remove this warning. We must still leave the kmemcheck warn in place since kmemcheck itself can't deal with NMI context yet.
Yay, finally....
-- Steve
Quoted 27 lines
Signed-off-by Peter Zijlstra <[email protected]>--- arch/x86/mm/fault.c | 4 ---- 1 file changed, 4 deletions(-)arch/x86/mm/fault.c +0
-4@@ -271,8 +271,6 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Synchronize this task's top level page-table * with the 'reference' page table. @@ -369,8 +367,6 @@ static noinline __kprobes int vmalloc_fault(unsigned long address)if (!(address >=VMALLOC_START && address <VMALLOC_END ))return -1 ; -WARN_ON_ONCE (in_nmi ()); -/* * Copy kernel mappings over when needed. This can also * happen within a race in page table update. In the later