diff options
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/huge_memory.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1841e0ceac23..1a90f55d930f 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2433,6 +2433,9 @@ static bool __collapse_huge_page_swapin(struct mm_struct *mm, /* vma is no longer available, don't continue to swapin */ if (hugepage_vma_revalidate(mm, address)) return false; + /* check if the pmd is still valid */ + if (mm_find_pmd(mm, address) != pmd) + return false; } if (ret & VM_FAULT_ERROR) { trace_mm_collapse_huge_page_swapin(mm, swapped_in, 0); @@ -2518,6 +2521,9 @@ static void collapse_huge_page(struct mm_struct *mm, result = hugepage_vma_revalidate(mm, address); if (result) goto out; + /* check if the pmd is still valid */ + if (mm_find_pmd(mm, address) != pmd) + goto out; anon_vma_lock_write(vma->anon_vma); |