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

Commit 1f19617d authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

x86, 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>
Acked-by: default avatarJerome Marchand <jmarchan@redhat.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Vlastimil 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 702b63ca

arch/x86/include/asm/pgtable.h

+0 −9
Original line number Original line Diff line number Diff line
@@ -162,11 +162,6 @@ static inline int pmd_large(pmd_t pte) 
}

}





#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static inline int pmd_trans_splitting(pmd_t pmd)

{

	return pmd_val(pmd) & _PAGE_SPLITTING;

}



static inline int pmd_trans_huge(pmd_t pmd)

static inline int pmd_trans_huge(pmd_t pmd)

{

{

	return pmd_val(pmd) & _PAGE_PSE;

	return pmd_val(pmd) & _PAGE_PSE;
@@ -808,10 +803,6 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma, 
				  unsigned long address, pmd_t *pmdp);

				  unsigned long address, pmd_t *pmdp);









#define __HAVE_ARCH_PMDP_SPLITTING_FLUSH

extern void pmdp_splitting_flush(struct vm_area_struct *vma,

				 unsigned long addr, pmd_t *pmdp);



#define __HAVE_ARCH_PMD_WRITE

#define __HAVE_ARCH_PMD_WRITE

static inline int pmd_write(pmd_t pmd)

static inline int pmd_write(pmd_t pmd)

{

{

arch/x86/include/asm/pgtable_types.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -22,7 +22,6 @@ 
#define _PAGE_BIT_PAT_LARGE	12	/* On 2MB or 1GB pages */

#define _PAGE_BIT_PAT_LARGE	12	/* On 2MB or 1GB pages */

#define _PAGE_BIT_SPECIAL	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_SPECIAL	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_CPA_TEST	_PAGE_BIT_SOFTW1

#define _PAGE_BIT_SPLITTING	_PAGE_BIT_SOFTW2 /* only valid on a PSE pmd */

#define _PAGE_BIT_HIDDEN	_PAGE_BIT_SOFTW3 /* hidden by kmemcheck */

#define _PAGE_BIT_HIDDEN	_PAGE_BIT_SOFTW3 /* hidden by kmemcheck */

#define _PAGE_BIT_SOFT_DIRTY	_PAGE_BIT_SOFTW3 /* software dirty tracking */

#define _PAGE_BIT_SOFT_DIRTY	_PAGE_BIT_SOFTW3 /* software dirty tracking */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */

#define _PAGE_BIT_NX           63       /* No execute: only valid after cpuid check */
@@ -46,7 +45,6 @@ 
#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_PAT_LARGE (_AT(pteval_t, 1) << _PAGE_BIT_PAT_LARGE)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)

#define _PAGE_SPECIAL	(_AT(pteval_t, 1) << _PAGE_BIT_SPECIAL)

#define _PAGE_CPA_TEST	(_AT(pteval_t, 1) << _PAGE_BIT_CPA_TEST)

#define _PAGE_CPA_TEST	(_AT(pteval_t, 1) << _PAGE_BIT_CPA_TEST)

#define _PAGE_SPLITTING	(_AT(pteval_t, 1) << _PAGE_BIT_SPLITTING)

#define __HAVE_ARCH_PTE_SPECIAL

#define __HAVE_ARCH_PTE_SPECIAL





#ifdef CONFIG_KMEMCHECK

#ifdef CONFIG_KMEMCHECK

arch/x86/mm/gup.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -156,18 +156,7 @@ static int gup_pmd_range(pud_t pud, unsigned long addr, unsigned long end, 
		pmd_t pmd = *pmdp;

		pmd_t pmd = *pmdp;





		next = pmd_addr_end(addr, end);

		next = pmd_addr_end(addr, end);

		/*

		if (pmd_none(pmd))

		 * The pmd_trans_splitting() check below explains why

		 * pmdp_splitting_flush has to flush the tlb, to stop

		 * this gup-fast code from running while we set the

		 * splitting bit in the pmd. Returning zero will take

		 * the slow path that will call wait_split_huge_page()

		 * if the pmd is still in splitting state. gup-fast

		 * can't because it has irq disabled and

		 * wait_split_huge_page() would never return as the

		 * tlb flush IPI wouldn't run.

		 */

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

			return 0;

			return 0;

		if (unlikely(pmd_large(pmd) || !pmd_present(pmd))) {

		if (unlikely(pmd_large(pmd) || !pmd_present(pmd))) {

			/*

			/*

arch/x86/mm/pgtable.c

+0 −13
Original line number Original line Diff line number Diff line
@@ -505,19 +505,6 @@ int pmdp_clear_flush_young(struct vm_area_struct *vma, 




	return young;

	return young;

}

}



void pmdp_splitting_flush(struct vm_area_struct *vma,

			  unsigned long address, pmd_t *pmdp)

{

	int set;

	VM_BUG_ON(address & ~HPAGE_PMD_MASK);

	set = !test_and_set_bit(_PAGE_BIT_SPLITTING,

				(unsigned long *)pmdp);

	if (set) {

		/* need tlb flush only to serialize against gup-fast */

		flush_tlb_range(vma, address, address + HPAGE_PMD_SIZE);

	}

}

#endif

#endif





/**

/**