Skip to content

Commit

Permalink
frame refill needs paging lock
Browse files Browse the repository at this point in the history
  • Loading branch information
@sparchatus
sparchatus committed Dec 2, 2024
1 parent e70022d commit 62c2167
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 26 deletions.
54 changes: 36 additions & 18 deletions arch/x86/pagetables.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,12 +277,12 @@ static mfn_t get_pgentry_mfn(mfn_t tab_mfn, pt_index_t index, unsigned long flag
* MAP_FAILED when failed to map a NULL (0x0) virtual address and otherwise
* it returns the same virtual address passed as argument.
*/
void *_vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
void *__vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
#if defined(__x86_64__)
unsigned long l4_flags,
unsigned long l4_flags,
#endif
unsigned long l3_flags, unsigned long l2_flags, unsigned long l1_flags,
bool special_path) {
unsigned long l3_flags, unsigned long l2_flags, unsigned long l1_flags,
bool special_path) {
mfn_t l1t_mfn, l2t_mfn, l3t_mfn;
pgentry_t *tab, *entry;

Expand Down Expand Up @@ -324,24 +324,43 @@ void *_vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
done:
return va;
}
static void *_vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
#if defined(__x86_64__)
unsigned long l4_flags,
#endif
unsigned long l3_flags, unsigned long l2_flags,
unsigned long l1_flags) {
return __vmap(cr3_ptr, va, mfn, order, l4_flags, l3_flags, l2_flags, l1_flags, false);
}
void *__vmap_paging(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
#if defined(__x86_64__)
unsigned long l4_flags,
#endif
unsigned long l3_flags, unsigned long l2_flags,
unsigned long l1_flags, bool special_path) {
spin_lock(&vmap_lock);
void *res = __vmap(cr3_ptr, va, mfn, order, l4_flags, l3_flags, l2_flags, l1_flags,
special_path);
spin_unlock(&vmap_lock);
return res;
}

static inline void *__vmap_1g(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned long l4_flags,
unsigned long l3_flags) {
return _vmap(cr3_ptr, va, mfn, PAGE_ORDER_1G, l4_flags, l3_flags | _PAGE_PSE,
PT_NO_FLAGS, PT_NO_FLAGS, false);
PT_NO_FLAGS, PT_NO_FLAGS);
}

static inline void *__vmap_2m(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned long l4_flags,
unsigned long l3_flags, unsigned long l2_flags) {
return _vmap(cr3_ptr, va, mfn, PAGE_ORDER_2M, l4_flags, l3_flags,
l2_flags | _PAGE_PSE, PT_NO_FLAGS, false);
l2_flags | _PAGE_PSE, PT_NO_FLAGS);
}

static inline void *__vmap_4k(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned long l4_flags,
unsigned long l3_flags, unsigned long l2_flags,
unsigned long l1_flags) {
return _vmap(cr3_ptr, va, mfn, PAGE_ORDER_4K, l4_flags, l3_flags, l2_flags, l1_flags,
false);
return _vmap(cr3_ptr, va, mfn, PAGE_ORDER_4K, l4_flags, l3_flags, l2_flags, l1_flags);
}

