diff options
| author | Mike Larkin <mlarkin@cvs.openbsd.org> | 2012-07-11 16:19:05 +0000 |
|---|---|---|
| committer | Mike Larkin <mlarkin@cvs.openbsd.org> | 2012-07-11 16:19:05 +0000 |
| commit | cb21ae2aca82a03c508dec61d1e9957d54e5c600 (patch) | |
| tree | 6172921e214a7db1f96dfa88024036431c3f3d90 /sys | |
| parent | 0ca2e831f2d5662c5cc9e46c141a8a2eccc4688d (diff) | |
Enable the swap checker for hibernate
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_hibernate.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/kern/subr_hibernate.c b/sys/kern/subr_hibernate.c index 388c2d8ba9e..5edd5dc48be 100644 --- a/sys/kern/subr_hibernate.c +++ b/sys/kern/subr_hibernate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_hibernate.c,v 1.40 2012/07/09 09:47:42 deraadt Exp $ */ +/* $OpenBSD: subr_hibernate.c,v 1.41 2012/07/11 16:19:04 mlarkin Exp $ */ /* * Copyright (c) 2011 Ariane van der Steldt <ariane@stack.nl> @@ -30,6 +30,7 @@ #include <sys/fcntl.h> #include <sys/stat.h> #include <uvm/uvm.h> +#include <uvm/uvm_swap.h> #include <machine/hibernate.h> /* Temporary vaddr ranges used during hibernate */ @@ -1835,6 +1836,7 @@ int hibernate_suspend(void) { union hibernate_info hib_info; + size_t swap_size; /* * Calculate memory ranges, swap offsets, etc. @@ -1844,7 +1846,16 @@ hibernate_suspend(void) if (get_hibernate_info(&hib_info, 1)) return (1); - pmap_kenter_pa(HIBERNATE_HIBALLOC_PAGE, HIBERNATE_HIBALLOC_PAGE, VM_PROT_ALL); + swap_size = hib_info.image_size + hib_info.secsize + + HIBERNATE_CHUNK_TABLE_SIZE; + + if (uvm_swap_check_range(hib_info.device, swap_size)) { + printf("insufficient swap space for hibernate\n"); + return (1); + } + + pmap_kenter_pa(HIBERNATE_HIBALLOC_PAGE, HIBERNATE_HIBALLOC_PAGE, + VM_PROT_ALL); pmap_activate(curproc); /* Stash the piglet VA so we can free it in the resuming kernel */ |