Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

huge mm: move_huge_pmd does not need new_vma

Remove move_huge_pmd()'s redundant new_vma arg: all it was used for was
a VM_NOHUGEPAGE check on new_vma flags, but the new_vma is cloned from
the old vma, so a trans_huge_pmd in the new_vma will be as acceptable as
it was in the old vma, alignment and size permitting.

Signed-off-by: Hugh Dickins <hughd@google.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Andres Lagar-Cavilla <andreslc@google.com>
Cc: Yang Shi <yang.shi@linaro.org>
Cc: Ning Qu <quning@gmail.com>
Cc: Mel Gorman <mgorman@techsingularity.net>
Cc: Andres Lagar-Cavilla <andreslc@google.com>
Cc: Konstantin Khlebnikov <koct9i@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Hugh Dickins and committed by
Linus Torvalds
bf8616d5 52b6f46b

+5 -11
+1 -3
include/linux/huge_mm.h
··· 28 28 extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, 29 29 unsigned long addr, unsigned long end, 30 30 unsigned char *vec); 31 - extern bool move_huge_pmd(struct vm_area_struct *vma, 32 - struct vm_area_struct *new_vma, 33 - unsigned long old_addr, 31 + extern bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, 34 32 unsigned long new_addr, unsigned long old_end, 35 33 pmd_t *old_pmd, pmd_t *new_pmd); 36 34 extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
+2 -5
mm/huge_memory.c
··· 1698 1698 return 1; 1699 1699 } 1700 1700 1701 - bool move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma, 1702 - unsigned long old_addr, 1701 + bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr, 1703 1702 unsigned long new_addr, unsigned long old_end, 1704 1703 pmd_t *old_pmd, pmd_t *new_pmd) 1705 1704 { 1706 1705 spinlock_t *old_ptl, *new_ptl; 1707 1706 pmd_t pmd; 1708 - 1709 1707 struct mm_struct *mm = vma->vm_mm; 1710 1708 1711 1709 if ((old_addr & ~HPAGE_PMD_MASK) || 1712 1710 (new_addr & ~HPAGE_PMD_MASK) || 1713 - old_end - old_addr < HPAGE_PMD_SIZE || 1714 - (new_vma->vm_flags & VM_NOHUGEPAGE)) 1711 + old_end - old_addr < HPAGE_PMD_SIZE) 1715 1712 return false; 1716 1713 1717 1714 /*
+2 -3
mm/mremap.c
··· 198 198 /* See comment in move_ptes() */ 199 199 if (need_rmap_locks) 200 200 anon_vma_lock_write(vma->anon_vma); 201 - moved = move_huge_pmd(vma, new_vma, old_addr, 202 - new_addr, old_end, 203 - old_pmd, new_pmd); 201 + moved = move_huge_pmd(vma, old_addr, new_addr, 202 + old_end, old_pmd, new_pmd); 204 203 if (need_rmap_locks) 205 204 anon_vma_unlock_write(vma->anon_vma); 206 205 if (moved) {