OS-4656 nested epoll does not mimic Linux behavior

Reviewed by: Bryan Cantrill <bryan@joyent.com>
TritonDataCenter · Sep 18, 2015 · 1cf3b4f · 1cf3b4f
1 parent 571f94b
commit 1cf3b4f
Show file tree

Hide file tree

Showing 10 changed files with 814 additions and 171 deletions.
diff --git a/usr/src/uts/common/brand/lx/io/lx_ptm.c b/usr/src/uts/common/brand/lx/io/lx_ptm.c
@@ -1078,7 +1078,10 @@ lx_ptm_poll_loop(dev_t dev, short events, int anyyet, short *reventsp,
 		 * locks that we are already holding.  So we need to
 		 * drop those locks here before we do our read.
 		 */
-		lockstate = pollunlock();
+		if (pollunlock(&lockstate) != 0) {
+			*reventsp = POLLNVAL;
+			return (0);
+		}
 		err = lx_ptm_eof_drop(dev, &rval);
 		pollrelock(lockstate);
 		if (err)

diff --git a/usr/src/uts/common/fs/fifofs/fifovnops.c b/usr/src/uts/common/fs/fifofs/fifovnops.c
@@ -28,7 +28,7 @@
  */
 
 /*
- * Copyright (c) 2014, Joyent, Inc.  All rights reserved.
+ * Copyright 2015, Joyent, Inc.
  */
 
 /*
@@ -1775,7 +1775,10 @@ fifo_poll(vnode_t *vp, short events, int anyyet, short *reventsp,
 	fn_dest		= fnp->fn_dest;
 	fn_lock		= fnp->fn_lock;
 
-	polllock(&stp->sd_pollist, &fn_lock->flk_lock);
+	if (polllock(&stp->sd_pollist, &fn_lock->flk_lock) != 0) {
+		*reventsp = POLLNVAL;
+		return (0);
+	}
 
 	/*
 	 * see if FIFO/pipe open

diff --git a/usr/src/uts/common/fs/proc/prvnops.c b/usr/src/uts/common/fs/proc/prvnops.c
@@ -6099,7 +6099,11 @@ prpoll(vnode_t *vp, short events, int anyyet, short *reventsp,
 		return (0);
 	}
 
-	lockstate = pollunlock();	/* avoid deadlock with prnotify() */
+	/* avoid deadlock with prnotify() */
+	if (pollunlock(&lockstate) != 0) {
+		*reventsp = POLLNVAL;
+		return (0);
+	}
 
 	if ((error = prlock(pnp, ZNO)) != 0) {
 		pollrelock(lockstate);