thp: khugepaged vma merge
register in khugepaged if the vma grows. Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ba76149f47
commit
b15d00b6af
|
@ -29,6 +29,7 @@
|
|||
#include <linux/mmu_notifier.h>
|
||||
#include <linux/perf_event.h>
|
||||
#include <linux/audit.h>
|
||||
#include <linux/khugepaged.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/cacheflush.h>
|
||||
|
@ -815,6 +816,7 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
|
|||
end, prev->vm_pgoff, NULL);
|
||||
if (err)
|
||||
return NULL;
|
||||
khugepaged_enter_vma_merge(prev);
|
||||
return prev;
|
||||
}
|
||||
|
||||
|
@ -833,6 +835,7 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
|
|||
next->vm_pgoff - pglen, NULL);
|
||||
if (err)
|
||||
return NULL;
|
||||
khugepaged_enter_vma_merge(area);
|
||||
return area;
|
||||
}
|
||||
|
||||
|
@ -1761,6 +1764,7 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
|
|||
}
|
||||
}
|
||||
vma_unlock_anon_vma(vma);
|
||||
khugepaged_enter_vma_merge(vma);
|
||||
return error;
|
||||
}
|
||||
#endif /* CONFIG_STACK_GROWSUP || CONFIG_IA64 */
|
||||
|
@ -1808,6 +1812,7 @@ static int expand_downwards(struct vm_area_struct *vma,
|
|||
}
|
||||
}
|
||||
vma_unlock_anon_vma(vma);
|
||||
khugepaged_enter_vma_merge(vma);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue