From: Huang Ying <[email protected]> The address argument passed in madvise_free_huge_pmd() may be not THP aligned. But some THP operations like pmdp_invalidate(), set_pmd_at(), and tlb_remove_pmd_tlb_entry() need the address to be THP aligned. Fix this via using THP aligned address for these functions in madvise_free_huge_pmd().
Signed-off-by: "Huang, Ying" <[email protected]> Cc: "Kirill A. Shutemov" <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Shaohua Li <[email protected]> Cc: Zi Yan <[email protected]> Cc: [email protected] Cc: "Aneesh Kumar K.V" <[email protected]> --- mm/huge_memory.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 0cc62405de9c..c5e1bfb08bd7 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1617,6 +1617,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, struct page *page; struct mm_struct *mm = tlb->mm; bool ret = false; + unsigned long haddr = addr & HPAGE_PMD_MASK; tlb_remove_check_page_size_change(tlb, HPAGE_PMD_SIZE); @@ -1663,12 +1664,12 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, unlock_page(page); if (pmd_young(orig_pmd) || pmd_dirty(orig_pmd)) { - pmdp_invalidate(vma, addr, pmd); + pmdp_invalidate(vma, haddr, pmd); orig_pmd = pmd_mkold(orig_pmd); orig_pmd = pmd_mkclean(orig_pmd); - set_pmd_at(mm, addr, pmd, orig_pmd); - tlb_remove_pmd_tlb_entry(tlb, pmd, addr); + set_pmd_at(mm, haddr, pmd, orig_pmd); + tlb_remove_pmd_tlb_entry(tlb, pmd, haddr); } mark_page_lazyfree(page); -- 2.16.1
