Commit f85c310a authored by Pavel Begunkov's avatar Pavel Begunkov Committed by Jens Axboe
Browse files

io_uring: inline io_req_clean_work() 



Inline io_req_clean_work(), less code and easier to analyse
tctx dependencies and refs usage.

Signed-off-by: default avatarPavel Begunkov <asml.silence@gmail.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 64c72123

fs/io_uring.c

+13 −17
Original line number Diff line number Diff line
@@ -1167,22 +1167,6 @@ static bool req_need_defer(struct io_kiocb *req, u32 seq) 
	return false;

}



static void io_req_clean_work(struct io_kiocb *req)

{

	if (req->flags & REQ_F_INFLIGHT) {

		struct io_ring_ctx *ctx = req->ctx;

		struct io_uring_task *tctx = req->task->io_uring;

		unsigned long flags;



		spin_lock_irqsave(&ctx->inflight_lock, flags);

		list_del(&req->inflight_entry);

		spin_unlock_irqrestore(&ctx->inflight_lock, flags);

		req->flags &= ~REQ_F_INFLIGHT;

		if (atomic_read(&tctx->in_idle))

			wake_up(&tctx->wait);

	}

}



static void io_req_track_inflight(struct io_kiocb *req)

{

	struct io_ring_ctx *ctx = req->ctx;
@@ -1671,7 +1655,19 @@ static void io_dismantle_req(struct io_kiocb *req) 
		io_put_file(req, req->file, (req->flags & REQ_F_FIXED_FILE));

	if (req->fixed_rsrc_refs)

		percpu_ref_put(req->fixed_rsrc_refs);

	io_req_clean_work(req);



	if (req->flags & REQ_F_INFLIGHT) {

		struct io_ring_ctx *ctx = req->ctx;

		struct io_uring_task *tctx = req->task->io_uring;

		unsigned long flags;



		spin_lock_irqsave(&ctx->inflight_lock, flags);

		list_del(&req->inflight_entry);

		spin_unlock_irqrestore(&ctx->inflight_lock, flags);

		req->flags &= ~REQ_F_INFLIGHT;

		if (atomic_read(&tctx->in_idle))

			wake_up(&tctx->wait);

	}

}



static inline void io_put_task(struct task_struct *task, int nr)