Module Name: src
Committed By: ad
Date: Sun Mar 8 17:04:46 UTC 2020
Modified Files:
src/sys/kern: kern_lwp.c
Log Message:
PR kern/55020: dbregs_dr?_dont_inherit_lwp test cases fail on real hardware
lwp_wait(): make the check for deadlock much more permissive.
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/sys/kern/kern_lwp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_lwp.c
diff -u src/sys/kern/kern_lwp.c:1.228 src/sys/kern/kern_lwp.c:1.229
--- src/sys/kern/kern_lwp.c:1.228 Thu Feb 27 20:52:25 2020
+++ src/sys/kern/kern_lwp.c Sun Mar 8 17:04:45 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_lwp.c,v 1.228 2020/02/27 20:52:25 ad Exp $ */
+/* $NetBSD: kern_lwp.c,v 1.229 2020/03/08 17:04:45 ad Exp $ */
/*-
* Copyright (c) 2001, 2006, 2007, 2008, 2009, 2019, 2020
@@ -211,7 +211,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.228 2020/02/27 20:52:25 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_lwp.c,v 1.229 2020/03/08 17:04:45 ad Exp $");
#include "opt_ddb.h"
#include "opt_lockdebug.h"
@@ -677,12 +677,13 @@ lwp_wait(struct lwp *l, lwpid_t lid, lwp
}
/*
- * If all other LWPs are waiting for exits or suspends
- * and the supply of zombies and potential zombies is
- * exhausted, then we are about to deadlock.
+ * Break out if the process is exiting, or if all LWPs are
+ * in _lwp_wait(). There are other ways to hang the process
+ * with _lwp_wait(), but the sleep is interruptable so
+ * little point checking for them.
*/
if ((p->p_sflag & PS_WEXIT) != 0 ||
- p->p_nrlwps + p->p_nzlwps - p->p_ndlwps <= p->p_nlwpwait) {
+ p->p_nlwpwait == p->p_nlwps) {
error = EDEADLK;
break;
}
