From: Sasha Levin Date: Mon, 13 Apr 2026 22:22:12 +0000 (-0400) Subject: fix up 5 hugetlb/rmap patches in queue-5.10: add missing commit upstream lines X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5c53bed1067a926193e7615dedf0a59005ba512;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 5 hugetlb/rmap patches in queue-5.10: add missing commit upstream lines Added "commit XXX upstream." annotations to: - mm-hugetlb-fix-copy_hugetlb_page_range-to-use-pt_sha.patch (commit 14967a9c7d247841b0312c48dcf8cd29e55a4cc8 upstream) - mm-hugetlb-fix-hugetlb_pmd_shared.patch (commit ca1a47cd3f5f4c46ca188b1c9a27af87d1ab2216 upstream - fixed capitalization) - mm-hugetlb-fix-two-comments-related-to-huge_pmd_unsh.patch (commit 3937027caecb4f8251e82dd857ba1d749bb5a428 upstream) - mm-hugetlb-make-detecting-shared-pte-more-reliable.patch (commit 3aa4ed8040e1535d95c03cef8b52cf11bf0d8546 upstream) - mm-rmap-fix-two-comments-related-to-huge_pmd_unshare.patch (commit a8682d500f691b6dfaa16ae1502d990aeb86e8be upstream) These patches were identified by Ben Hutchings as missing the standard upstream commit reference annotation. --- diff --git a/queue-5.10/mm-hugetlb-fix-copy_hugetlb_page_range-to-use-pt_sha.patch b/queue-5.10/mm-hugetlb-fix-copy_hugetlb_page_range-to-use-pt_sha.patch index 230e1e4aba..e964fb90a3 100644 --- a/queue-5.10/mm-hugetlb-fix-copy_hugetlb_page_range-to-use-pt_sha.patch +++ b/queue-5.10/mm-hugetlb-fix-copy_hugetlb_page_range-to-use-pt_sha.patch @@ -5,6 +5,8 @@ Subject: mm/hugetlb: fix copy_hugetlb_page_range() to use ->pt_share_count From: Jane Chu +commit 14967a9c7d247841b0312c48dcf8cd29e55a4cc8 upstream. + commit 59d9094df3d79 ("mm: hugetlb: independent PMD page table shared count") introduced ->pt_share_count dedicated to hugetlb PMD share count tracking, but omitted fixing copy_hugetlb_page_range(), leaving the diff --git a/queue-5.10/mm-hugetlb-fix-hugetlb_pmd_shared.patch b/queue-5.10/mm-hugetlb-fix-hugetlb_pmd_shared.patch index 56143fd61e..f47755861f 100644 --- a/queue-5.10/mm-hugetlb-fix-hugetlb_pmd_shared.patch +++ b/queue-5.10/mm-hugetlb-fix-hugetlb_pmd_shared.patch @@ -5,7 +5,7 @@ Subject: mm/hugetlb: fix hugetlb_pmd_shared() From: David Hildenbrand (Red Hat) -Commit ca1a47cd3f5f4c46ca188b1c9a27af87d1ab2216 upstream. +commit ca1a47cd3f5f4c46ca188b1c9a27af87d1ab2216 upstream. Patch series "mm/hugetlb: fixes for PMD table sharing (incl. using mmu_gather)", v3. diff --git a/queue-5.10/mm-hugetlb-fix-two-comments-related-to-huge_pmd_unsh.patch b/queue-5.10/mm-hugetlb-fix-two-comments-related-to-huge_pmd_unsh.patch index 604632eeae..b709e60498 100644 --- a/queue-5.10/mm-hugetlb-fix-two-comments-related-to-huge_pmd_unsh.patch +++ b/queue-5.10/mm-hugetlb-fix-two-comments-related-to-huge_pmd_unsh.patch @@ -5,6 +5,8 @@ Subject: mm/hugetlb: fix two comments related to huge_pmd_unshare() From: David Hildenbrand (Red Hat) +commit 3937027caecb4f8251e82dd857ba1d749bb5a428 upstream. + Ever since we stopped using the page count to detect shared PMD page tables, these comments are outdated. diff --git a/queue-5.10/mm-hugetlb-make-detecting-shared-pte-more-reliable.patch b/queue-5.10/mm-hugetlb-make-detecting-shared-pte-more-reliable.patch index ed81b64b57..7131891e6d 100644 --- a/queue-5.10/mm-hugetlb-make-detecting-shared-pte-more-reliable.patch +++ b/queue-5.10/mm-hugetlb-make-detecting-shared-pte-more-reliable.patch @@ -5,6 +5,8 @@ Subject: mm/hugetlb: make detecting shared pte more reliable From: Miaohe Lin +commit 3aa4ed8040e1535d95c03cef8b52cf11bf0d8546 upstream. + If the pagetables are shared, we shouldn't copy or take references. Since src could have unshared and dst shares with another vma, huge_pte_none() is thus used to determine whether dst_pte is shared. But this check isn't diff --git a/queue-5.10/mm-rmap-fix-two-comments-related-to-huge_pmd_unshare.patch b/queue-5.10/mm-rmap-fix-two-comments-related-to-huge_pmd_unshare.patch index 3f84ed8095..93e3e771f4 100644 --- a/queue-5.10/mm-rmap-fix-two-comments-related-to-huge_pmd_unshare.patch +++ b/queue-5.10/mm-rmap-fix-two-comments-related-to-huge_pmd_unshare.patch @@ -5,6 +5,8 @@ Subject: mm/rmap: fix two comments related to huge_pmd_unshare() From: David Hildenbrand (Red Hat) +commit a8682d500f691b6dfaa16ae1502d990aeb86e8be upstream. + PMD page table unsharing no longer touches the refcount of a PMD page table. Also, it is not about dropping the refcount of a "PMD page" but the "PMD page table".