Page MenuHomeFreeBSD
Files F136136851

D17483.id49181.diff
No OneTemporary
Actions

D17483.id49181.diff
View Options

Index: sys/kern/subr_vmem.c
===================================================================
--- sys/kern/subr_vmem.c
+++ sys/kern/subr_vmem.c
@@ -507,6 +507,9 @@
/*
* Import from the arena into the quantum cache in UMA.
+ *
+ * We use VMEM_ADDR_QCACHE_MIN instead of 0: uma_zalloc() returns 0 to indicate
+ * failure, so UMA can't be used to cache a resource with value 0.
*/
static int
qc_import(void *arg, void **store, int cnt, int domain, int flags)
@@ -515,19 +518,16 @@
vmem_addr_t addr;
int i;
+ KASSERT((flags & M_WAITOK) == 0, ("blocking allocation"));
+
qc = arg;
- if ((flags & VMEM_FITMASK) == 0)
- flags |= M_BESTFIT;
for (i = 0; i < cnt; i++) {
if (vmem_xalloc(qc->qc_vmem, qc->qc_size, 0, 0, 0,
- VMEM_ADDR_MIN, VMEM_ADDR_MAX, flags, &addr) != 0)
+ VMEM_ADDR_QCACHE_MIN, VMEM_ADDR_MAX, flags, &addr) != 0)
break;
store[i] = (void *)addr;
- /* Only guarantee one allocation. */
- flags &= ~M_WAITOK;
- flags |= M_NOWAIT;
}
- return i;
+ return (i);
}
/*
@@ -1284,15 +1284,20 @@
WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "vmem_alloc");
if (size <= vm->vm_qcache_max) {
+ /*
+ * Resource 0 cannot be cached, so avoid a blocking allocation
+ * in qc_import() and give the vmem_xalloc() call below a chance
+ * to return 0.
+ */
qc = &vm->vm_qcache[(size - 1) >> vm->vm_quantum_shift];
- *addrp = (vmem_addr_t)uma_zalloc(qc->qc_cache, flags);
- if (*addrp == 0)
- return (ENOMEM);
- return (0);
+ *addrp = (vmem_addr_t)uma_zalloc(qc->qc_cache,
+ (flags & ~M_WAITOK) | M_NOWAIT);
+ if (__predict_true(*addrp != 0))
+ return (0);
}
- return vmem_xalloc(vm, size, 0, 0, 0, VMEM_ADDR_MIN, VMEM_ADDR_MAX,
- flags, addrp);
+ return (vmem_xalloc(vm, size, 0, 0, 0, VMEM_ADDR_MIN, VMEM_ADDR_MAX,
+ flags, addrp));
}
int
@@ -1415,7 +1420,8 @@
qcache_t *qc;
MPASS(size > 0);
- if (size <= vm->vm_qcache_max) {
+ if (size <= vm->vm_qcache_max &&
+ __predict_true(addr >= VMEM_ADDR_QCACHE_MIN)) {
qc = &vm->vm_qcache[(size - 1) >> vm->vm_quantum_shift];
uma_zfree(qc->qc_cache, (void *)addr);
} else
Index: sys/sys/vmem.h
===================================================================
--- sys/sys/vmem.h
+++ sys/sys/vmem.h
@@ -41,8 +41,9 @@
typedef uintptr_t vmem_addr_t;
typedef size_t vmem_size_t;
-#define VMEM_ADDR_MIN 0
-#define VMEM_ADDR_MAX (~(vmem_addr_t)0)
+#define VMEM_ADDR_MIN 0
+#define VMEM_ADDR_QCACHE_MIN 1
+#define VMEM_ADDR_MAX (~(vmem_addr_t)0)
typedef int (vmem_import_t)(void *, vmem_size_t, int, vmem_addr_t *);
typedef void (vmem_release_t)(void *, vmem_addr_t, vmem_size_t);

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 17, 2:13 AM (10 h, 3 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25401407
Default Alt Text
D17483.id49181.diff (2 KB)

Event Timeline