CVS commit: src/sys/kern

[Ryota Ozaki]

Module Name:    src
Committed By:   ozaki-r
Date:           Wed Jun 13 05:26:12 UTC 2018

Modified Files:
        src/sys/kern: subr_workqueue.c

Log Message:
Don't wait on workqueue_wait if called from worker itself

Otherwise workqueue_wait never return in such a case.  This treatment
is the same as callout_halt.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/kern/subr_workqueue.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/subr_workqueue.c
diff -u src/sys/kern/subr_workqueue.c:1.36 src/sys/kern/subr_workqueue.c:1.37
--- src/sys/kern/subr_workqueue.c:1.36	Tue Feb  6 03:48:39 2018
+++ src/sys/kern/subr_workqueue.c	Wed Jun 13 05:26:12 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_workqueue.c,v 1.36 2018/02/06 03:48:39 ozaki-r Exp $	*/
+/*	$NetBSD: subr_workqueue.c,v 1.37 2018/06/13 05:26:12 ozaki-r Exp $	*/
 
 /*-
  * Copyright (c)2002, 2005, 2006, 2007 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_workqueue.c,v 1.36 2018/02/06 03:48:39 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_workqueue.c,v 1.37 2018/06/13 05:26:12 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -287,6 +287,8 @@ workqueue_q_wait(struct workqueue_queue 
 	bool found = false;
 
 	mutex_enter(&q->q_mutex);
+	if (q->q_worker == curlwp)
+		goto out;
     again:
 	SIMPLEQ_FOREACH(wk, &q->q_queue_pending, wk_entry) {
 		if (wk == wk_target)
@@ -306,6 +308,7 @@ workqueue_q_wait(struct workqueue_queue 
 	}
 	if (q->q_waiter != NULL)
 		q->q_waiter = NULL;
+    out:
 	mutex_exit(&q->q_mutex);
 
 	return found;