static inline void *_vmap_1g(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned long l3_flags,
Expand Down Expand Up @@ -390,7 +409,7 @@ void *vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
dprintk("%s: va: 0x%p mfn: 0x%lx (order: %u)\n", __func__, va, mfn, order);

spin_lock(&vmap_lock);
va = _vmap(cr3_ptr, va, mfn, order, l4_flags, l3_flags, l2_flags, l1_flags, false);
va = _vmap(cr3_ptr, va, mfn, order, l4_flags, l3_flags, l2_flags, l1_flags);
spin_unlock(&vmap_lock);

return va;
Expand Down Expand Up @@ -887,8 +906,7 @@ static void map_pagetable(cr3_t *cr3_ptr, mfn_t table, int level) {
void *va = mfn_to_virt_kern(table);
pte_t *pt;

pt = _vmap(cr3_ptr, va, table, PAGE_ORDER_4K, L4_PROT, L3_PROT, L2_PROT, L1_PROT,
false);
pt = _vmap(cr3_ptr, va, table, PAGE_ORDER_4K, L4_PROT, L3_PROT, L2_PROT, L1_PROT);
BUG_ON(!pt);

for (int i = 0; i < level_to_entries(level) && level > 1; i++) {
Expand Down Expand Up @@ -984,7 +1002,7 @@ int map_pagetables_va(cr3_t *cr3_ptr, void *va) {
err = -EFAULT;
spin_lock(&vmap_lock);
tab = _vmap(cr3_ptr, mfn_to_virt_kern(cr3_ptr->mfn), cr3_ptr->mfn, PAGE_ORDER_4K,
L4_PROT, L3_PROT, L2_PROT, L1_PROT, false);
L4_PROT, L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto unlock;

Expand All @@ -996,7 +1014,7 @@ int map_pagetables_va(cr3_t *cr3_ptr, void *va) {
}

tab = _vmap(cr3_ptr, mfn_to_virt_kern(l4e->mfn), l4e->mfn, PAGE_ORDER_4K, L4_PROT,
L3_PROT, L2_PROT, L1_PROT, false);
L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto unlock;
#endif
Expand All @@ -1011,7 +1029,7 @@ int map_pagetables_va(cr3_t *cr3_ptr, void *va) {
goto done;

tab = _vmap(cr3_ptr, mfn_to_virt_kern(l3e->mfn), l3e->mfn, PAGE_ORDER_4K, L4_PROT,
L3_PROT, L2_PROT, L1_PROT, false);
L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto unlock;

Expand All @@ -1025,7 +1043,7 @@ int map_pagetables_va(cr3_t *cr3_ptr, void *va) {
goto done;

tab = _vmap(cr3_ptr, mfn_to_virt_kern(l2e->mfn), l2e->mfn, PAGE_ORDER_4K, L4_PROT,
L3_PROT, L2_PROT, L1_PROT, false);
L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto unlock;

Expand Down Expand Up @@ -1056,7 +1074,7 @@ int unmap_pagetables_va(cr3_t *cr3_ptr, void *va) {
err = -EFAULT;
spin_lock(&vmap_lock);
tab = _vmap(cr3_ptr, mfn_to_virt_kern(cr3_ptr->mfn), cr3_ptr->mfn, PAGE_ORDER_4K,
L4_PROT, L3_PROT, L2_PROT, L1_PROT, false);
L4_PROT, L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto cleanup;
tables[level++] = tab;
Expand All @@ -1069,7 +1087,7 @@ int unmap_pagetables_va(cr3_t *cr3_ptr, void *va) {
}

tab = _vmap(cr3_ptr, mfn_to_virt_kern(l4e->mfn), l4e->mfn, PAGE_ORDER_4K, L4_PROT,
L3_PROT, L2_PROT, L1_PROT, false);
L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto cleanup;
tables[level++] = tab;
Expand All @@ -1085,7 +1103,7 @@ int unmap_pagetables_va(cr3_t *cr3_ptr, void *va) {
goto done;

tab = _vmap(cr3_ptr, mfn_to_virt_kern(l3e->mfn), l3e->mfn, PAGE_ORDER_4K, L4_PROT,
L3_PROT, L2_PROT, L1_PROT, false);
L3_PROT, L2_PROT, L1_PROT);
if (!tab)
goto cleanup;
tables[level++] = tab;
Expand Down
12 changes: 6 additions & 6 deletions include/arch/x86/pagetable.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,11 @@ static inline pte_t *l1_table_entry(pte_t *tab, const void *va) {
}

static inline pgentry_t pgentry_from_paddr(paddr_t pa, unsigned long flags) {
return (pgentry_t)((pa & ~(PADDR_MASK & PAGE_MASK)) | (flags & _PAGE_ALL_FLAGS));
return (pgentry_t) ((pa & ~(PADDR_MASK & PAGE_MASK)) | (flags & _PAGE_ALL_FLAGS));
}

static inline paddr_t paddr_from_pgentry(pgentry_t pgentry) {
return (paddr_t)(pgentry & ~PADDR_MASK) & PAGE_MASK;
return (paddr_t) (pgentry & ~PADDR_MASK) & PAGE_MASK;
}

static inline pgentry_t pgentry_from_mfn(mfn_t mfn, unsigned long flags) {
Expand Down Expand Up @@ -386,12 +386,12 @@ static inline void setup_tlb_global(void) {
write_cr4(opt_tlb_global ? (cr4 | X86_CR4_PGE) : (cr4 & ~X86_CR4_PGE));
}

void *_vmap(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
void *__vmap_paging(cr3_t *cr3_ptr, void *va, mfn_t mfn, unsigned int order,
#if defined(__x86_64__)
unsigned long l4_flags,
unsigned long l4_flags,
#endif
unsigned long l3_flags, unsigned long l2_flags, unsigned long l1_flags,
bool special_path);
unsigned long l3_flags, unsigned long l2_flags,
unsigned long l1_flags, bool special_path);

#endif /* __ASSEMBLY__ */

Expand Down
4 changes: 2 additions & 2 deletions mm/pmm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ static frames_array_t early_frames;
static list_head_t free_frames[MAX_PAGE_ORDER + 1];
static list_head_t busy_frames[MAX_PAGE_ORDER + 1];

#define MIN_NUM_4K_FRAMES 16
#define MIN_NUM_4K_FRAMES 2 + 4 + (MAX_PAGE_ORDER - PAGE_ORDER_4K)
static size_t frames_count[MAX_PAGE_ORDER + 1];

static spinlock_t lock = SPINLOCK_INIT;
Expand Down Expand Up @@ -108,7 +108,7 @@ static frames_array_t *new_frames_array(void) {
if (!boot_flags.virt)
array = (frames_array_t *) mfn_to_virt_kern(frame->mfn);
else {
array = _vmap(
array = __vmap_paging(
&cr3,
_ptr(_ul(mfn_to_virt_map(frame->mfn)) & PAGE_ORDER_TO_MASK(PAGE_ORDER_4K)),
frame->mfn, PAGE_ORDER_4K, L4_PROT, L3_PROT, L2_PROT, L1_PROT, true);
Expand Down

0 comments on commit 62c2167

Please sign in to comment.