Page MenuHomeFreeBSD
Files F144475837

D45328.id139011.diff
No OneTemporary
Actions

D45328.id139011.diff
View Options

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
@@ -543,37 +543,117 @@
return (pt);
}
-static void
-pmap_bootstrap_dmap(vm_offset_t kern_l1, vm_paddr_t min_pa, vm_paddr_t max_pa)
+/*
+ * Construct the direct map -- a linear mapping of physical memory into
+ * the kernel address space.
+ *
+ * We walk the list of physical memory segments (of arbitrary size and
+ * address) mapping each appropriately using L2 and L1 superpages.
+ *
+ * The lowest usable physical address will always be mapped to
+ * DMAP_MIN_ADDRESS.
+ */
+static vm_paddr_t
+pmap_bootstrap_dmap(pd_entry_t *l1, vm_paddr_t freemempos)
{
+ vm_paddr_t physmap[PHYS_AVAIL_ENTRIES];
vm_offset_t va;
- vm_paddr_t pa;
- pd_entry_t *l1;
- u_int l1_slot;
- pt_entry_t entry;
- pn_t pn;
+ vm_paddr_t min_pa, max_pa, pa, endpa;
+ pd_entry_t *l2;
+ u_int l1slot, l2slot;
+ int physmap_idx;
+
+ physmap_idx = physmem_avail(physmap, nitems(physmap));
+ min_pa = physmap[0];
+ max_pa = physmap[physmap_idx - 1];
+
+ printf("physmap_idx %u\n", physmap_idx);
+ printf("min_pa %lx\n", min_pa);
+ printf("max_pa %lx\n", max_pa);
- pa = dmap_phys_base = min_pa & ~L1_OFFSET;
- va = DMAP_MIN_ADDRESS;
- l1 = (pd_entry_t *)kern_l1;
- l1_slot = pmap_l1_index(DMAP_MIN_ADDRESS);
+ /* Lower physical address aligned to 1GB. */
+ dmap_phys_base = rounddown(min_pa, L1_SIZE);
- for (; va < DMAP_MAX_ADDRESS && pa < max_pa;
- pa += L1_SIZE, va += L1_SIZE, l1_slot++) {
- KASSERT(l1_slot < Ln_ENTRIES, ("Invalid L1 index"));
+ /* Walk the physmap table. */
+ l2 = NULL;
+ l1slot = 512; /* impossible for direct map */
+ for (int idx = 0; idx < physmap_idx; idx += 2) {
+ pa = physmap[idx];
+ endpa = physmap[idx + 1];
+
+ if ((pa & L2_OFFSET) != 0) {
+ printf("warn: pa %#lx not 2MB-aligned!\n", pa);
+ pa = rounddown(pa, L2_SIZE);
+ }
- /* superpages */
- pn = (pa / PAGE_SIZE);
- entry = PTE_KERN;
- entry |= (pn << PTE_PPN0_S);
- pmap_store(&l1[l1_slot], entry);
+ if (endpa - pa < L2_SIZE) {
+ printf("warn: physmem region too small for DMAP! %lu\n", endpa - pa);
+ continue;
+ }
+
+ /* Virtual address for this range. */
+ va = pa - dmap_phys_base + DMAP_MIN_ADDRESS;
+
+ /* Any 1GB possible for this range? */
+ if (endpa - roundup(pa, L1_SIZE) < L1_SIZE)
+ goto l2end;
+
+ /* Loop until the next 1GB boundary. */
+ while ((pa & L1_OFFSET) != 0) {
+ if (l2 == NULL || pmap_l1_index(va) != l1slot) {
+ /* Need to alloc another page table. */
+ l2 = pmap_early_alloc_tables(&freemempos, 1);
+
+ /* Link it. */
+ l1slot = pmap_l1_index(va);
+ pmap_store(&l1[l1slot],
+ L1_PDE((vm_paddr_t)l2, PTE_V));
+ }
+
+ /* map l2 pages */
+ l2slot = pmap_l2_index(va);
+ pmap_store(&l2[l2slot], L2_PTE(pa, PTE_KERN));
+
+ pa += L2_SIZE;
+ va += L2_SIZE;
+ }
+
+ /* Map what we can with 1GB superpages. */
+ while (pa + L1_SIZE - 1 < endpa) {
+ /* map l1 pages */
+ l1slot = pmap_l1_index(va);
+ pmap_store(&l1[l1slot], L1_PTE(pa, PTE_KERN));
+
+ pa += L1_SIZE;
+ va += L1_SIZE;
+ }
+
+l2end:
+ while (pa < endpa) {
+ if (l2 == NULL || pmap_l1_index(va) != l1slot) {
+ /* Need to alloc another page table. */
+ l2 = pmap_early_alloc_tables(&freemempos, 1);
+
+ /* Link it. */
+ l1slot = pmap_l1_index(va);
+ pmap_store(&l1[l1slot],
+ L1_PDE((vm_paddr_t)l2, PTE_V));
+ }
+
+ /* map l2 pages */
+ l2slot = pmap_l2_index(va);
+ pmap_store(&l2[l2slot], L2_PTE(pa, PTE_KERN));
+
+ pa += L2_SIZE;
+ va += L2_SIZE;
+ }
}
/* Set the upper limit of the DMAP region */
dmap_phys_max = pa;
dmap_max_addr = va;
- sfence_vma();
+ return (freemempos);
}
/*
@@ -591,8 +671,7 @@
* accessed through the direct map, however.
*/
static vm_offset_t
-pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen,
- vm_paddr_t min_pa, vm_paddr_t max_pa)
+pmap_create_pagetables(vm_paddr_t kernstart, vm_size_t kernlen)
{
pt_entry_t *l0, *l1, *kern_l2, *kern_l3, *devmap_l3;
pd_entry_t *devmap_l2;
@@ -706,7 +785,7 @@
pmap_store(&l1[slot], L1_PDE(pa, PTE_V));
/* Bootstrap the direct map. */
- pmap_bootstrap_dmap((vm_offset_t)l1, min_pa, max_pa);
+ freemempos = pmap_bootstrap_dmap(l1, freemempos);
/* Return the next position of free memory */
return (freemempos);
@@ -718,13 +797,10 @@
void
pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen)
{
- vm_paddr_t physmap[PHYS_AVAIL_ENTRIES];
- vm_paddr_t freemempos;
- vm_paddr_t max_pa, min_pa, pa;
+ vm_paddr_t freemempos, pa;
vm_offset_t freeva;
vm_offset_t dpcpu, msgbufpv;
pt_entry_t *pte;
- u_int physmap_idx;
int i;
printf("pmap_bootstrap %lx %lx %lx\n", l1pt, kernstart, kernlen);
@@ -742,30 +818,8 @@
*/
CPU_SET(PCPU_GET(hart), &kernel_pmap->pm_active);
- /* Assume the address we were loaded to is a valid physical address. */
- min_pa = max_pa = kernstart;
-
- physmap_idx = physmem_avail(physmap, nitems(physmap));
- physmap_idx /= 2;
-
- /*
- * Find the minimum physical address. physmap is sorted,
- * but may contain empty ranges.
- */
- for (i = 0; i < physmap_idx * 2; i += 2) {
- if (physmap[i] == physmap[i + 1])
- continue;
- if (physmap[i] <= min_pa)
- min_pa = physmap[i];
- if (physmap[i + 1] > max_pa)
- max_pa = physmap[i + 1];
- }
- printf("physmap_idx %u\n", physmap_idx);
- printf("min_pa %lx\n", min_pa);
- printf("max_pa %lx\n", max_pa);
-
/* Create a new set of pagetables to run the kernel in. */
- freemempos = pmap_create_pagetables(kernstart, kernlen, min_pa, max_pa);
+ freemempos = pmap_create_pagetables(kernstart, kernlen);
/* Switch to the newly created page tables. */
kernel_pmap->pm_top = (pd_entry_t *)PHYS_TO_DMAP(root_pt_phys);

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 3:36 PM (2 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28594982
Default Alt Text
D45328.id139011.diff (5 KB)

Event Timeline