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 F1B2A331EA7 for ; Fri, 31 Jul 2026 02:41:53 +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=1785465715; cv=none; b=pHw58CdVZGLe1Ua4R52wc2ZwX5l9ToIF9BWoiJdwvPBEdJdMUTyCpFCK9Y3fDrMO0SnkUgbazv2j2uKw4ZUn4y7pFSGXxa+TtabMrt1axxIxaFdR6NuuZhNMS0qjllut9NAEhhAvfcgG3rqqYoI/YyOHbqIe7ANKyaRp5Yjtd7g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785465715; c=relaxed/simple; bh=JH6w6tPslZsk2ZXM4R2PBzF2TBtc5JSZUXD6nlNTr8M=; h=Date:To:From:Subject:Message-Id; b=UnHonG5rhKHjbj+QNwHEQcGtbF3utO32WrGDL1806eBapCKIAsTcPCKqlyl6+OJZJf4wWeJuUhJJNqXi3YRWuIxn8Ww2k3/TZ9VgE67pcBLahHSRhkb4E0IqhWa3aNgSH7A+xVhsHlCMS/+66PPM0WYH+NSgFmwA6FO8nnh4jj4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=OJlKDE69; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="OJlKDE69" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 61D531F000E9; Fri, 31 Jul 2026 02:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1785465713; bh=bfp4LE8MvS9/DC5Yt3++3eCzIg6BxWt5wq8BbUAmOAE=; h=Date:To:From:Subject; b=OJlKDE69UR0fkkAJA3pT+9FiCR301/ORACSr/Bm506hwO+C6Xe52GTzanhiBOCz78 4mJF/uXJChX5HbHGueKdP8n4TiVGAPFjgzym+OWVrUyEc8C1mnU/Ra9B/mh52PbBWj CutMEHe3wXWJL65E/r9GBtZDS3Dc3USN2DRJwNF0= Date: Thu, 30 Jul 2026 19:41:52 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,ying.huang@linux.alibaba.com,willy@infradead.org,vbabka@kernel.org,shikemeng@huaweicloud.com,shakeel.butt@linux.dev,ryan.roberts@arm.com,riel@surriel.com,nphamcs@gmail.com,npache@redhat.com,ljs@kernel.org,liam@infradead.org,lance.yang@linux.dev,kasong@tencent.com,kas@kernel.org,hannes@cmpxchg.org,dev.jain@arm.com,david@kernel.org,chrisl@kernel.org,baoquan.he@linux.dev,baolin.wang@linux.alibaba.com,baohua@kernel.org,alex@ghiti.fr,usama.arif@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-huge_memory-move-softleaf_to_folio-inside-migration-branch.patch removed from -mm tree Message-Id: <20260731024153.61D531F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/huge_memory: move softleaf_to_folio() inside migration branch has been removed from the -mm tree. Its filename was mm-huge_memory-move-softleaf_to_folio-inside-migration-branch.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Usama Arif Subject: mm/huge_memory: move softleaf_to_folio() inside migration branch Date: Mon, 6 Jul 2026 04:42:06 -0700 change_non_present_huge_pmd() calls softleaf_to_folio() unconditionally at the top of the function. softleaf_to_folio() extracts a PFN from the entry and converts it to a folio pointer, which is only meaningful for migration and device_private entries that encode a real PFN. A swap entry encodes a swap offset instead, so softleaf_to_folio() would produce a bogus pointer and crash on mprotect() when a PMD swap entry is present. Move the call into the migration_write branch where the folio is actually used, so the function is safe for any non-present PMD type. Link: https://lore.kernel.org/20260706114320.1643046-5-usama.arif@linux.dev Signed-off-by: Usama Arif Acked-by: David Hildenbrand (Arm) Reviewed-by: Dev Jain Reviewed-by: Zi Yan Cc: Alexandre Ghiti Cc: Baolin Wang Cc: Baoquan He Cc: Barry Song Cc: Chris Li Cc: "Huang, Ying" Cc: Johannes Weiner Cc: Kairui Song Cc: Kemeng Shi Cc: Kiryl Shutsemau Cc: Lance Yang Cc: Liam R. Howlett Cc: Lorenzo Stoakes Cc: Matthew Wilcox (Oracle) Cc: Nhat Pham Cc: Nico Pache Cc: Rik van Riel Cc: Ryan Roberts Cc: Shakeel Butt Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/huge_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/mm/huge_memory.c~mm-huge_memory-move-softleaf_to_folio-inside-migration-branch +++ a/mm/huge_memory.c @@ -2557,11 +2557,12 @@ static void change_non_present_huge_pmd( bool uffd_wp_resolve) { softleaf_t entry = softleaf_from_pmd(*pmd); - const struct folio *folio = softleaf_to_folio(entry); pmd_t newpmd; VM_WARN_ON(!pmd_is_valid_softleaf(*pmd)); if (softleaf_is_migration_write(entry)) { + const struct folio *folio = softleaf_to_folio(entry); + /* * A protection check is difficult so * just be safe and disable write _ Patches currently in -mm which might be from usama.arif@linux.dev are mm-mempolicy-skip-non-present-pmds-when-queueing-folios.patch mm-madvise-skip-device-private-pmds-in-cold-and-pageout-walks.patch mm-huge_memory-skip-device-private-pmds-in-madvise_free_huge_pmd.patch mm-vmstat-mm-memcontrol-add-_monotonic-vmstat-readers.patch mm-vmscan-reduce-lru_lock-contention-via-vmstat-derived-scan-balance-cost.patch