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

Commit 4b471e88 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm, thp: remove infrastructure for handling splitting PMDs 



With new refcounting we don't need to mark PMDs splitting.  Let's drop
code to handle this.

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 avatarVlastimil Babka <vbabka@suse.cz>
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
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 1f19617d

Documentation/features/vm/pmdp_splitting_flush/arch-support.txt

deleted100644 → 0
+0 −40
Original line number Diff line number Diff line 
#

# Feature name:          pmdp_splitting_flush

#         Kconfig:       __HAVE_ARCH_PMDP_SPLITTING_FLUSH

#         description:   arch supports the pmdp_splitting_flush() VM API

#

    -----------------------

    |         arch |status|

    -----------------------

    |       alpha: | TODO |

    |         arc: | TODO |

    |         arm: |  ok  |

    |       arm64: |  ok  |

    |       avr32: | TODO |

    |    blackfin: | TODO |

    |         c6x: | TODO |

    |        cris: | TODO |

    |         frv: | TODO |

    |       h8300: | TODO |

    |     hexagon: | TODO |

    |        ia64: | TODO |

    |        m32r: | TODO |

    |        m68k: | TODO |

    |       metag: | TODO |

    |  microblaze: | TODO |

    |        mips: |  ok  |

    |     mn10300: | TODO |

    |       nios2: | TODO |

    |    openrisc: | TODO |

    |      parisc: | TODO |

    |     powerpc: |  ok  |

    |        s390: |  ok  |

    |       score: | TODO |

    |          sh: | TODO |

    |       sparc: | TODO |

    |        tile: | TODO |

    |          um: | TODO |

    |   unicore32: | TODO |

    |         x86: |  ok  |

    |      xtensa: | TODO |

    -----------------------

fs/proc/task_mmu.c

