From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 58CB72FDC3C for ; Wed, 18 Feb 2026 13:06:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771419965; cv=none; b=qgYUOXt8JemF9WDs91Eh3yo/+Fa1WUKGu3EalXAfMCFWAmENq1rOpP+aoiZeayUmpDNqAZLVHg3X7+en7rUE+45EUl4u2KBW0j9NxUdiWj8IFs1fUu2guv0x31xgGPVN9lidufcLGmZ+cY0RqJjJWU52YajSbkh0vwWxHR44eT8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771419965; c=relaxed/simple; bh=6hsTAe3F6SFDAEMSoXMlTVM/m77RYjqo0PE8OHxHQF0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DzpbAbx8fM6edbBn86kbH7eQpS6lfXEKicgWXckfZjzH0zUHPZ82bCNdr/gmCuu17hzl1pLkhPL0TF1u3N3ocZWryD9g0bta3lrdLh6C1POJ+jVdlrSJnl6ihUxNncH3rUUwzjvlrm74yWknji2hOjkahzkQFbwzf5xRFcPX1C8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=W67mlTCK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="W67mlTCK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81365C19421; Wed, 18 Feb 2026 13:06:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771419965; bh=6hsTAe3F6SFDAEMSoXMlTVM/m77RYjqo0PE8OHxHQF0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W67mlTCKp72Zw4n9T5Y138as/HTEXsStwujszIVALFiBNltq9AwOHYT6/DcHNLQjc jeWoLrMgBBn+Y5PrP5CA2OHhb7Ff9nGjlQR9EtfrTacIJpQKbAn7Wax9h6t7taifxa 8on73z29A63mz8hvQQCkQVHGe6Ng32rZT7kaIb8Qe9sp6Erh7DmMsGJc1IYNZAZMvZ HuQuWT/hS60Q6fHg9dbFnAJpL1/xX236ed4Q+/h/i3eKp/IZDW2LK61LCXyfEf5Q+R tJ9dLzHYB5Xxc/7iV+bi6Fi5XDYMkoNdn93MiZ81dYjd+f8BDqQaq/awbvIa/2Fvx4 QPQAdiw++AR/Q== From: "David Hildenbrand (Arm)" To: stable@vger.kernel.org Cc: linux-mm@kvack.org, "David Hildenbrand (Arm)" , Jane Chu , Harry Yoo , Oscar Salvador , Jann Horn , Liu Shixin , Muchun Song , Andrew Morton , Rik van Riel , Laurence Oberman , Lance Yang , Miaohe Lin , James Houghton Subject: [PATCH 5.10.y 1/7] mm/hugetlb: fix skipping of unsharing of pmd page tables Date: Wed, 18 Feb 2026 14:05:46 +0100 Message-ID: <20260218130552.55727-2-david@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260218130552.55727-1-david@kernel.org> References: <2026012610-absolve-ducktail-3c64@gregkh> <20260218130552.55727-1-david@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit In the 5.10 backport of commit b30c14cd6102 ("hugetlb: unshare some PMDs when splitting VMAs") we seemed to have missed that huge_pmd_unshare() still adjusts the address itself. For this reason, commit 6dfeaff93be1 ("hugetlb/userfaultfd: unshare all pmds for hugetlbfs when register wp") explicitly handled this case by passing a temporary variable instead. Fix it in 5.10 by doing the same thing. Fixes: f1082f5f3d02 ("hugetlb: unshare some PMDs when splitting VMAs") Signed-off-by: David Hildenbrand (Arm) --- mm/hugetlb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 8efe35ea0baa..99a71943c1f6 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5787,11 +5787,14 @@ static void hugetlb_unshare_pmds(struct vm_area_struct *vma, i_mmap_assert_write_locked(vma->vm_file->f_mapping); } for (address = start; address < end; address += PUD_SIZE) { + unsigned long tmp = address; + ptep = huge_pte_offset(mm, address, sz); if (!ptep) continue; ptl = huge_pte_lock(h, mm, ptep); - huge_pmd_unshare(mm, vma, &address, ptep); + /* We don't want 'address' to be changed */ + huge_pmd_unshare(mm, vma, &tmp, ptep); spin_unlock(ptl); } flush_hugetlb_tlb_range(vma, start, end); -- 2.43.0