From e4a7358455d38f6e16e9263c26c6938757a2edfe Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 22 Sep 2022 13:22:44 +0200 Subject: [PATCH] Revert "io_uring: disable polling pollfree files" This reverts commit 28d8d2737e82fc29ff9e788597661abecc7f7994. This breaks the Android api and for now, does not seem to be necessary due to the lack of io_uring users in this kernel branch. If io_uring starts to be used more, it can be brought back in a ABI-safe way. Bug: 161946584 Bug: 248008710 Signed-off-by: Greg Kroah-Hartman Change-Id: I2696bd5e1ad61d3ab0e8d06f4ffe46718bb05845 --- drivers/android/binder.c | 1 - fs/io_uring.c | 5 ----- fs/signalfd.c | 1 - include/linux/fs.h | 1 - 4 files changed, 8 deletions(-) diff --git a/drivers/android/binder.c b/drivers/android/binder.c index e62701b33533..e2f6da3332a6 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -6197,7 +6197,6 @@ const struct file_operations binder_fops = { .open = binder_open, .flush = binder_flush, .release = binder_release, - .may_pollfree = true, }; DEFINE_SHOW_ATTRIBUTE(state); diff --git a/fs/io_uring.c b/fs/io_uring.c index 9654b60a06a5..a952288b2ab8 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -5198,11 +5198,6 @@ static __poll_t __io_arm_poll_handler(struct io_kiocb *req, struct io_ring_ctx *ctx = req->ctx; bool cancel = false; - if (req->file->f_op->may_pollfree) { - spin_lock_irq(&ctx->completion_lock); - return -EOPNOTSUPP; - } - INIT_HLIST_NODE(&req->hash_node); io_init_poll_iocb(poll, mask, wake_func); poll->file = req->file; diff --git a/fs/signalfd.c b/fs/signalfd.c index 41dc597b78cc..b94fb5f81797 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c @@ -248,7 +248,6 @@ static const struct file_operations signalfd_fops = { .poll = signalfd_poll, .read = signalfd_read, .llseek = noop_llseek, - .may_pollfree = true, }; static int do_signalfd4(int ufd, sigset_t *mask, int flags) diff --git a/include/linux/fs.h b/include/linux/fs.h index 4c1eaad3644f..4019e6fa3b95 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1893,7 +1893,6 @@ struct file_operations { struct file *file_out, loff_t pos_out, loff_t len, unsigned int remap_flags); int (*fadvise)(struct file *, loff_t, loff_t, int); - bool may_pollfree; ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2);