Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78ddc534 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

thp: rename split_huge_page_pmd() to split_huge_pmd() 



We are going to decouple splitting THP PMD from splitting underlying
compound page.

This patch renames split_huge_page_pmd*() functions to split_huge_pmd*()
to reflect the fact that it doesn't imply page splitting, only PMD.

Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: default avatarSasha Levin <sasha.levin@oracle.com>
Tested-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: Steve Capper <steve.capper@linaro.org>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1caa957

arch/powerpc/mm/subpage-prot.c

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ static int subpage_walk_pmd_entry(pmd_t *pmd, unsigned long addr, 
				  unsigned long end, struct mm_walk *walk)

{

	struct vm_area_struct *vma = walk->vma;

	split_huge_page_pmd(vma, addr, pmd);

	split_huge_pmd(vma, pmd, addr);

	return 0;

}

arch/x86/kernel/vm86_32.c

+5 −1
Original line number Diff line number Diff line
@@ -175,7 +175,11 @@ static void mark_screen_rdonly(struct mm_struct *mm) 
	if (pud_none_or_clear_bad(pud))

		goto out;

	pmd = pmd_offset(pud, 0xA0000);

	split_huge_page_pmd_mm(mm, 0xA0000, pmd);



	if (pmd_trans_huge(*pmd)) {

		struct vm_area_struct *vma = find_vma(mm, 0xA0000);

		split_huge_pmd(vma, pmd, 0xA0000);

	}

	if (pmd_none_or_clear_bad(pmd))

		goto out;

	pte = pte_offset_map_lock(mm, pmd, 0xA0000, &ptl);

include/linux/huge_mm.h

+2 −6
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static inline int split_huge_page(struct page *page) 
}

extern void __split_huge_page_pmd(struct vm_area_struct *vma,

		unsigned long address, pmd_t *pmd);

#define split_huge_page_pmd(__vma, __address, __pmd)			\

#define split_huge_pmd(__vma, __pmd, __address)				\

	do {								\

		pmd_t *____pmd = (__pmd);				\

		if (unlikely(pmd_trans_huge(*____pmd)))			\
@@ -117,8 +117,6 @@ extern void __split_huge_page_pmd(struct vm_area_struct *vma, 
		BUG_ON(pmd_trans_splitting(*____pmd) ||			\

		       pmd_trans_huge(*____pmd));			\

	} while (0)

extern void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,

		pmd_t *pmd);

#if HPAGE_PMD_ORDER >= MAX_ORDER

#error "hugepages can't be allocated by the buddy allocator"

#endif
@@ -183,11 +181,9 @@ static inline int split_huge_page(struct page *page) 
{

	return 0;

}

#define split_huge_page_pmd(__vma, __address, __pmd)	\

	do { } while (0)

#define wait_split_huge_page(__anon_vma, __pmd)	\

	do { } while (0)

#define split_huge_page_pmd_mm(__mm, __address, __pmd)	\

#define split_huge_pmd(__vma, __pmd, __address)	\

	do { } while (0)

static inline int hugepage_madvise(struct vm_area_struct *vma,

				   unsigned long *vm_flags, int advice)

mm/gup.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ struct page *follow_page_mask(struct vm_area_struct *vma, 
		if (is_huge_zero_page(page)) {

			spin_unlock(ptl);

			ret = 0;

			split_huge_page_pmd(vma, address, pmd);

			split_huge_pmd(vma, pmd, address);

		} else {

			get_page(page);

			spin_unlock(ptl);

mm/huge_memory.c

+11 −21
Original line number Diff line number Diff line
@@ -1233,13 +1233,13 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 


	if (unlikely(!new_page)) {

		if (!page) {

			split_huge_page_pmd(vma, address, pmd);

			split_huge_pmd(vma, pmd, address);

			ret |= VM_FAULT_FALLBACK;

		} else {

			ret = do_huge_pmd_wp_page_fallback(mm, vma, address,

					pmd, orig_pmd, page, haddr);

			if (ret & VM_FAULT_OOM) {

				split_huge_page(page);

				split_huge_pmd(vma, pmd, address);

				ret |= VM_FAULT_FALLBACK;

			}

			put_user_huge_page(page);
@@ -1252,10 +1252,10 @@ int do_huge_pmd_wp_page(struct mm_struct *mm, struct vm_area_struct *vma, 
					   true))) {

		put_page(new_page);

		if (page) {

			split_huge_page(page);

			split_huge_pmd(vma, pmd, address);

			put_user_huge_page(page);

		} else

			split_huge_page_pmd(vma, address, pmd);

			split_huge_pmd(vma, pmd, address);

		ret |= VM_FAULT_FALLBACK;

		count_vm_event(THP_FAULT_FALLBACK);

		goto out;
@@ -3131,17 +3131,7 @@ void __split_huge_page_pmd(struct vm_area_struct *vma, unsigned long address, 
		goto again;

}



void split_huge_page_pmd_mm(struct mm_struct *mm, unsigned long address,

		pmd_t *pmd)

{

	struct vm_area_struct *vma;



	vma = find_vma(mm, address);

	BUG_ON(vma == NULL);

	split_huge_page_pmd(vma, address, pmd);

}



static void split_huge_page_address(struct mm_struct *mm,

static void split_huge_pmd_address(struct vm_area_struct *vma,

				    unsigned long address)

{

	pgd_t *pgd;
@@ -3150,7 +3140,7 @@ static void split_huge_page_address(struct mm_struct *mm, 


	VM_BUG_ON(!(address & ~HPAGE_PMD_MASK));



	pgd = pgd_offset(mm, address);

	pgd = pgd_offset(vma->vm_mm, address);

	if (!pgd_present(*pgd))

		return;
@@ -3159,13 +3149,13 @@ static void split_huge_page_address(struct mm_struct *mm, 
		return;



	pmd = pmd_offset(pud, address);

	if (!pmd_present(*pmd))

	if (!pmd_present(*pmd) || !pmd_trans_huge(*pmd))

		return;

	/*

	 * Caller holds the mmap_sem write mode, so a huge pmd cannot

	 * materialize from under us.

	 */

	split_huge_page_pmd_mm(mm, address, pmd);

	__split_huge_page_pmd(vma, address, pmd);

}



void vma_adjust_trans_huge(struct vm_area_struct *vma,
@@ -3181,7 +3171,7 @@ void vma_adjust_trans_huge(struct vm_area_struct *vma, 
	if (start & ~HPAGE_PMD_MASK &&

	    (start & HPAGE_PMD_MASK) >= vma->vm_start &&

	    (start & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE <= vma->vm_end)

		split_huge_page_address(vma->vm_mm, start);

		split_huge_pmd_address(vma, start);



	/*

	 * If the new end address isn't hpage aligned and it could
@@ -3191,7 +3181,7 @@ void vma_adjust_trans_huge(struct vm_area_struct *vma, 
	if (end & ~HPAGE_PMD_MASK &&

	    (end & HPAGE_PMD_MASK) >= vma->vm_start &&

	    (end & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE <= vma->vm_end)

		split_huge_page_address(vma->vm_mm, end);

		split_huge_pmd_address(vma, end);



	/*

	 * If we're also updating the vma->vm_next->vm_start, if the new
@@ -3205,6 +3195,6 @@ void vma_adjust_trans_huge(struct vm_area_struct *vma, 
		if (nstart & ~HPAGE_PMD_MASK &&

		    (nstart & HPAGE_PMD_MASK) >= next->vm_start &&

		    (nstart & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE <= next->vm_end)

			split_huge_page_address(next->vm_mm, nstart);

			split_huge_pmd_address(next, nstart);

	}

}