korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

huge mm: move_huge_pmd does not need new_vma

Browse Source 
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>
This commit is contained in:
Hugh Dickins 2016-05-19 17:12:54 -07:00 committed by Linus Torvalds
parent 52b6f46bc1
commit bf8616d5fa
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/huge_mm.h
View File

@ -28,9 +28,7 @@ extern int zap_huge_pmd(struct mmu_gather *tlb,
extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,
unsigned long addr, unsigned long end, unsigned long addr, unsigned long end,
unsigned char *vec); unsigned char *vec);
extern bool move_huge_pmd(struct vm_area_struct *vma, extern bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
struct vm_area_struct *new_vma,
unsigned long old_addr,
unsigned long new_addr, unsigned long old_end, unsigned long new_addr, unsigned long old_end,
pmd_t *old_pmd, pmd_t *new_pmd); pmd_t *old_pmd, pmd_t *new_pmd);
extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, extern int change_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,

7
mm/huge_memory.c
View File

@ -1698,20 +1698,17 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
return 1; return 1;
} }
bool move_huge_pmd(struct vm_area_struct *vma, struct vm_area_struct *new_vma, bool move_huge_pmd(struct vm_area_struct *vma, unsigned long old_addr,
unsigned long old_addr,
unsigned long new_addr, unsigned long old_end, unsigned long new_addr, unsigned long old_end,
pmd_t *old_pmd, pmd_t *new_pmd) pmd_t *old_pmd, pmd_t *new_pmd)
{ {
spinlock_t *old_ptl, *new_ptl; spinlock_t *old_ptl, *new_ptl;
pmd_t pmd; pmd_t pmd;
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
if ((old_addr & ~HPAGE_PMD_MASK) || if ((old_addr & ~HPAGE_PMD_MASK) ||
(new_addr & ~HPAGE_PMD_MASK) || (new_addr & ~HPAGE_PMD_MASK) ||
old_end - old_addr < HPAGE_PMD_SIZE || old_end - old_addr < HPAGE_PMD_SIZE)
(new_vma->vm_flags & VM_NOHUGEPAGE))
return false; return false;
/* /*

5
mm/mremap.c
View File

@ -198,9 +198,8 @@ unsigned long move_page_tables(struct vm_area_struct *vma,
/* See comment in move_ptes() */ /* See comment in move_ptes() */
if (need_rmap_locks) if (need_rmap_locks)
anon_vma_lock_write(vma->anon_vma); anon_vma_lock_write(vma->anon_vma);
moved = move_huge_pmd(vma, new_vma, old_addr, moved = move_huge_pmd(vma, old_addr, new_addr,
new_addr, old_end, old_end, old_pmd, new_pmd);
old_pmd, new_pmd);
if (need_rmap_locks) if (need_rmap_locks)
anon_vma_unlock_write(vma->anon_vma); anon_vma_unlock_write(vma->anon_vma);
if (moved) { if (moved) {