diff mbox series

[for-next,05/25] io_uring: move cancel_seq out of io-wq

Message ID e25a399d960ee8b6b44e53d46968e1075a86f77e.1655209709.git.asml.silence@gmail.com (mailing list archive)
State New
Headers show
Series 5.20 cleanups and poll optimisations | expand

Commit Message

Pavel Begunkov June 14, 2022, 12:29 p.m. UTC 
io-wq doesn't use ->cancel_seq, it's only important to io_uring and
should be stored there.

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
---
 io_uring/cancel.c         |  4 ++--
 io_uring/io-wq.h          |  1 -
 io_uring/io_uring.c       |  2 +-
 io_uring/io_uring_types.h |  1 +
 io_uring/poll.c           | 10 +++++-----
 io_uring/timeout.c        |  4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

Comments

Jens Axboe June 14, 2022, 12:52 p.m. UTC | #1 
On 6/14/22 6:29 AM, Pavel Begunkov wrote:
> io-wq doesn't use ->cancel_seq, it's only important to io_uring and
> should be stored there.

It isn't there because it's io-wq only, but to save space. This adds 8
bytes to io_kiocb, as far as I can tell?
Pavel Begunkov June 14, 2022, 1:01 p.m. UTC | #2 
On 6/14/22 13:52, Jens Axboe wrote:
> On 6/14/22 6:29 AM, Pavel Begunkov wrote:
>> io-wq doesn't use ->cancel_seq, it's only important to io_uring and
>> should be stored there.
> 
> It isn't there because it's io-wq only, but to save space. This adds 8
> bytes to io_kiocb, as far as I can tell?

Ah ok, makes sense. It's worth a comment though
Jens Axboe June 14, 2022, 1:10 p.m. UTC | #3 
On 6/14/22 7:01 AM, Pavel Begunkov wrote:
> On 6/14/22 13:52, Jens Axboe wrote:
>> On 6/14/22 6:29 AM, Pavel Begunkov wrote:
>>> io-wq doesn't use ->cancel_seq, it's only important to io_uring and
>>> should be stored there.
>>
>> It isn't there because it's io-wq only, but to save space. This adds 8
>> bytes to io_kiocb, as far as I can tell?
> 
> Ah ok, makes sense. It's worth a comment though

Definitely, not sure why I didn't add one... When you respin the series,
maybe change this patch to add that comment instead?
diff mbox series

Patch

diff --git a/io_uring/cancel.c b/io_uring/cancel.c
index 83cceb52d82d..2e72231882b7 100644
--- a/io_uring/cancel.c
+++ b/io_uring/cancel.c
@@ -44,9 +44,9 @@  static bool io_cancel_cb(struct io_wq_work *work, void *data)
 			return false;
 	}
 	if (cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY)) {
-		if (cd->seq == req->work.cancel_seq)
+		if (cd->seq == req->cancel_seq)
 			return false;
-		req->work.cancel_seq = cd->seq;
+		req->cancel_seq = cd->seq;
 	}
 	return true;
 }
diff --git a/io_uring/io-wq.h b/io_uring/io-wq.h
index ba6eee76d028..dbecd27656c7 100644
--- a/io_uring/io-wq.h
+++ b/io_uring/io-wq.h
@@ -155,7 +155,6 @@  struct io_wq_work_node *wq_stack_extract(struct io_wq_work_node *stack)
 struct io_wq_work {
 	struct io_wq_work_node list;
 	unsigned flags;
-	int cancel_seq;
 };
 
 static inline struct io_wq_work *wq_next_work(struct io_wq_work *work)
diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 6a94d1682aaf..af9188c8e2eb 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -849,7 +849,7 @@  static void io_prep_async_work(struct io_kiocb *req)
 
 	req->work.list.next = NULL;
 	req->work.flags = 0;
-	req->work.cancel_seq = atomic_read(&ctx->cancel_seq);
+	req->cancel_seq = atomic_read(&ctx->cancel_seq);
 	if (req->flags & REQ_F_FORCE_ASYNC)
 		req->work.flags |= IO_WQ_WORK_CONCURRENT;
 
diff --git a/io_uring/io_uring_types.h b/io_uring/io_uring_types.h
index ca8e25992ece..25e07c3f7b2a 100644
--- a/io_uring/io_uring_types.h
+++ b/io_uring/io_uring_types.h
@@ -486,6 +486,7 @@  struct io_kiocb {
 	/* custom credentials, valid IFF REQ_F_CREDS is set */
 	const struct cred		*creds;
 	struct io_wq_work		work;
+	int				cancel_seq;
 };
 
 struct io_cancel_data {
diff --git a/io_uring/poll.c b/io_uring/poll.c
index 0df5eca93b16..b46973140ffd 100644
--- a/io_uring/poll.c
+++ b/io_uring/poll.c
@@ -405,7 +405,7 @@  static int __io_arm_poll_handler(struct io_kiocb *req,
 	int v;
 
 	INIT_HLIST_NODE(&req->hash_node);
-	req->work.cancel_seq = atomic_read(&ctx->cancel_seq);
+	req->cancel_seq = atomic_read(&ctx->cancel_seq);
 	io_init_poll_iocb(poll, mask, io_poll_wake);
 	poll->file = req->file;
 
@@ -565,9 +565,9 @@  static struct io_kiocb *io_poll_find(struct io_ring_ctx *ctx, bool poll_only,
 		if (poll_only && req->opcode != IORING_OP_POLL_ADD)
 			continue;
 		if (cd->flags & IORING_ASYNC_CANCEL_ALL) {
-			if (cd->seq == req->work.cancel_seq)
+			if (cd->seq == req->cancel_seq)
 				continue;
-			req->work.cancel_seq = cd->seq;
+			req->cancel_seq = cd->seq;
 		}
 		return req;
 	}
@@ -589,9 +589,9 @@  static struct io_kiocb *io_poll_file_find(struct io_ring_ctx *ctx,
 			if (!(cd->flags & IORING_ASYNC_CANCEL_ANY) &&
 			    req->file != cd->file)
 				continue;
-			if (cd->seq == req->work.cancel_seq)
+			if (cd->seq == req->cancel_seq)
 				continue;
-			req->work.cancel_seq = cd->seq;
+			req->cancel_seq = cd->seq;
 			return req;
 		}
 	}
diff --git a/io_uring/timeout.c b/io_uring/timeout.c
index 69cca42d6835..89000aae65d9 100644
--- a/io_uring/timeout.c
+++ b/io_uring/timeout.c
@@ -227,9 +227,9 @@  static struct io_kiocb *io_timeout_extract(struct io_ring_ctx *ctx,
 		    cd->data != tmp->cqe.user_data)
 			continue;
 		if (cd->flags & (IORING_ASYNC_CANCEL_ALL|IORING_ASYNC_CANCEL_ANY)) {
-			if (cd->seq == tmp->work.cancel_seq)
+			if (cd->seq == tmp->cancel_seq)
 				continue;
-			tmp->work.cancel_seq = cd->seq;
+			tmp->cancel_seq = cd->seq;
 		}
 		req = tmp;
 		break;