Page MenuHomeFreeBSD
Files F143560129

D33459.id100336.diff
No OneTemporary
Actions

D33459.id100336.diff
View Options

Index: sys/arm64/arm64/pmap.c
===================================================================
--- sys/arm64/arm64/pmap.c
+++ sys/arm64/arm64/pmap.c
@@ -383,7 +383,7 @@
static bool pmap_activate_int(pmap_t pmap);
static void pmap_alloc_asid(pmap_t pmap);
static int pmap_change_props_locked(vm_offset_t va, vm_size_t size,
- vm_prot_t prot, int mode);
+ vm_prot_t prot, int mode, bool skip_unmapped);
static pt_entry_t *pmap_demote_l1(pmap_t pmap, pt_entry_t *l1, vm_offset_t va);
static pt_entry_t *pmap_demote_l2_locked(pmap_t pmap, pt_entry_t *l2,
vm_offset_t va, struct rwlock **lockp);
@@ -5948,7 +5948,7 @@
int error;
PMAP_LOCK(kernel_pmap);
- error = pmap_change_props_locked(va, size, PROT_NONE, mode);
+ error = pmap_change_props_locked(va, size, PROT_NONE, mode, false);
PMAP_UNLOCK(kernel_pmap);
return (error);
}
@@ -5970,14 +5970,14 @@
return (EINVAL);
PMAP_LOCK(kernel_pmap);
- error = pmap_change_props_locked(va, size, prot, -1);
+ error = pmap_change_props_locked(va, size, prot, -1, false);
PMAP_UNLOCK(kernel_pmap);
return (error);
}
static int
pmap_change_props_locked(vm_offset_t va, vm_size_t size, vm_prot_t prot,
- int mode)
+ int mode, bool skip_unmapped)
{
vm_offset_t base, offset, tmpva;
vm_size_t pte_size;
@@ -6029,13 +6029,14 @@
for (tmpva = base; tmpva < base + size; ) {
ptep = pmap_pte(kernel_pmap, tmpva, &lvl);
- if (ptep == NULL)
+ if (ptep == NULL && !skip_unmapped) {
return (EINVAL);
-
- if ((pmap_load(ptep) & mask) == bits) {
+ } else if ((ptep == NULL && skip_unmapped) ||
+ (pmap_load(ptep) & mask) == bits) {
/*
- * We already have the correct attribute,
- * ignore this entry.
+ * We already have the correct attribute or there
+ * is no memory mapped at this address and we are
+ * skipping unmapped memory.
*/
switch (lvl) {
default:
@@ -6102,7 +6103,7 @@
*/
rv = pmap_change_props_locked(
PHYS_TO_DMAP(pa), pte_size,
- prot, mode);
+ prot, mode, true);
if (rv != 0)
return (rv);
}

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 10:24 PM (1 h, 59 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28202853
Default Alt Text
D33459.id100336.diff (2 KB)

Event Timeline