Page MenuHomeFreeBSD
Files F107859200

D45997.diff
No OneTemporary
Actions

D45997.diff
View Options

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
@@ -473,10 +473,12 @@
vm_size_t asize;
int rv;
- if (__predict_true((flags & M_EXEC) == 0))
+ if (__predict_true((flags & (M_EXEC | M_NEVERFREED)) == 0))
arena = vm_dom[domain].vmd_kernel_arena;
- else
+ else if ((flags & M_EXEC) != 0)
arena = vm_dom[domain].vmd_kernel_rwx_arena;
+ else
+ arena = vm_dom[domain].vmd_kernel_nofree_arena;
asize = round_page(size);
if (vmem_alloc(arena, asize, flags | M_BESTFIT, &addr))
return (0);
@@ -882,20 +884,29 @@
/*
* In architectures with superpages, maintain separate arenas
* for allocations with permissions that differ from the
- * "standard" read/write permissions used for kernel memory,
- * so as not to inhibit superpage promotion.
+ * "standard" read/write permissions used for kernel memory
+ * and pages that are never released, so as not to inhibit
+ * superpage promotion.
*
- * Use the base import quantum since this arena is rarely used.
+ * Use the base import quantum since these arenas are rarely
+ * used.
*/
#if VM_NRESERVLEVEL > 0
vm_dom[domain].vmd_kernel_rwx_arena = vmem_create(
"kernel rwx arena domain", 0, 0, PAGE_SIZE, 0, M_WAITOK);
+ vm_dom[domain].vmd_kernel_nofree_arena = vmem_create(
+ "kernel NOFREE arena domain", 0, 0, PAGE_SIZE, 0, M_WAITOK);
vmem_set_import(vm_dom[domain].vmd_kernel_rwx_arena,
kva_import_domain, (vmem_release_t *)vmem_xfree,
kernel_arena, KVA_QUANTUM);
+ vmem_set_import(vm_dom[domain].vmd_kernel_nofree_arena,
+ kva_import_domain, (vmem_release_t *)vmem_xfree,
+ kernel_arena, KVA_QUANTUM);
#else
vm_dom[domain].vmd_kernel_rwx_arena =
vm_dom[domain].vmd_kernel_arena;
+ vm_dom[domain].vmd_kernel_nofree_arena =
+ vm_dom[domain].vmd_kernel_arena;
#endif
}
diff --git a/sys/vm/vm_pagequeue.h b/sys/vm/vm_pagequeue.h
--- a/sys/vm/vm_pagequeue.h
+++ b/sys/vm/vm_pagequeue.h
@@ -243,6 +243,7 @@
} vmd_pgcache[VM_NFREEPOOL];
struct vmem *vmd_kernel_arena; /* (c) per-domain kva R/W arena. */
struct vmem *vmd_kernel_rwx_arena; /* (c) per-domain kva R/W/X arena. */
+ struct vmem *vmd_kernel_nofree_arena; /* (c) per-domain kva NOFREE arena. */
u_int vmd_domain; /* (c) Domain number. */
u_int vmd_page_count; /* (c) Total page count. */
long vmd_segs; /* (c) bitmask of the segments */

File Metadata

Mime Type
text/plain
Expires
Sun, Jan 19, 7:01 PM (18 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15955599
Default Alt Text
D45997.diff (2 KB)

Event Timeline