Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795060033; b=P8nASTGUkI5qPgUuIZMOT/tBIzaDln+BIVD+B35nHot9wrRGwWCGjWI+GZGmFu7wCvTu nvKfQj3L7HKy8GlssxLWCjLAf/4daeuXSFoZJDpFy0iRDT22JLq89pKR9egAffZpc+8t7 4UAgvTmNly0be2YyrPS0k9E8RdhRRYL+26hgTOYpdxblkqoakGrd13M7n+rV6b/XfT/6u Q2Jkd1HONBta87oTfcyEAzc+vVJLbEeFOlQE2T7ao8F0iSg9Nbvya5Lt1po0O+qbR3WJo Yh4WV//Qmk/ni84rwuOPUZNEtsw9K1fSq45qfScvneZjfmY0j26uEt6NsgxRtm963gg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795060033; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=R4m/E4ncX6suWjVBCtFMTCe0ume6TVAWL04DsNfE5Rw=; b=oPV7NHJp2HjHWlxaOBthINOVe8G1IC/LRcxVe11whaRUl1apSB9/h4xsBrk5gNztYWMG Kx4svVPBHiNP1EwAMOxgX5HajMM4MSUicVkgdAhSEDFpCZpeGgnaoxHobihlZz8ruDGor 1B7txs6Qq/9MJGVwoxYRfgb5Al74Q7EAFvCMbZMx85h9ETUL2qOhIuefSlVhPIX+iL/Qx nwyHI6ycGK9+j2tOMmXKOzzbRGZiNFsjtuIBA2r2HM+xoyPVj0bIvd8jJL2lR7pPIWbZD F+oqj52v8r5GdvzcBPprV5YWAeinsO41gKF5zUg8v3/D1XlhaxqmrWxf+z+2SRtIJ9g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NIjBXDeg; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AA28606A325; Thu, 19 Nov 2026 03:47:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=NIjBXDeg Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C58E1F000C4; Thu, 19 Nov 2026 03:47:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795060033; bh=R4m/E4ncX6suWjVBCtFMTCe0ume6TVAWL04DsNfE5Rw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NIjBXDegDliYz/3AkgGTqxFzFHb7icMffILi1qjO7xGix5TrjWNFe3CroLZlrC1Tg pX6CLIwlX8qt9PCopKvRU2xSr7pBiTagzwmj0q58bB8XxDZSuznC6vdSgq5NEohBaY fwVzojceyQFBDlnOIJcHDFmK1x9o5Fkrd/FPxa9k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , "Lorenzo Stoakes (ARM)" , Pedro Falcato , Muhammad Usama Anjum , Lance Yang , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 5.10 1053/1848] mm/mremap: fix moving PUD leaves Date: Wed, 18 Nov 2026 15:51:31 +0100 Message-ID: <20261118150001.378730730@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit 440c8779757f09f290770b1d361dc1516a9d0b3e ] pud_none_or_clear_bad() only really works on page tables. PUD leaves confuse the check and make us clear the page table entry and print a warning. Since commit aed877c2b4257 ("device/dax: properly refcount device dax pages when mapping"), this also leaks device-DAX folio references, mapcounts and RSS accounting, resulting in "Bad rss-counter state" warnings on exit. Allow PUD leaves in get_old_pud(). If a PUD leaf cannot be moved as a whole or the move fails, split it. This unmaps it with proper accounting instead of treating the leaf entry as a PMD table. Keep using pud_trans_huge() for now, in the future this code should be cleaned up to just check for PUD leaves. Fix generated by an LLM and sent by Josef Bacik in private. Fixes: a00cc7d9dd93 ("mm, x86: add support for PUD-sized transparent hugepages") Cc: stable@vger.kernel.org Signed-off-by: Josef Bacik Reviewed-by: Lorenzo Stoakes (ARM) [ david: fallthrough after splitting ] Reviewed-by: Pedro Falcato Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-32-d6437171ecc3@kernel.org Reviewed-by: Lance Yang Signed-off-by: David Hildenbrand (Arm) [ sashal: applied split_huge_pud() directly in get_old_pmd() because get_old_pud() and whole-PUD move support are absent ] Signed-off-by: Sasha Levin --- mm/mremap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 79beead5af830..eca03a9789049 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -30,8 +30,9 @@ #include "internal.h" -static pmd_t *get_old_pmd(struct mm_struct *mm, unsigned long addr) +static pmd_t *get_old_pmd(struct vm_area_struct *vma, unsigned long addr) { + struct mm_struct *mm = vma->vm_mm; pgd_t *pgd; p4d_t *p4d; pud_t *pud; @@ -46,6 +47,7 @@ static pmd_t *get_old_pmd(struct mm_struct *mm, unsigned long addr) return NULL; pud = pud_offset(p4d, addr); + split_huge_pud(vma, pud, addr); if (pud_none_or_clear_bad(pud)) return NULL; @@ -280,7 +282,7 @@ unsigned long move_page_tables(struct vm_area_struct *vma, next = (new_addr + PMD_SIZE) & PMD_MASK; if (extent > next - new_addr) extent = next - new_addr; - old_pmd = get_old_pmd(vma->vm_mm, old_addr); + old_pmd = get_old_pmd(vma, old_addr); if (!old_pmd) continue; new_pmd = alloc_new_pmd(vma->vm_mm, vma, new_addr); -- 2.53.0