Page MenuHomeFreeBSD
Files F102078796

D45481.diff
No OneTemporary
Actions

D45481.diff
View Options

diff --git a/sys/riscv/include/pmap.h b/sys/riscv/include/pmap.h
--- a/sys/riscv/include/pmap.h
+++ b/sys/riscv/include/pmap.h
@@ -67,6 +67,12 @@
vm_memattr_t pv_memattr;
};
+enum pmap_stage {
+ PM_INVALID,
+ PM_STAGE1,
+ PM_STAGE2,
+};
+
struct pmap {
struct mtx pm_mtx;
struct pmap_statistics pm_stats; /* pmap statictics */
@@ -76,6 +82,7 @@
TAILQ_HEAD(,pv_chunk) pm_pvchunk; /* list of mappings in pmap */
LIST_ENTRY(pmap) pm_list; /* List of all pmaps */
struct vm_radix pm_root;
+ enum pmap_stage pm_stage;
};
typedef struct pmap *pmap_t;
@@ -134,6 +141,7 @@
void pmap_kremove(vm_offset_t);
void pmap_kremove_device(vm_offset_t, vm_size_t);
void *pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, vm_memattr_t ma);
+int pmap_pinit_stage(pmap_t, enum pmap_stage);
bool pmap_page_is_mapped(vm_page_t m);
bool pmap_ps_enabled(pmap_t);
diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -632,6 +632,7 @@
/* Set this early so we can use the pagetable walking functions */
kernel_pmap_store.pm_top = (pd_entry_t *)l1pt;
+ kernel_pmap_store.pm_stage = PM_STAGE1;
PMAP_LOCK_INIT(kernel_pmap);
TAILQ_INIT(&kernel_pmap->pm_pvchunk);
vm_radix_init(&kernel_pmap->pm_root);
@@ -1324,6 +1325,7 @@
{
PMAP_LOCK_INIT(pmap);
bzero(&pmap->pm_stats, sizeof(pmap->pm_stats));
+ pmap->pm_stage = PM_STAGE1;
pmap->pm_top = kernel_pmap->pm_top;
pmap->pm_satp = pmap_satp_mode() |
(vtophys(pmap->pm_top) >> PAGE_SHIFT);
@@ -1334,23 +1336,35 @@
}
int
-pmap_pinit(pmap_t pmap)
+pmap_pinit_stage(pmap_t pmap, enum pmap_stage stage)
{
vm_paddr_t topphys;
- vm_page_t mtop;
+ vm_page_t m;
size_t i;
- mtop = vm_page_alloc_noobj(VM_ALLOC_WIRED | VM_ALLOC_ZERO |
- VM_ALLOC_WAITOK);
+ /*
+ * Top directory is 4 pages in hypervisor case.
+ * Current address space layout makes 3 of them unused.
+ */
+ if (stage == PM_STAGE1)
+ m = vm_page_alloc_noobj(VM_ALLOC_WIRED | VM_ALLOC_ZERO |
+ VM_ALLOC_WAITOK);
+ else
+ m = vm_page_alloc_noobj_contig(VM_ALLOC_WIRED | VM_ALLOC_ZERO,
+ 4, 0, ~0ul, L2_SIZE, 0, VM_MEMATTR_DEFAULT);
- topphys = VM_PAGE_TO_PHYS(mtop);
+ topphys = VM_PAGE_TO_PHYS(m);
pmap->pm_top = (pd_entry_t *)PHYS_TO_DMAP(topphys);
pmap->pm_satp = pmap_satp_mode() | (topphys >> PAGE_SHIFT);
+ pmap->pm_stage = stage;
bzero(&pmap->pm_stats, sizeof(pmap->pm_stats));
CPU_ZERO(&pmap->pm_active);
+ if (stage == PM_STAGE2)
+ goto finish;
+
if (pmap_mode == PMAP_MODE_SV39) {
/*
* Copy L1 entries from the kernel pmap. This must be done with
@@ -1371,12 +1385,20 @@
pmap->pm_top[i] = kernel_pmap->pm_top[i];
}
+finish:
TAILQ_INIT(&pmap->pm_pvchunk);
vm_radix_init(&pmap->pm_root);
return (1);
}
+int
+pmap_pinit(pmap_t pmap)
+{
+
+ return (pmap_pinit_stage(pmap, PM_STAGE1));
+}
+
/*
* This routine is called if the desired page table page does not exist.
*
@@ -1609,6 +1631,8 @@
pmap_release(pmap_t pmap)
{
vm_page_t m;
+ int npages;
+ int i;
KASSERT(pmap->pm_stats.resident_count == 0,
("pmap_release: pmap resident count %ld != 0",
@@ -1616,15 +1640,23 @@
KASSERT(CPU_EMPTY(&pmap->pm_active),
("releasing active pmap %p", pmap));
+ if (pmap->pm_stage == PM_STAGE2)
+ goto finish;
+
if (pmap_mode == PMAP_MODE_SV39) {
mtx_lock(&allpmaps_lock);
LIST_REMOVE(pmap, pm_list);
mtx_unlock(&allpmaps_lock);
}
+finish:
+ npages = pmap->pm_stage == PM_STAGE2 ? 4 : 1;
m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pmap->pm_top));
- vm_page_unwire_noq(m);
- vm_page_free(m);
+ for (i = 0; i < npages; i++) {
+ vm_page_unwire_noq(m);
+ vm_page_free(m);
+ m++;
+ }
}
static int

File Metadata

Mime Type
text/plain
Expires
Fri, Nov 8, 8:51 AM (22 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14531713
Default Alt Text
D45481.diff (3 KB)

Event Timeline