From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B94C37AA9A; Tue, 7 Jul 2026 15:05:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783436756; cv=none; b=elTxpqAbOMSrXsKYEURUaVzvl0hqoKNZCG4P2eLCzn3cI8ciV/BdSu/ksw2myTWx/AbFKjd2UwRI2cP/D5I7CdlJOp8M8XDr+Xn4O/zjt0KWEF6HFmkTcq2lA5Tgnq6R/sB3wG/kNLkSYjnb0876w53Pu9QYrLRy9aUcWe5qVSQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783436756; c=relaxed/simple; bh=5JCDH4DsiI4TdTnJhcm4s3q6sJzIPwDRLGaaZRqEKGY=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ULKWhbHm1yek3QeR/KceYLG56d7sn0SkypnF48TMKbEe6ZhpISIJ1yLOPaDVPImE4z8ogcDSP9t+/xboCPgbP0KtaFBgR8ZSTWwAUMEheewEYHUHb/fP4+GXsuJfzzV06vJysz52f4BU1hLYblCRkJd1E8n9y2u8w8QDwmef9R4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dGFTG7Rw; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dGFTG7Rw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 27FB91F00A3A; Tue, 7 Jul 2026 15:05:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783436753; bh=U6SbfFdui2/7cITPPGTWciEVmjsDv8a6ho9k9ea7zPU=; h=Date:Subject:To:Cc:References:From:In-Reply-To; b=dGFTG7RwnKilQwvtW8NwFRMNYwqKv8j9M25Kg36Pzeda4MfK9gjY9uXjS4G7/mR1k Lym4airyudQ85+awNxabpr9cLx+tMmiyA/rdVi+x8tUwXzuhVWrm9ExQDK7Vzng3BW 6fpGlC5jpZvhWpYfQ1+TAjjHMbO/9rHLPmF0guNxcC4xpm/IiCbHAKjm7wAxJkG1gK 4HJYeEPv+frXnk1rLOu8KzqI66WYPWJDIV0x3fXkZic/HzW+OgRlaj6B8i5AZQr0V5 n+7dBCmnHHwbqlKvSBDLoG1DeN7V0kc9Fq6WXeiVKawIqkJjEj0Kax7OGqJzkZE5Ft RXtz78VY4vuQQ== Message-ID: <678ecae4-cda7-4683-9012-ed7c5c5b879f@kernel.org> Date: Tue, 7 Jul 2026 17:05:49 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] mm/hugetlb: fix swap entry corruption when clearing uffd-wp at fork() To: Kiryl Shutsemau , akpm@linux-foundation.org Cc: muchun.song@linux.dev, osalvador@suse.de, peterx@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@meta.com, kas@kernel.org References: <20260703161833.57416-1-kirill@shutemov.name> From: "David Hildenbrand (Arm)" Content-Language: en-US Autocrypt: addr=david@kernel.org; keydata= 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 qIws/H2t In-Reply-To: <20260703161833.57416-1-kirill@shutemov.name> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 7/3/26 18:18, Kiryl Shutsemau wrote: > From: "Kiryl Shutsemau (Meta)" > > copy_hugetlb_page_range() clears the uffd-wp bit of hwpoison and > migration entries with huge_pte_clear_uffd_wp(), which operates on the > present-PTE bit position. Swap entries keep the uffd-wp state elsewhere > -- the same branches read and set it with pte_swp_uffd_wp() and > pte_swp_mkuffd_wp() -- and the present-PTE position falls into the swap > payload. On x86-64 it lands in the inverted swap offset, where a > naturally-aligned hugetlb PFN always has the affected bit set, so the > clear advances the encoded PFN by two pages. > > No userfaultfd needs to be involved: the clear is guarded only by the > child VMA not being uffd-wp registered, so a plain fork() with an > in-flight hugetlb migration entry (or a poisoned hugetlb page) corrupts > the entry copied into the child. Instrumenting the hwpoison branch and > forking after MADV_HWPOISON on a 2MB anon hugetlb page shows: > > offset before=120e00 > offset after =120e02 > > The fallout is mostly latent: rmap walks match migration entries by > folio range and remove_migration_pte() rebuilds the PTE from the folio, > so a within-folio PFN skew heals once migration completes. But any path > that re-encodes the corrupted offset -- e.g. hugetlb_change_protection() > rewriting a writable migration entry via > make_readable_migration_entry(swp_offset(entry)) -- propagates it, and > an hwpoison entry misidentifies which page is poisoned. > > Use pte_swp_clear_uffd_wp(), matching copy_nonpresent_pte() and > move_huge_pte(). > > Reported-by: Sashiko AI review > Closes: https://lore.kernel.org/all/20260703140011.99E601F000E9@smtp.kernel.org/ > Fixes: bc70fbf269fd ("mm/hugetlb: handle uffd-wp during fork()") > Cc: stable@vger.kernel.org > Signed-off-by: Kiryl Shutsemau > Assisted-by: Claude:claude-fable-5 > --- > mm/hugetlb.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 571212b80835..a4e6dd3a82f4 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -4918,7 +4918,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, > softleaf = softleaf_from_pte(entry); > if (unlikely(softleaf_is_hwpoison(softleaf))) { > if (!userfaultfd_wp(dst_vma)) > - entry = huge_pte_clear_uffd_wp(entry); > + entry = pte_swp_clear_uffd_wp(entry); I think installing a hwpoison pte will actually drop the uffd marker. hugetlb_change_protection() does nothing on hwpoison entrues. So how could be possibly get a hwpoison entry with an uffd-wp bit set here? If we indeed can't, Id assume there is nothing to clear here at all. > set_huge_pte_at(dst, addr, dst_pte, entry, sz); > } else if (unlikely(softleaf_is_migration(softleaf))) { > bool uffd_wp = pte_swp_uffd_wp(entry); > @@ -4936,7 +4936,7 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src, > set_huge_pte_at(src, addr, src_pte, entry, sz); > } > if (!userfaultfd_wp(dst_vma)) > - entry = huge_pte_clear_uffd_wp(entry); > + entry = pte_swp_clear_uffd_wp(entry); That looks correct. -- Cheers, David