Page MenuHomeFreeBSD
Files F151152246

D42732.id154090.diff
No OneTemporary
Actions

D42732.id154090.diff
View Options

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -2110,6 +2110,56 @@
return (m);
}
+/*
+ * Returns true if the entire virtual address range is mapped
+ */
+static bool
+pmap_kmapped_range(vm_offset_t sva, vm_size_t size)
+{
+ pt_entry_t *pte, tpte;
+ vm_offset_t eva;
+
+ KASSERT(sva >= VM_MIN_KERNEL_ADDRESS,
+ ("%s: Invalid virtual address: %lx", __func__, sva));
+ MPASS(size != 0);
+ eva = sva + size - 1;
+ KASSERT(eva > sva, ("%s: Size too large: sva %lx, size %lx", __func__,
+ sva, size));
+
+ while (sva <= eva) {
+ pte = pmap_l1(kernel_pmap, sva);
+ if (pte == NULL)
+ return (false);
+ tpte = pmap_load(pte);
+ if (tpte == 0)
+ return (false);
+ if ((tpte & ATTR_DESCR_TYPE_MASK) == ATTR_DESCR_TYPE_BLOCK) {
+ sva = (sva & ~L1_OFFSET) + L1_SIZE;
+ continue;
+ }
+
+ pte = pmap_l1_to_l2(&tpte, sva);
+ tpte = pmap_load(pte);
+ if (tpte == 0)
+ return (false);
+ if ((tpte & ATTR_DESCR_TYPE_MASK) == ATTR_DESCR_TYPE_BLOCK) {
+ sva = (sva & ~L2_OFFSET) + L2_SIZE;
+ continue;
+ }
+ pte = pmap_l2_to_l3(&tpte, sva);
+ tpte = pmap_load(pte);
+ if (tpte == 0)
+ return (false);
+ if ((tpte & ATTR_DESCR_TYPE_MASK) == ATTR_DESCR_TYPE_PAGE) {
+ sva = (sva & ~L3_OFFSET) + L3_SIZE;
+ continue;
+ }
+ return (false);
+ }
+
+ return (true);
+}
+
/*
* Walks the page tables to translate a kernel virtual address to a
* physical address. Returns true if the kva is valid and stores the
@@ -7785,6 +7835,11 @@
pt_entry_t *l2;
int i, lvl, l2_blocks, free_l2_count, start_idx;
+ /* Use the DMAP region if we can */
+ if (PHYS_IN_DMAP(pa) && PHYS_IN_DMAP(pa + size - 1) &&
+ pmap_kmapped_range(PHYS_TO_DMAP(pa), size))
+ return ((void *)PHYS_TO_DMAP(pa));
+
if (!vm_initialized) {
/*
* No L3 ptables so map entire L2 blocks where start VA is:
@@ -7900,10 +7955,22 @@
vm_offset_t offset, va, va_trunc;
pd_entry_t *pde;
pt_entry_t *l2;
- int i, lvl, l2_blocks, block;
+ int error __diagused, i, lvl, l2_blocks, block;
bool preinit_map;
va = (vm_offset_t)p;
+ if (VIRT_IN_DMAP(va)) {
+ /* Ensure the attributes are as expected for the DMAP region */
+ PMAP_LOCK(kernel_pmap);
+ error = pmap_change_props_locked(va, size,
+ PROT_READ | PROT_WRITE, VM_MEMATTR_DEFAULT, false);
+ PMAP_UNLOCK(kernel_pmap);
+ KASSERT(error == 0, ("%s: Failed to reset DMAP attributes: %d",
+ __func__, error));
+
+ return;
+ }
+
l2_blocks =
(roundup2(va + size, L2_SIZE) - rounddown2(va, L2_SIZE)) >> L2_SHIFT;
KASSERT(l2_blocks > 0, ("pmap_unmapbios: invalid size %lx", size));

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 7, 11:05 AM (3 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31027368
Default Alt Text
D42732.id154090.diff (2 KB)

Event Timeline