eventpoll: support non-blocking do_epoll_ctl() calls

Also make it available outside of epoll, along with the helper that decides if we need to copy the passed in epoll_event.

Jens Axboe committed 6 years ago

Commit 39220e81 parent 58e41a42 files · +42 −13Browse files

Unified · Split

2 files

fs/eventpoll.c +33 −13
include/linux/eventpoll.h +9 −0

fs/eventpoll.c+33−13

 	return container_of(p, struct ep_pqueue, pt)->epi;
 }
-/* Tells if the epoll_ctl(2) operation needs an event copy from userspace */
-static inline int ep_op_has_event(int op)
-{
-	return op != EPOLL_CTL_DEL;
-}
 /* Initialize the poll safe wake up structure */
 static void ep_nested_calls_init(struct nested_calls *ncalls)
 {
 	return do_epoll_create(0);
 }
-static int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds)
+static inline int epoll_mutex_lock(struct mutex *mutex, int depth,
+				   bool nonblock)
+{
+	if (!nonblock) {
+		mutex_lock_nested(mutex, depth);
+		return 0;
+	}
+	if (mutex_trylock(mutex))
+		return 0;
+	return -EAGAIN;
+}
+int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
+		 bool nonblock)
 {
 	int error;
 	int full_check = 0;
 	 * deep wakeup paths from forming in parallel through multiple
 	 * EPOLL_CTL_ADD operations.
 	 */
-	mutex_lock_nested(&ep->mtx, 0);
+	error = epoll_mutex_lock(&ep->mtx, 0, nonblock);
+	if (error)
+		goto error_tgt_fput;
 	if (op == EPOLL_CTL_ADD) {
 		if (!list_empty(&f.file->f_ep_links) ||
 						is_file_epoll(tf.file)) {
-			full_check = 1;
 			mutex_unlock(&ep->mtx);
-			mutex_lock(&epmutex);
+			error = epoll_mutex_lock(&epmutex, 0, nonblock);
+			if (error)
+				goto error_tgt_fput;
+			full_check = 1;
 			if (is_file_epoll(tf.file)) {
 				error = -ELOOP;
 				if (ep_loop_check(ep, tf.file) != 0) {
 			} else
 				list_add(&tf.file->f_tfile_llink,
 							&tfile_check_list);
-			mutex_lock_nested(&ep->mtx, 0);
+			error = epoll_mutex_lock(&ep->mtx, 0, nonblock);
+			if (error) {
+out_del:
+				list_del(&tf.file->f_tfile_llink);
+				goto error_tgt_fput;
+			}
 			if (is_file_epoll(tf.file)) {
 				tep = tf.file->private_data;
-				mutex_lock_nested(&tep->mtx, 1);
+				error = epoll_mutex_lock(&tep->mtx, 1, nonblock);
+				if (error) {
+					mutex_unlock(&ep->mtx);
+					goto out_del;
+				}
 			}
 		}
 	}
 	    copy_from_user(&epds, event, sizeof(struct epoll_event)))
 		return -EFAULT;
-	return do_epoll_ctl(epfd, op, fd, &epds);
+	return do_epoll_ctl(epfd, op, fd, &epds, false);
 }
 /*

include/linux/eventpoll.h+9−0

@@ -61,6 +61,15 @@ static inline void eventpoll_release(struct file *file) · 60 unmodified lines
61	eventpoll_release_file(file);	61	eventpoll_release_file(file);
62	}	62	}
63		63
		64	int do_epoll_ctl(int epfd, int op, int fd, struct epoll_event *epds,
		65	bool nonblock);
		66
		67	/* Tells if the epoll_ctl(2) operation needs an event copy from userspace */
		68	static inline int ep_op_has_event(int op)
		69	{
		70	return op != EPOLL_CTL_DEL;
		71	}
		72
64	#else	73	#else
65		74
66	static inline void eventpoll_init_file(struct file *file) {}	75	static inline void eventpoll_init_file(struct file *file) {}