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

mi_switch: move an over eager KASSERT defeated by kernel preemption.

Browse Source 
Discovered during automated test.
This commit is contained in:
ad 2019-12-07 21:14:36 +00:00
parent 61223bbb2b
commit 9b2ceb0ad8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/kern/kern_synch.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $ */
/* $NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008, 2009, 2019
@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.330 2019/12/07 17:36:33 ad Exp $");
__KERNEL_RCSID(0, "$NetBSD: kern_synch.c,v 1.331 2019/12/07 21:14:36 ad Exp $");
#include "opt_kstack.h"
#include "opt_dtrace.h"
@ -753,6 +753,7 @@ mi_switch(lwp_t *l)
* Note that, unless the caller disabled preemption, we can
* be preempted at any time after this splx().
*/
KASSERT(l->l_cpu == ci);
splx(oldspl);
} else {
/* Nothing to do - just unlock and return. */
@ -763,9 +764,7 @@ mi_switch(lwp_t *l)
lwp_unlock(l);
}
/* Only now is it safe to consider l_cpu again. */
KASSERT(l == curlwp);
KASSERT(l->l_cpu == ci);
KASSERT(l->l_stat == LSONPROC);
SYSCALL_TIME_WAKEUP(l);