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

when we fail to allocate anons to represent new swap space, 

just return an error rather than panicing.
This commit is contained in:
chs 2000-12-27 09:17:04 +00:00
parent 910b4f2e20
commit 89b005fc27
3 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/uvm/uvm_anon.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_anon.c,v 1.10 2000/11/25 06:27:59 chs Exp $ */
/* $NetBSD: uvm_anon.c,v 1.11 2000/12/27 09:17:04 chs Exp $ */
/*
*
@ -88,7 +88,7 @@ uvm_anon_init()
*
* => swap_syscall_lock should be held (protects anonblock_list).
*/
void
int
uvm_anon_add(count)
int count;
{
@ -102,17 +102,16 @@ uvm_anon_add(count)
simple_unlock(&uvm.afreelock);
if (needed <= 0) {
return;
return 0;
}
MALLOC(anonblock, void *, sizeof(*anonblock), M_UVMAMAP, M_WAITOK);
anon = (void *)uvm_km_alloc(kernel_map, sizeof(*anon) * needed);
/* XXX Should wait for VM to free up. */
if (anonblock == NULL || anon == NULL) {
printf("uvm_anon_add: can not allocate %d anons\n", needed);
panic("uvm_anon_add");
if (anon == NULL) {
simple_lock(&uvm.afreelock);
uvmexp.nanonneeded -= count;
simple_unlock(&uvm.afreelock);
return ENOMEM;
}
MALLOC(anonblock, void *, sizeof(*anonblock), M_UVMAMAP, M_WAITOK);
anonblock->count = needed;
anonblock->anons = anon;
@ -129,6 +128,7 @@ uvm_anon_add(count)
simple_lock_init(&uvm.afree->an_lock);
}
simple_unlock(&uvm.afreelock);
return 0;
}
/*

4
sys/uvm/uvm_anon.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_anon.h,v 1.12 2000/01/11 06:57:49 chs Exp $ */
/* $NetBSD: uvm_anon.h,v 1.13 2000/12/27 09:17:04 chs Exp $ */
/*
*
@ -101,7 +101,7 @@ struct vm_aref {
struct vm_anon *uvm_analloc __P((void));
void uvm_anfree __P((struct vm_anon *));
void uvm_anon_init __P((void));
void uvm_anon_add __P((int));
int uvm_anon_add __P((int));
void uvm_anon_remove __P((int));
struct vm_page *uvm_anon_lockloanpg __P((struct vm_anon *));
void uvm_anon_dropswap __P((struct vm_anon *));

27
sys/uvm/uvm_swap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: uvm_swap.c,v 1.42 2000/12/23 12:13:05 enami Exp $ */
/* $NetBSD: uvm_swap.c,v 1.43 2000/12/27 09:17:04 chs Exp $ */
/*
* Copyright (c) 1995, 1996, 1997 Matthew R. Green
@ -927,16 +927,20 @@ swap_on(p, sdp)
printf("leaving %d pages of swap\n", size);
}
/*
* try to add anons to reflect the new swap space.
*/
error = uvm_anon_add(size);
if (error) {
goto bad;
}
/*
* add a ref to vp to reflect usage as a swap device.
*/
vref(vp);
/*
* add anons to reflect the new swap space
*/
uvm_anon_add(size);
/*
* now add the new swapdev to the drum and enable.
*/
@ -949,12 +953,17 @@ swap_on(p, sdp)
simple_unlock(&uvm.swap_data_lock);
return (0);
bad:
/*
* failure: close device if necessary and return error.
* failure: clean up and return error.
*/
if (vp != rootvp)
bad:
if (sdp->swd_ex) {
extent_destroy(sdp->swd_ex);
}
if (vp != rootvp) {
(void)VOP_CLOSE(vp, FREAD|FWRITE, p->p_ucred, p);
}
return (error);
}