Page MenuHomeFreeBSD
Files F154010852

D56518.diff
No OneTemporary
Actions

D56518.diff
View Options

diff --git a/sys/sys/malloc.h b/sys/sys/malloc.h
--- a/sys/sys/malloc.h
+++ b/sys/sys/malloc.h
@@ -61,6 +61,7 @@
#define M_EXEC 0x4000 /* allocate executable space */
#define M_NEXTFIT 0x8000 /* only for vmem, follow cursor */
#define M_NEVERFREED 0x10000 /* chunk will never get freed */
+#define M_UNPROTECTED 0x20000 /* alloc out of unprotected memory */
#define M_VERSION 2024073001
diff --git a/sys/vm/pmap.h b/sys/vm/pmap.h
--- a/sys/vm/pmap.h
+++ b/sys/vm/pmap.h
@@ -104,6 +104,7 @@
#define PMAP_ENTER_NOSLEEP 0x00000100
#define PMAP_ENTER_WIRED 0x00000200
#define PMAP_ENTER_LARGEPAGE 0x00000400
+#define PMAP_ENTER_UNPROTECTED 0x00000800
#define PMAP_ENTER_RESERVED 0xFF000000
/*
diff --git a/sys/vm/vm_kern.c b/sys/vm/vm_kern.c
--- a/sys/vm/vm_kern.c
+++ b/sys/vm/vm_kern.c
@@ -269,6 +269,7 @@
vm_size_t asize;
int pflags;
vm_prot_t prot;
+ u_int pmap_enter_flags;
object = kernel_object;
asize = round_page(size);
@@ -278,6 +279,11 @@
offset = addr - VM_MIN_KERNEL_ADDRESS;
pflags = malloc2vm_flags(flags) | VM_ALLOC_WIRED;
prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW;
+
+ pmap_enter_flags = prot | PMAP_ENTER_WIRED;
+ if ((flags & M_UNPROTECTED) != 0)
+ pmap_enter_flags |= PMAP_ENTER_UNPROTECTED;
+
VM_OBJECT_WLOCK(object);
for (i = 0; i < asize; i += PAGE_SIZE) {
m = kmem_alloc_contig_pages(object, atop(offset + i),
@@ -295,7 +301,7 @@
pmap_zero_page(m);
vm_page_valid(m);
pmap_enter(kernel_pmap, addr + i, m, prot,
- prot | PMAP_ENTER_WIRED, 0);
+ pmap_enter_flags, 0);
}
VM_OBJECT_WUNLOCK(object);
kmem_alloc_san(addr, size, asize, flags);
@@ -362,6 +368,7 @@
vm_size_t asize;
u_long npages;
int pflags;
+ u_int pmap_enter_flags;
object = kernel_object;
asize = round_page(size);
@@ -384,12 +391,17 @@
vm_page_domain(m), domain));
end_m = m + npages;
tmp = addr;
+
+ pmap_enter_flags = VM_PROT_RW | PMAP_ENTER_WIRED;
+ if ((flags & M_UNPROTECTED) != 0)
+ pmap_enter_flags |= PMAP_ENTER_UNPROTECTED;
+
for (; m < end_m; m++) {
if ((flags & M_ZERO) && (m->flags & PG_ZERO) == 0)
pmap_zero_page(m);
vm_page_valid(m);
pmap_enter(kernel_pmap, tmp, m, VM_PROT_RW,
- VM_PROT_RW | PMAP_ENTER_WIRED, 0);
+ pmap_enter_flags, 0);
tmp += PAGE_SIZE;
}
VM_OBJECT_WUNLOCK(object);
@@ -548,6 +560,7 @@
vm_page_t m;
vm_prot_t prot;
int pflags;
+ u_int pmap_enter_flags;
KASSERT(object == kernel_object,
("kmem_back_domain: only supports kernel object."));
@@ -559,6 +572,10 @@
pflags |= VM_ALLOC_WAITFAIL;
prot = (flags & M_EXEC) != 0 ? VM_PROT_ALL : VM_PROT_RW;
+ pmap_enter_flags = prot | PMAP_ENTER_WIRED;
+ if ((flags & M_UNPROTECTED) != 0)
+ pmap_enter_flags |= PMAP_ENTER_UNPROTECTED;
+
i = 0;
vm_page_iter_init(&pages, object);
VM_OBJECT_WLOCK(object);
@@ -588,7 +605,7 @@
("kmem_malloc: page %p is managed", m));
vm_page_valid(m);
pmap_enter(kernel_pmap, addr + i, m, prot,
- prot | PMAP_ENTER_WIRED, 0);
+ pmap_enter_flags, 0);
if (__predict_false((prot & VM_PROT_EXECUTE) != 0))
m->oflags |= VPO_KMEM_EXEC;
}

File Metadata

Mime Type
text/plain
Expires
Sun, Apr 26, 10:47 AM (17 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32112718
Default Alt Text
D56518.diff (3 KB)

Event Timeline