[PATCH] io_uring: split poll and poll_remove structs

[PATCH] io_uring: split poll and poll_remove structs

[Pavel Begunkov]

Don't use a single struct for polls and poll remove requests, they have
totally different layout.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 fs/io_uring.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 2f6af230e86e..3d244c61a5c3 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -394,16 +394,18 @@ struct io_ring_ctx {
  */
 struct io_poll_iocb {
 	struct file			*file;
-	union {
-		struct wait_queue_head	*head;
-		u64			addr;
-	};
+	struct wait_queue_head		*head;
 	__poll_t			events;
 	bool				done;
 	bool				canceled;
 	struct wait_queue_entry		wait;
 };
 
+struct io_poll_rem {
+	struct file			*file;
+	u64				addr;
+};
+
 struct io_close {
 	struct file			*file;
 	struct file			*put_file;
@@ -649,6 +651,7 @@ struct io_kiocb {
 		struct file		*file;
 		struct io_rw		rw;
 		struct io_poll_iocb	poll;
+		struct io_poll_rem	poll_rem;
 		struct io_accept	accept;
 		struct io_sync		sync;
 		struct io_cancel	cancel;
@@ -5280,7 +5283,7 @@ static int io_poll_remove_prep(struct io_kiocb *req,
 	    sqe->poll_events)
 		return -EINVAL;
 
-	req->poll.addr = READ_ONCE(sqe->addr);
+	req->poll_rem.addr = READ_ONCE(sqe->addr);
 	return 0;
 }
 
@@ -5291,12 +5294,10 @@ static int io_poll_remove_prep(struct io_kiocb *req,
 static int io_poll_remove(struct io_kiocb *req)
 {
 	struct io_ring_ctx *ctx = req->ctx;
-	u64 addr;
 	int ret;
 
-	addr = req->poll.addr;
 	spin_lock_irq(&ctx->completion_lock);
-	ret = io_poll_cancel(ctx, addr);
+	ret = io_poll_cancel(ctx, req->poll_rem.addr);
 	spin_unlock_irq(&ctx->completion_lock);
 
 	if (ret < 0)
-- 
2.24.0

Re: [PATCH] io_uring: split poll and poll_remove structs

[Jens Axboe]

On 10/27/20 5:17 PM, Pavel Begunkov wrote:
> Don't use a single struct for polls and poll remove requests, they have
> totally different layout.

Applied for 5.11 - I renamed it to io_poll_remove instead, fwiw.

-- 
Jens Axboe