Commit 6e409838 authored by Jens Axboe's avatar Jens Axboe
Browse files

io_uring/poll: cleanup apoll freeing 

No point having REQ_F_POLLED in both IO_REQ_CLEAN_FLAGS and in
IO_REQ_CLEAN_SLOW_FLAGS, and having both io_free_batch_list() and then
io_clean_op() check for it and clean it.

Move REQ_F_POLLED to IO_REQ_CLEAN_SLOW_FLAGS and drop it from
IO_REQ_CLEAN_FLAGS, and have only io_free_batch_list() do the check and
freeing.

Link: https://lore.kernel.org/io-uring/20250712000344.1579663-2-axboe@kernel.dk


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6a8afb9f

io_uring/io_uring.c

+3 −8
Original line number Diff line number Diff line
@@ -114,11 +114,11 @@ 
#define IO_REQ_LINK_FLAGS (REQ_F_LINK | REQ_F_HARDLINK)



#define IO_REQ_CLEAN_FLAGS (REQ_F_BUFFER_SELECTED | REQ_F_NEED_CLEANUP | \

				REQ_F_POLLED | REQ_F_INFLIGHT | REQ_F_CREDS | \

				REQ_F_ASYNC_DATA)

				REQ_F_INFLIGHT | REQ_F_CREDS | REQ_F_ASYNC_DATA)



#define IO_REQ_CLEAN_SLOW_FLAGS (REQ_F_REFCOUNT | IO_REQ_LINK_FLAGS | \

				 REQ_F_REISSUE | IO_REQ_CLEAN_FLAGS)

				 REQ_F_REISSUE | REQ_F_POLLED | \

				 IO_REQ_CLEAN_FLAGS)



#define IO_TCTX_REFS_CACHE_NR	(1U << 10)
@@ -392,11 +392,6 @@ static void io_clean_op(struct io_kiocb *req) 
		if (def->cleanup)

			def->cleanup(req);

	}

	if ((req->flags & REQ_F_POLLED) && req->apoll) {

		kfree(req->apoll->double_poll);

		kfree(req->apoll);

		req->apoll = NULL;

	}

	if (req->flags & REQ_F_INFLIGHT)

		atomic_dec(&req->tctx->inflight_tracked);

	if (req->flags & REQ_F_CREDS)