Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: "Lorenzo Stoakes (ARM)" <ljs@kernel.org>
To: "David Hildenbrand (Arm)" <david@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	 "Liam R. Howlett" <liam@infradead.org>,
	Vlastimil Babka <vbabka@kernel.org>,
	 Mike Rapoport <rppt@kernel.org>,
	Suren Baghdasaryan <surenb@google.com>,
	 Michal Hocko <mhocko@suse.com>,
	Alex Williamson <alex@shazbot.org>, Peter Xu <peterx@redhat.com>,
	 Zi Yan <ziy@nvidia.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	 Nico Pache <nico.pache@linux.dev>,
	Ryan Roberts <ryan.roberts@arm.com>, Dev Jain <dev.jain@arm.com>,
	 Barry Song <baohua@kernel.org>,
	Lance Yang <lance.yang@linux.dev>,
	 Usama Arif <usama.arif@linux.dev>,
	Kiryl Shutsemau <kas@kernel.org>, Wei Liu <wei.liu@kernel.org>,
	 Roman Kisel <romank@linux.microsoft.com>,
	Saurabh Sengar <ssengar@linux.microsoft.com>,
	 Naman Jain <namjain@linux.microsoft.com>,
	Michael Kelley <mhklinux@outlook.com>,
	linux-mm@kvack.org,  linux-kernel@vger.kernel.org,
	Eliav Farber <farbere@amazon.com>,
	stable@vger.kernel.org
Subject: Re: [PATCH 3/3] mm/huge_memory: only compare PFNs of huge entries on huge fault insert
Date: Mon, 16 Nov 2026 16:55:12 +0000	[thread overview]
Message-ID: <avsz6Op6mfkF4y1x@gremlin> (raw)
In-Reply-To: <e13044a0-871b-4033-8a79-22cb9653b6b1@kernel.org>

On Mon, Nov 16, 2026 at 05:01:52PM +0100, David Hildenbrand (Arm) wrote:
> On 11/15/26 21:58, 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.
> >
> > insert_pmd() and insert_pud() have issues with this as they both assume
> > that, if the page table entry being populated is not empty, it must a
> > present huge entry.
> >
> > This is problematic as if it is a write fault, it compares its PFN against
> > the one being inserted, warning if they differ, on the assumption that the
> > entry is a huge leaf.
> >
> > Since the entry may be a page table, this is invalid and can result in
> > spurious warnings.
> >
> > Equally, the entry might be non-present. Nothing can install such an entry
> > in the VMAs that reach this code today, but there is no reason to rely upon
> > that.
> >
> > Therefore only examine the PFN if the entry is both present and huge, and
> > otherwise simply return VM_FAULT_NOPAGE so the fault is retried and handled
> > at the appropriate level.
> >
> > This is what already happens for a read fault, for which the existing entry
> > is not examined at all.
> >
> > Target the commit which introduced the first driver which both mixes fault
> > orders and passes the write flag for the fix (since this commit, both
> > drm_gem_shmem and panthor are prey to this issue).
> >
> > Reported-by: Eliav Farber <farbere@amazon.com>
> > Closes: https://lore.kernel.org/all/20261112051440.16140-4-farbere@amazon.com/
> > Fixes: 7bfe3b8ea6e3 ("Drivers: hv: Introduce mshv_vtl driver")
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Lorenzo Stoakes (ARM) <ljs@kernel.org>
> > ---
> >  mm/huge_memory.c | 8 ++++++++
> >  1 file changed, 8 insertions(+)
> >
> > diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> > index 0d589be136d2..da632c3e834b 100644
> > --- a/mm/huge_memory.c
> > +++ b/mm/huge_memory.c
> > @@ -1643,6 +1643,10 @@ static vm_fault_t insert_pmd(struct vm_area_struct *vma, unsigned long addr,
> >  		const unsigned long pfn = fop.is_folio ? folio_pfn(fop.folio) :
> >  					  fop.pfn;
> >
> > +		/* We may have raced a fault which installed a page table. */
> > +		if (!pmd_present(*pmd) || !pmd_trans_huge(*pmd))
>
> Ok, we hold the PMD lock, so that cannot change concurrently.
>
> Given that we are in THP code, I wonder if we could just test for pmd_leaf()
> instead.
>
> Same below for PUDs.

That's what the original did, but as the commit message says I don't want
to rely on the entry not being a softleaf here, in case we do something
later that changes that.

It's future-proofing.

>
> Acked-by: David Hildenbrand (Arm) <david@kernel.org>

Thanks!

>
> --
> Cheers,
>
> David

--
Cheers, Lorenzo

      reply	other threads:[~2026-11-16 16:55 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-15 20:58 [PATCH 0/3] mm: fix races between huge and non-huge faults in PFN mappings Lorenzo Stoakes (ARM)
2026-11-15 20:58 ` [PATCH 1/3] mm/memory: remove racy huge PMD assertion from walk_to_pmd() Lorenzo Stoakes (ARM)
2026-11-16 10:35   ` Jose A. Perez de Azpillaga
2026-11-16 15:56   ` David Hildenbrand (Arm)
2026-11-16 17:10     ` Lorenzo Stoakes (ARM)
2026-11-15 20:58 ` [PATCH 2/3] mm/memory: do not report OOM if insert_pfn() races a huge fault Lorenzo Stoakes (ARM)
2026-11-16 10:36   ` Jose A. Perez de Azpillaga
2026-11-16 15:59   ` David Hildenbrand (Arm)
2026-11-16 17:21     ` Lorenzo Stoakes (ARM)
2026-11-15 20:58 ` [PATCH 3/3] mm/huge_memory: only compare PFNs of huge entries on huge fault insert Lorenzo Stoakes (ARM)
2026-11-16 10:42   ` Jose A. Perez de Azpillaga
2026-11-16 16:01   ` David Hildenbrand (Arm)
2026-11-16 16:55     ` Lorenzo Stoakes (ARM) [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=avsz6Op6mfkF4y1x@gremlin \
    --to=ljs@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=alex@shazbot.org \
    --cc=baohua@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=david@kernel.org \
    --cc=dev.jain@arm.com \
    --cc=farbere@amazon.com \
    --cc=kas@kernel.org \
    --cc=lance.yang@linux.dev \
    --cc=liam@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mhklinux@outlook.com \
    --cc=mhocko@suse.com \
    --cc=namjain@linux.microsoft.com \
    --cc=nico.pache@linux.dev \
    --cc=peterx@redhat.com \
    --cc=romank@linux.microsoft.com \
    --cc=rppt@kernel.org \
    --cc=ryan.roberts@arm.com \
    --cc=ssengar@linux.microsoft.com \
    --cc=stable@vger.kernel.org \
    --cc=surenb@google.com \
    --cc=usama.arif@linux.dev \
    --cc=vbabka@kernel.org \
    --cc=wei.liu@kernel.org \
    --cc=ziy@nvidia.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox