Re: [PATCH v2 3/4] mm/memory: do not report OOM if insert_pfn() races a huge fault

From: Zi Yan

Date: Tue Nov 17 2026 - 16:54:06 EST


On 17 Nov 2026, at 13:31, Lorenzo Stoakes (ARM) wrote:

> A driver that implements both ->fault and ->huge_fault must anticipate
> concurrent use of both.
>
> This can happen, for example, if a user calls prctl(PR_SET_THP_DISABLE)
> concurrent with faulting, as that only holds the mmap write lock and thus
> does not exclude faulting threads stabilised by VMA lock.
>
> This is not currently safely handled by insert_pfn(), however, which
> obtains its PTE entry via get_locked_pte(), and treats a NULL return value
> as an allocation failure, returning VM_FAULT_OOM.
>
> The issue is that get_locked_pte() also returns NULL if the PMD entry is
> not a page table which can happen if a concurrent huge fault installs a
> huge PMD entry between __handle_mm_fault() observing the PMD entry to be
> empty and insert_pfn() being invoked.
>
> This can result in VM_FAULT_OOM being reported incorrectly.
>
> Fix this by introducing and using __get_locked_pte() which returns -ENOMEM
> if a page table allocation fails or -EFAULT if raced.
>
> This allows insert_pfn() to return VM_FAULT_OOM only when an allocation
> fails and VM_FAULT_NOPAGE otherwise so the fault is retried.
>
> The same change is applied to insert_page(), which only impacts DAX (which
> has its own locking).
>
> This means that insert_page() now propagates the returned error, so -EFAULT
> in the case of a race. It's not possible currently, but guards against that
> changing in future.
>
> Similarly, update walk_to_pmd() to return -EFAULT if it encounters a huge
> PUD leaf.
>
> Target the commit introducing the first driver able to do this.
>
> Reported-by: Eliav Farber <farbere@xxxxxxxxxx>
> Closes: https://lore.kernel.org/all/20261112051440.16140-3-farbere@xxxxxxxxxx/
> Fixes: f9e54c3a2f5b ("vfio/pci: implement huge_fault support")
> Cc: stable@xxxxxxxxxxxxxxx
> Suggested-by: Jose A. Perez de Azpillaga <azpijr@xxxxxxxxx>
> Signed-off-by: Lorenzo Stoakes (ARM) <ljs@xxxxxxxxxx>
> ---
> mm/memory.c | 48 ++++++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 40 insertions(+), 8 deletions(-)
>
> diff --git a/mm/memory.c b/mm/memory.c
> index 20b818bcdfbc..04a518d6059f 100644
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@ -2383,19 +2383,48 @@ static int walk_to_pmd(struct mm_struct *mm, unsigned long addr, pmd_t **pmdp)
> pmd = pmd_alloc(mm, pud, addr);
> if (!pmd)
> return -ENOMEM;
> + /* We may have raced a huge PUD fault. */
> + if (pud_trans_unstable(pud))
> + return -EFAULT;

Matches __handle_mm_fault().

LGTM. Thanks.

Reviewed-by: Zi Yan <ziy@xxxxxxxxxx>


Best Regards,
Yan, Zi