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

Commit 170fdff7 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86: move pmd functions into common asm/pgalloc.h 



Common definitions for 3-level pagetable functions.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 397f687a

arch/x86/mm/init_64.c

+0 −5
Original line number Diff line number Diff line
@@ -662,11 +662,6 @@ int memory_add_physaddr_to_nid(u64 start) 
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);

#endif



void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)

{

	tlb_remove_page(tlb, virt_to_page(pmd));

}



void __pud_free_tlb(struct mmu_gather *tlb, pud_t *pud)

{

	tlb_remove_page(tlb, virt_to_page(pud));

arch/x86/mm/pgtable.c

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,14 @@ void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte) 
	tlb_remove_page(tlb, pte);

}



#if PAGETABLE_LEVELS > 2

void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)

{

	paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);

	tlb_remove_page(tlb, virt_to_page(pmd));

}

#endif	/* PAGETABLE_LEVELS > 2 */



#ifdef CONFIG_X86_64

static inline void pgd_list_add(pgd_t *pgd)

{

arch/x86/mm/pgtable_32.c

+0 −10
Original line number Diff line number Diff line
@@ -173,16 +173,6 @@ void reserve_top_address(unsigned long reserve) 
	__VMALLOC_RESERVE += reserve;

}



#ifdef CONFIG_X86_PAE



void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd)

{

	paravirt_release_pd(__pa(pmd) >> PAGE_SHIFT);

	tlb_remove_page(tlb, virt_to_page(pmd));

}



#endif



int pmd_bad(pmd_t pmd)

{

	WARN_ON_ONCE(pmd_bad_v1(pmd) != pmd_bad_v2(pmd));

include/asm-x86/pgalloc.h

+33 −0
Original line number Diff line number Diff line
@@ -40,6 +40,39 @@ static inline void pte_free(struct mm_struct *mm, struct page *pte) 


extern void __pte_free_tlb(struct mmu_gather *tlb, struct page *pte);



static inline void pmd_populate_kernel(struct mm_struct *mm,

				       pmd_t *pmd, pte_t *pte)

{

	paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT);

	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,

				struct page *pte)

{

	unsigned long pfn = page_to_pfn(pte);



	paravirt_alloc_pt(mm, pfn);

	set_pmd(pmd, __pmd(((pteval_t)pfn << PAGE_SHIFT) | _PAGE_TABLE));

}



#define pmd_pgtable(pmd) pmd_page(pmd)



#if PAGETABLE_LEVELS > 2

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);

}



static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)

{

	BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));

	free_page((unsigned long)pmd);

}



extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd);

#endif	/* PAGETABLE_LEVELS > 2 */



#ifdef CONFIG_X86_32

# include "pgalloc_32.h"

#else

include/asm-x86/pgalloc_32.h

+0 −32
Original line number Diff line number Diff line 
#ifndef _I386_PGALLOC_H

#define _I386_PGALLOC_H



static inline void pmd_populate_kernel(struct mm_struct *mm,

				       pmd_t *pmd, pte_t *pte)

{

	paravirt_alloc_pt(mm, __pa(pte) >> PAGE_SHIFT);

	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, struct page *pte)

{

	unsigned long pfn = page_to_pfn(pte);



	paravirt_alloc_pt(mm, pfn);

	set_pmd(pmd, __pmd(((pteval_t)pfn << PAGE_SHIFT) | _PAGE_TABLE));

}

#define pmd_pgtable(pmd) pmd_page(pmd)



#ifdef CONFIG_X86_PAE

/*

 * In the PAE case we free the pmds as part of the pgd.

 */

static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pmd_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);

}



static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)

{

	BUG_ON((unsigned long)pmd & (PAGE_SIZE-1));

	free_page((unsigned long)pmd);

}



extern void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd);



extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);



#endif	/* CONFIG_X86_PAE */