diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 16:54:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2022-02-15 16:54:49 +0000 |
| commit | 7fb5e3d155483e17aacda51785d7d3772b207912 (patch) | |
| tree | 2764c96148c2f88fe65b9157c09b89a9e39c1a95 /sys/kern | |
| parent | d0d3e322b42c97fea6d68d70518a306421eabca0 (diff) | |
when the MI suspend code encounters problems, we need a way to
reset the MD state before bailing out. New MD function sleep_abort()
does that.
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_suspend.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/kern/subr_suspend.c b/sys/kern/subr_suspend.c index 6c34b27df89..c8c95573784 100644 --- a/sys/kern/subr_suspend.c +++ b/sys/kern/subr_suspend.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_suspend.c,v 1.5 2022/02/15 02:38:18 deraadt Exp $ */ +/* $OpenBSD: subr_suspend.c,v 1.6 2022/02/15 16:54:48 deraadt Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org> @@ -63,14 +63,17 @@ sleep_state(void *v, int sleepmode) uvmpd_hibernate(); if (hibernate_alloc()) { printf("failed to allocate hibernate memory\n"); + sleep_abort(v); goto fail_alloc; } } #endif /* HIBERNATE */ sensor_quiesce(); - if (config_suspend_all(DVACT_QUIESCE)) + if (config_suspend_all(DVACT_QUIESCE)) { + sleep_abort(v); goto fail_quiesce; + } vfs_stall(curproc, 1); #if NSOFTRAID > 0 @@ -103,13 +106,17 @@ sleep_state(void *v, int sleepmode) intr_disable(); /* PSL_I for resume; PIC/APIC broken until repair */ cold = 2; /* Force other code to delay() instead of tsleep() */ - if (config_suspend_all(DVACT_SUSPEND) != 0) + if (config_suspend_all(DVACT_SUSPEND) != 0) { + sleep_abort(v); goto fail_suspend; + } suspend_randomness(); - if (sleep_setstate(v)) + if (sleep_setstate(v)) { + sleep_abort(v); goto fail_pts; + } if (sleepmode == SLEEP_SUSPEND) { /* |