| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: fs-proc-task_mmu-implement-ioctl-to-get-and-optionally-clear-info-about-ptes-fix |
| Date: Mon Sep 25 10:53:52 AM PDT 2023 |
| |
| update it for "mm: hugetlb: add huge page size param to set_huge_pte_at()". |
| |
| Cc: Muhammad Usama Anjum <usama.anjum@collabora.com> |
| Cc: Ryan Roberts <ryan.roberts@arm.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/proc/task_mmu.c | 8 ++++++-- |
| 1 file changed, 6 insertions(+), 2 deletions(-) |
| |
| --- a/fs/proc/task_mmu.c~fs-proc-task_mmu-implement-ioctl-to-get-and-optionally-clear-info-about-ptes-fix |
| +++ a/fs/proc/task_mmu.c |
| @@ -1923,18 +1923,22 @@ static void make_uffd_wp_huge_pte(struct |
| unsigned long addr, pte_t *ptep, |
| pte_t ptent) |
| { |
| + unsigned long psize; |
| + |
| if (is_hugetlb_entry_hwpoisoned(ptent) || is_pte_marker(ptent)) |
| return; |
| |
| + psize = huge_page_size(hstate_vma(vma)); |
| + |
| if (is_hugetlb_entry_migration(ptent)) |
| set_huge_pte_at(vma->vm_mm, addr, ptep, |
| - pte_swp_mkuffd_wp(ptent)); |
| + pte_swp_mkuffd_wp(ptent), psize); |
| else if (!huge_pte_none(ptent)) |
| huge_ptep_modify_prot_commit(vma, addr, ptep, ptent, |
| huge_pte_mkuffd_wp(ptent)); |
| else |
| set_huge_pte_at(vma->vm_mm, addr, ptep, |
| - make_pte_marker(PTE_MARKER_UFFD_WP)); |
| + make_pte_marker(PTE_MARKER_UFFD_WP), psize); |
| } |
| #endif /* CONFIG_HUGETLB_PAGE */ |
| |
| _ |
