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=1795054483; b=0k1kSiVG1cIN86qhlp5pBBPt3tSJjiMkKZ+DAPw2l4jkJviyny/ocaiuSf7Kbx1K7huI vPZWzNUp+grCn5C7ct4kcobUz86nebJ6+crR1vN72aYI70vtUGxltMY+h0Li6uFmueVnC eUrJW5MHt2fS0ChCkvwANDvLKlpU5OE4adHSDf0+PjwjzxKEXOy8IYZuLYH6IDrpJv5k/ kYWls4nEi5scKLmgk43rEdtvI1fZqRpKasu9z2CjgOZmFBQqk0eit/BnEbcgatisjNKxZ QTLEDXchhNI8qkSIyrcASFYz4iX2U6ZFY7rXSvPHjSerrIhSv0AXP68OZCNzPfTFcjg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795054483; 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=MZ94V6KsJIVFWUJf3SOmmx0kQCpRirJB/J7TLkBUcQw=; b=Ocgi1Nzci3tMMLZr6k4gIcHKGyPOh1joitg3e16ZV3Ng+RNB5fjHlFlXPRR/sE/ncgoJ NWpcw/2SvksJozq/nq+/x+/n/at252P4cAgUpX4+Vh+HzV0YkI3uVitFCv/6+v4LmEUQm fYiFI/VJVa9xQd5lC4fHEwXs+04AZHxyMU15+CnP1smxZ1RJ4CljhcOLcITFsrMOSkNN6 8IdNeF2ZZBKn9uUYhNnx+hDS0LN1E/35IkvxKAuPu+sArad2ik7jgwk/fJ44tJBWVPghz ObbLJxVQUonatbuO6pVkaxRXYfsvj0KeJdgedkwJbjb7mmVHpUk0Yf+mzrBFV1Ipdlw== 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=aRSMo64D; 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 B1501606A32A; Thu, 19 Nov 2026 02:14:43 +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=aRSMo64D Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1366F1F000C5; Thu, 19 Nov 2026 02:14:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795054483; bh=MZ94V6KsJIVFWUJf3SOmmx0kQCpRirJB/J7TLkBUcQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=aRSMo64DOKEJ7clfC0Ky8/Vlpgm+ChsE10zYWvAGp0cs6B0veD8sLIpnfybU4GrYK BDwT48OuvA1LNdKxw529nElFK8XufNMXi1J9qOA7zxfWRi+1EDJEkM8gKRWsg9UdeH WP/l7DnrO69JAqQcmMUxWX9wO2qQpepLpZZkQawQ= 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.15 1250/2214] mm/mremap: fix moving PUD leaves Date: Wed, 18 Nov 2026 15:48:46 +0100 Message-ID: <20261118150101.686468075@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@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.15-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: Adapted to separate pud_devmap() checks and explicit vma/address arguments instead of pagetable_move_control. ] Signed-off-by: Sasha Levin --- mm/mremap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mm/mremap.c b/mm/mremap.c index 5d8b8309ae2ac..518d9d36fc9ab 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -45,7 +45,8 @@ static pud_t *get_old_pud(struct mm_struct *mm, unsigned long addr) return NULL; pud = pud_offset(p4d, addr); - if (pud_none_or_clear_bad(pud)) + if (!pud_trans_huge(*pud) && !pud_devmap(*pud) && + pud_none_or_clear_bad(pud)) return NULL; return pud; @@ -511,12 +512,11 @@ unsigned long move_page_tables(struct vm_area_struct *vma, if (!new_pud) break; if (pud_trans_huge(*old_pud) || pud_devmap(*old_pud)) { - if (extent == HPAGE_PUD_SIZE) { - move_pgt_entry(HPAGE_PUD, vma, old_addr, new_addr, - old_pud, new_pud, need_rmap_locks); - /* We ignore and continue on error? */ + if (extent == HPAGE_PUD_SIZE && + move_pgt_entry(HPAGE_PUD, vma, old_addr, new_addr, + old_pud, new_pud, need_rmap_locks)) continue; - } + split_huge_pud(vma, old_pud, old_addr); } else if (IS_ENABLED(CONFIG_HAVE_MOVE_PUD) && extent == PUD_SIZE) { if (move_pgt_entry(NORMAL_PUD, vma, old_addr, new_addr, -- 2.53.0