Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

malloc: fix a deadlock.

Browse Source
This commit is contained in:
yamt 2007-04-19 11:03:44 +00:00
parent b41e47cfb5
commit 3829d825af
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_malloc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_malloc.c,v 1.110 2007/03/12 18:18:33 ad Exp $ */ /* $NetBSD: kern_malloc.c,v 1.111 2007/04/19 11:03:44 yamt Exp $ */
/* /*
* Copyright (c) 1987, 1991, 1993 * Copyright (c) 1987, 1991, 1993
@ -66,7 +66,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.110 2007/03/12 18:18:33 ad Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_malloc.c,v 1.111 2007/04/19 11:03:44 yamt Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/proc.h> #include <sys/proc.h>
@ -356,6 +356,7 @@ malloc(unsigned long size, struct malloc_type *ksp, int flags)
copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY; copysize = 1 << indx < MAX_COPY ? 1 << indx : MAX_COPY;
#endif #endif
if (kbp->kb_next == NULL) { if (kbp->kb_next == NULL) {
int s;
kbp->kb_last = NULL; kbp->kb_last = NULL;
if (size > MAXALLOCSAVE) if (size > MAXALLOCSAVE)
allocsize = round_page(size); allocsize = round_page(size);
@ -363,11 +364,13 @@ malloc(unsigned long size, struct malloc_type *ksp, int flags)
allocsize = 1 << indx; allocsize = 1 << indx;
npg = btoc(allocsize); npg = btoc(allocsize);
mutex_exit(&malloc_lock); mutex_exit(&malloc_lock);
s = splvm();
va = (void *) uvm_km_alloc(kmem_map, va = (void *) uvm_km_alloc(kmem_map,
(vsize_t)ctob(npg), 0, (vsize_t)ctob(npg), 0,
((flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0) | ((flags & M_NOWAIT) ? UVM_KMF_NOWAIT : 0) |
((flags & M_CANFAIL) ? UVM_KMF_CANFAIL : 0) | ((flags & M_CANFAIL) ? UVM_KMF_CANFAIL : 0) |
UVM_KMF_WIRED); UVM_KMF_WIRED);
splx(s);
if (__predict_false(va == NULL)) { if (__predict_false(va == NULL)) {
/* /*
* Kmem_malloc() can return NULL, even if it can * Kmem_malloc() can return NULL, even if it can