From mboxrd@z Thu Jan 1 00:00:00 1970 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=1795028586; b=fjPSHnVPYtzEacJOWCj1IVuIVuQiATM8dkjifvGh2ZprdwgcVyeMPWBCIez3KAF3U3yv e/uaX48A8eHP/ShDMPv8oM+i0TkacXHLe57+VYNYn8Hzzxacp3auraKzgzgeCaHQuRyrG ySbvLzRYiTTF/wqtIUWBSVKDbUgXIgfN+0IGXGEiOJcy7w7K2F3FVApZWVhkoXYG1e50x pZonu8iMOPGqvCJejNSB71JZGfRusGHQVvQstjv7VgbGS7wsysd6rJipCTTYdeO9t0ir+ eRPf0pG7MeLLkgauUsODeX43ZpEXh2dSI9rIIhkyvkGTV49mPcOIFm7oeNhscxzQEfw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795028586; 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=H6ID6TlRYurhBTkz/fw19mDgZ7+vtrGQg8Ie1jQ/hcQ=; b=3x2NieouaRXw7hPLToCxmp4shzDjdmja/xUEdF3lfY4CwDs+Hdf60F9hWtQsLqyWMLmd Gp/56wV1IXboOmeHRi4cqNwvhRRqoRfKS2QyaiJfaxbLrdaL1GJgmuWexbjn8pYaZ2QQj gN2G1+kleOIBhN4rb0lw99RelXD/j2Sgw8Hjc0bNHfMIv2fAy/f49m/zAejDnExHdCWcq HjfCIbBTkZpCfldTXn4eifuEQEcvFmnR4iu+Qt6h9kH2TzNRCtTVGdZO/4WjyqRFku3pV JQ6/aUoMlOsPrsPo4xT0hm9Jk6yi8ROiGGcLsIQSx9Q7GZZHQrkosB9QR+kD8/RLd3g== 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=glDMNyii; 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 CB35C606A31C; Wed, 18 Nov 2026 19:03:06 +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=glDMNyii Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F4EA1F000C4; Wed, 18 Nov 2026 19:03:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795028586; bh=H6ID6TlRYurhBTkz/fw19mDgZ7+vtrGQg8Ie1jQ/hcQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=glDMNyii0hSx7L3i88GsYvCkU1QIKDF6jbqSU1yEGRACE8SFBwA02ZjTDPkZFmcQ3 0dFrnDnBMLwMsMtmqGCaZ6TOxMiqW+lN2a2OU4sTroDyyPg2c2XRXiLGZta6/Dqnhh dNasf9ipdDrfzdhps4qN0lSLmOuwge95kegurVPI= 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 6.12 0048/1756] mm/mremap: fix moving PUD leaves Date: Wed, 18 Nov 2026 15:36:15 +0100 Message-ID: <20261118150010.155654632@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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 pagetable_move_control-based calls to individual arguments while retaining explicit pud_devmap() checks. ] 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 d4666f1ab5939..079127769ea3a 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -47,7 +47,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; @@ -624,12 +625,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 && uffd_supports_move) { -- 2.53.0