Re: x86: Allow vmalloc faults from NMI context

[Steven Rostedt]

On Thu, 10 Apr 2014 16:40:03 +0200
Peter Zijlstra <peterz@xxxxxxxxxxxxx> 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.
> 
> 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....

Link: http://lkml.kernel.org/p/20131015163906.342d8ffa@xxxxxxxxxxxxxxxxxx

-- Steve

> Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
> ---
>  arch/x86/mm/fault.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
> index 8e5722992677..d0234cdf70f1 100644
> --- a/arch/x86/mm/fault.c
> +++ b/arch/x86/mm/fault.c
> @@ -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

--
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/