+4 −4
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, 
	pte_t *pte;

	spinlock_t *ptl;



	if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) {

	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

		smaps_pmd_entry(pmd, addr, walk);

		spin_unlock(ptl);

		return 0;
@@ -913,7 +913,7 @@ static int clear_refs_pte_range(pmd_t *pmd, unsigned long addr, 
	spinlock_t *ptl;

	struct page *page;



	if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) {

	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

		if (cp->type == CLEAR_REFS_SOFT_DIRTY) {

			clear_soft_dirty_pmd(vma, addr, pmd);

			goto out;
@@ -1187,7 +1187,7 @@ static int pagemap_pmd_range(pmd_t *pmdp, unsigned long addr, unsigned long end, 
	int err = 0;



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	if (pmd_trans_huge_lock(pmdp, vma, &ptl) == 1) {

	if (pmd_trans_huge_lock(pmdp, vma, &ptl)) {

		u64 flags = 0, frame = 0;

		pmd_t pmd = *pmdp;
@@ -1519,7 +1519,7 @@ static int gather_pte_stats(pmd_t *pmd, unsigned long addr, 
	pte_t *orig_pte;

	pte_t *pte;



	if (pmd_trans_huge_lock(pmd, vma, &ptl) == 1) {

	if (pmd_trans_huge_lock(pmd, vma, &ptl)) {

		pte_t huge_pte = *(pte_t *)pmd;

		struct page *page;

include/asm-generic/pgtable.h

+0 −9
Original line number Diff line number Diff line
@@ -207,11 +207,6 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, 
#endif /* CONFIG_TRANSPARENT_HUGEPAGE */

#endif



#ifndef __HAVE_ARCH_PMDP_SPLITTING_FLUSH

extern void pmdp_splitting_flush(struct vm_area_struct *vma,

				 unsigned long address, pmd_t *pmdp);

#endif



#ifndef pmdp_collapse_flush

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

extern pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
@@ -627,10 +622,6 @@ static inline int pmd_trans_huge(pmd_t pmd) 
{

	return 0;

}

static inline int pmd_trans_splitting(pmd_t pmd)

{

	return 0;

}

#ifndef __HAVE_ARCH_PMD_WRITE

static inline int pmd_write(pmd_t pmd)

{

include/linux/huge_mm.h

+6 −15
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ extern int zap_huge_pmd(struct mmu_gather *tlb, 
extern int mincore_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd,

			unsigned long addr, unsigned long end,

			unsigned char *vec);

extern int move_huge_pmd(struct vm_area_struct *vma,

extern bool move_huge_pmd(struct vm_area_struct *vma,

			 struct vm_area_struct *new_vma,

			 unsigned long old_addr,

			 unsigned long new_addr, unsigned long old_end,
@@ -48,15 +48,9 @@ enum transparent_hugepage_flag { 
#endif

};



enum page_check_address_pmd_flag {

	PAGE_CHECK_ADDRESS_PMD_FLAG,

	PAGE_CHECK_ADDRESS_PMD_NOTSPLITTING_FLAG,

	PAGE_CHECK_ADDRESS_PMD_SPLITTING_FLAG,

};

extern pmd_t *page_check_address_pmd(struct page *page,

				     struct mm_struct *mm,

				     unsigned long address,

				     enum page_check_address_pmd_flag flag,

				     spinlock_t **ptl);



#define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
@@ -100,7 +94,6 @@ extern unsigned long transparent_hugepage_flags; 
#define split_huge_page(page) BUILD_BUG()

#define split_huge_pmd(__vma, __pmd, __address) BUILD_BUG()



#define wait_split_huge_page(__anon_vma, __pmd) BUILD_BUG()

#if HPAGE_PMD_ORDER >= MAX_ORDER

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

#endif
@@ -110,17 +103,17 @@ extern void vma_adjust_trans_huge(struct vm_area_struct *vma, 
				    unsigned long start,

				    unsigned long end,

				    long adjust_next);

extern int __pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

extern bool __pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl);

/* mmap_sem must be held on entry */

static inline int pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

static inline bool pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl)

{

	VM_BUG_ON_VMA(!rwsem_is_locked(&vma->vm_mm->mmap_sem), vma);

	if (pmd_trans_huge(*pmd))

		return __pmd_trans_huge_lock(pmd, vma, ptl);

	else

		return 0;

		return false;

}

static inline int hpage_nr_pages(struct page *page)

{
@@ -165,8 +158,6 @@ static inline int split_huge_page(struct page *page) 
{

	return 0;

}

#define wait_split_huge_page(__anon_vma, __pmd)	\

	do { } while (0)

#define split_huge_pmd(__vma, __pmd, __address)	\

	do { } while (0)

static inline int hugepage_madvise(struct vm_area_struct *vma,
@@ -181,10 +172,10 @@ static inline void vma_adjust_trans_huge(struct vm_area_struct *vma, 
					 long adjust_next)

{

}

static inline int pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

static inline bool pmd_trans_huge_lock(pmd_t *pmd, struct vm_area_struct *vma,

		spinlock_t **ptl)

{

	return 0;

	return false;

}



static inline int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,

mm/gup.c

+1 −11
Original line number Diff line number Diff line
@@ -241,13 +241,6 @@ struct page *follow_page_mask(struct vm_area_struct *vma, 
		spin_unlock(ptl);

		return follow_page_pte(vma, address, pmd, flags);

	}



	if (unlikely(pmd_trans_splitting(*pmd))) {

		spin_unlock(ptl);

		wait_split_huge_page(vma->anon_vma, pmd);

		return follow_page_pte(vma, address, pmd, flags);

	}



	if (flags & FOLL_SPLIT) {

		int ret;

		page = pmd_page(*pmd);
@@ -1068,9 +1061,6 @@ struct page *get_dump_page(unsigned long addr) 
 *  *) HAVE_RCU_TABLE_FREE is enabled, and tlb_remove_table is used to free

 *      pages containing page tables.

 *

 *  *) THP splits will broadcast an IPI, this can be achieved by overriding

 *      pmdp_splitting_flush.

 *

 *  *) ptes can be read atomically by the architecture.

 *

 *  *) access_ok is sufficient to validate userspace address ranges.
@@ -1267,7 +1257,7 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, 
		pmd_t pmd = READ_ONCE(*pmdp);



		next = pmd_addr_end(addr, end);

		if (pmd_none(pmd) || pmd_trans_splitting(pmd))

		if (pmd_none(pmd))

			return 0;



		if (unlikely(pmd_trans_huge(pmd) || pmd_huge(pmd))) {