UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: add PG_LEVEL enum 

this way PG_LEVEL_1GB will be an easy change.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2008-01-30 13:34:04 +01:00 committed by Ingo Molnar
parent 0a663088cd
commit 30551bb3ce
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/mm/pageattr-test.c
View File

@ -16,14 +16,12 @@
enum { enum {
NTEST = 400, NTEST = 400,
LOWEST_LEVEL = PG_LEVEL_4K,
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
LOWEST_LEVEL = 4,
LPS = (1 << PMD_SHIFT), LPS = (1 << PMD_SHIFT),
#elif defined(CONFIG_X86_PAE) #elif defined(CONFIG_X86_PAE)
LOWEST_LEVEL = 4,
LPS = (1 << PMD_SHIFT), LPS = (1 << PMD_SHIFT),
#else #else
LOWEST_LEVEL = 4, /* lookup_address lies here */
LPS = (1 << 22), LPS = (1 << 22),
#endif #endif
GPS = (1<<30) GPS = (1<<30)

9
arch/x86/mm/pageattr.c
View File

@ -28,6 +28,8 @@ pte_t *lookup_address(unsigned long address, int *level)
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
*level = PG_LEVEL_NONE;
if (pgd_none(*pgd)) if (pgd_none(*pgd))
return NULL; return NULL;
pud = pud_offset(pgd, address); pud = pud_offset(pgd, address);
@ -36,11 +38,12 @@ pte_t *lookup_address(unsigned long address, int *level)
pmd = pmd_offset(pud, address); pmd = pmd_offset(pud, address);
if (pmd_none(*pmd)) if (pmd_none(*pmd))
return NULL; return NULL;
*level = 3;
*level = PG_LEVEL_2M;
if (pmd_large(*pmd)) if (pmd_large(*pmd))
return (pte_t *)pmd; return (pte_t *)pmd;
*level = 4;
*level = PG_LEVEL_4K;
return pte_offset_kernel(pmd, address); return pte_offset_kernel(pmd, address);
} }
@ -145,7 +148,7 @@ repeat:
address < (unsigned long)&_etext && address < (unsigned long)&_etext &&
(pgprot_val(prot) & _PAGE_NX)); (pgprot_val(prot) & _PAGE_NX));
if (level == 4) { if (level == PG_LEVEL_4K) {
set_pte_atomic(kpte, mk_pte(page, canon_pgprot(prot))); set_pte_atomic(kpte, mk_pte(page, canon_pgprot(prot)));
} else { } else {
err = split_large_page(kpte, address); err = split_large_page(kpte, address);

6
include/asm-x86/pgtable.h
View File

@ -234,6 +234,12 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
enum {
PG_LEVEL_NONE,
PG_LEVEL_4K,
PG_LEVEL_2M,
};
/* /*
* Helper function that returns the kernel pagetable entry controlling * Helper function that returns the kernel pagetable entry controlling
* the virtual address 'address'. NULL means no pagetable entry present. * the virtual address 'address'. NULL means no pagetable entry present.