michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: provide inline pentry_get()

Browse source 
Non-debug code may need this functionality, create an inline.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2020-12-09 10:29:29 -08:00 • committed by Andrew Boie
commit 39dab07f49
1 changed files with 23 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

37
arch/x86/core/x86_mmu.c
View file

@ -340,6 +340,27 @@ static inline bool is_leaf(int level, pentry_t entry)
return ((entry & MMU_PS) != 0U);
}
/* This does NOT (by design) un-flip KPTI PTEs, it's just the raw PTE value */
static inline void pentry_get(int *paging_level, pentry_t *val,
pentry_t *ptables, void *virt)
{
pentry_t *table = ptables;
for (int level = 0; level < NUM_LEVELS; level++) {
pentry_t entry = get_entry(table, virt, level);
if ((entry & MMU_P) == 0 || is_leaf(level, entry)) {
*val = entry;
if (paging_level != NULL) {
*paging_level = level;
}
break;
} else {
table = next_table(entry, level);
}
}
}
static inline void tlb_flush_page(void *addr)
{
/* Invalidate TLB entries corresponding to the page containing the
@ -629,19 +650,7 @@ static void dump_entry(int level, void *virt, pentry_t entry)
void z_x86_pentry_get(int *paging_level, pentry_t *val, pentry_t *ptables,
void *virt)
{
pentry_t *table = ptables;
for (int level = 0; level < NUM_LEVELS; level++) {
pentry_t entry = get_entry(table, virt, level);
if ((entry & MMU_P) == 0 || is_leaf(level, entry)) {
*val = entry;
*paging_level = level;
break;
} else {
table = next_table(entry, level);
}
}
pentry_get(paging_level, val, ptables, virt);
}
/*
@ -653,7 +662,7 @@ void z_x86_dump_mmu_flags(pentry_t *ptables, void *virt)
pentry_t entry;
int level;
z_x86_pentry_get(&level, &entry, ptables, virt);
pentry_get(&level, &entry, ptables, virt);
if ((entry & MMU_P) == 0) {
LOG_ERR("%sE: not present", paging_levels[level].name);