Skip to contentSkip to conversation

io_uring: kill dead code in io_req_complete_post

PATCH In review Ming Lei 3 participants 3 messages Mar 29, 2024 – Apr 2, 2024 io_uring

lore
Share & tools
lore

Ming Lei

author
#0 lore raw

PATCH 1/1 io_uring: kill dead code in io_req_complete_post

Since commit 8f6c829491fe ("io_uring: remove struct io_tw_state::locked"), io_req_complete_post() is only called from io-wq submit work, where the request reference is guaranteed to be grabbed and won't drop to zero in io_req_complete_post().

Kill the dead code, meantime add req_ref_put() to put the reference.

Cc Pavel Begunkov <[email protected]>
---
 io_uring/io_uring.c | 37 ++-----------------------------------
 io_uring/refs.h     |  7 +++++++
 2 files changed, 9 insertions(+), 35 deletions(-)
io_uring/io_uring.c +2 -35
index 104899522bc5..ac2e5da4558a 100644
@@ -929,7 +929,6 @@ bool io_req_post_cqe(struct io_kiocb *req, s32 res, u32 cflags)
 static void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
 {
 	struct io_ring_ctx *ctx = req->ctx;
-	struct io_rsrc_node *rsrc_node = NULL;
 
 	/*
 	 * Handle special CQ sync cases via task_work. DEFER_TASKRUN requires
@@ -946,42 +945,10 @@ static void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
 		if (!io_fill_cqe_req(ctx, req))
 			io_req_cqe_overflow(req);
 	}
-
-	/*
-	 * If we're the last reference to this request, add to our locked
-	 * free_list cache.
-	 */
-	if (req_ref_put_and_test(req)) {
-		if (req->flags & IO_REQ_LINK_FLAGS) {
-			if (req->flags & IO_DISARM_MASK)
-				io_disarm_next(req);
-			if (req->link) {
-				io_req_task_queue(req->link);
-				req->link = NULL;
-			}
-		}
-		io_put_kbuf_comp(req);
-		if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS))
-			io_clean_op(req);
-		io_put_file(req);
-
-		rsrc_node = req->rsrc_node;
-		/*
-		 * Selected buffer deallocation in io_clean_op() assumes that
-		 * we don't hold ->completion_lock. Clean them here to avoid
-		 * deadlocks.
-		 */
-		io_put_task_remote(req->task);
-		wq_list_add_head(&req->comp_list, &ctx->locked_free_list);
-		ctx->locked_free_nr++;
-	}
 	io_cq_unlock_post(ctx);
 
-	if (rsrc_node) {
-		io_ring_submit_lock(ctx, issue_flags);
-		io_put_rsrc_node(ctx, rsrc_node);
-		io_ring_submit_unlock(ctx, issue_flags);
-	}
+	/* called from io-wq submit work only, the ref won't drop to zero */
+	req_ref_put(req);
 }
 
 void io_req_defer_failed(struct io_kiocb *req, s32 res)
io_uring/refs.h +7 -0
index 1336de3f2a30..63982ead9f7d 100644
@@ -33,6 +33,13 @@ static inline void req_ref_get(struct io_kiocb *req)
 	atomic_inc(&req->refs);
 }
 
+static inline void req_ref_put(struct io_kiocb *req)
+{
+	WARN_ON_ONCE(!(req->flags & REQ_F_REFCOUNT));
+	WARN_ON_ONCE(req_ref_zero_or_close_to_overflow(req));
+	atomic_dec(&req->refs);
+}
+
 static inline void __io_req_set_refcount(struct io_kiocb *req, int nr)
 {
 	if (!(req->flags & REQ_F_REFCOUNT)) {
Signature · 1 line
2.41.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Ming Lei

Since commit 8f6c829491fe ("io_uring: remove struct io_tw_state::locked"), io_req_complete_post() is only called from io-wq submit work, where the request reference is guaranteed to be grabbed and won't drop to zero in io_req_complete_post().

Kill the dead code, meantime add req_ref_put() to put the reference.

Interesting... a nice clean up. The assumption is too implicit to my taste, but should be just fine if we add

if (WARN_ON_ONCE(!(issue_flags & IO_URING_F_IOWQ)))

	return;

at the beginning of io_req_complete_post(), it's a slow path. And with this change:

Quoted 82 lines
Cc Pavel Begunkov <[email protected]>
---
  io_uring/io_uring.c | 37 ++-----------------------------------
  io_uring/refs.h     |  7 +++++++
  2 files changed, 9 insertions(+), 35 deletions(-)
io_uring/io_uring.c +2 -35
index 104899522bc5..ac2e5da4558a 100644
@@ -929,7 +929,6 @@ bool io_req_post_cqe(struct io_kiocb *req, s32 res, u32 cflags)
  static void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
  {
  	struct io_ring_ctx *ctx = req->ctx;
-	struct io_rsrc_node *rsrc_node = NULL;
 
  	/*
  	 * Handle special CQ sync cases via task_work. DEFER_TASKRUN requires
@@ -946,42 +945,10 @@ static void io_req_complete_post(struct io_kiocb *req, unsigned issue_flags)
  		if (!io_fill_cqe_req(ctx, req))
  			io_req_cqe_overflow(req);
  	}
-
-	/*
-	 * If we're the last reference to this request, add to our locked
-	 * free_list cache.
-	 */
-	if (req_ref_put_and_test(req)) {
-		if (req->flags & IO_REQ_LINK_FLAGS) {
-			if (req->flags & IO_DISARM_MASK)
-				io_disarm_next(req);
-			if (req->link) {
-				io_req_task_queue(req->link);
-				req->link = NULL;
-			}
-		}
-		io_put_kbuf_comp(req);
-		if (unlikely(req->flags & IO_REQ_CLEAN_FLAGS))
-			io_clean_op(req);
-		io_put_file(req);
-
-		rsrc_node = req->rsrc_node;
-		/*
-		 * Selected buffer deallocation in io_clean_op() assumes that
-		 * we don't hold ->completion_lock. Clean them here to avoid
-		 * deadlocks.
-		 */
-		io_put_task_remote(req->task);
-		wq_list_add_head(&req->comp_list, &ctx->locked_free_list);
-		ctx->locked_free_nr++;
-	}
  	io_cq_unlock_post(ctx);
 
-	if (rsrc_node) {
-		io_ring_submit_lock(ctx, issue_flags);
-		io_put_rsrc_node(ctx, rsrc_node);
-		io_ring_submit_unlock(ctx, issue_flags);
-	}
+	/* called from io-wq submit work only, the ref won't drop to zero */
+	req_ref_put(req);
  }
 
  void io_req_defer_failed(struct io_kiocb *req, s32 res)
io_uring/refs.h +7 -0
index 1336de3f2a30..63982ead9f7d 100644
@@ -33,6 +33,13 @@ static inline void req_ref_get(struct io_kiocb *req)
  	atomic_inc(&req->refs);
  }
 
+static inline void req_ref_put(struct io_kiocb *req)
+{
+	WARN_ON_ONCE(!(req->flags & REQ_F_REFCOUNT));
+	WARN_ON_ONCE(req_ref_zero_or_close_to_overflow(req));
+	atomic_dec(&req->refs);
+}
+
  static inline void __io_req_set_refcount(struct io_kiocb *req, int nr)
  {
  	if (!(req->flags & REQ_F_REFCOUNT)) {
Signature · 1 line
Pavel Begunkov
maintainer
#2 lore raw
Quoted 6 lines · Pavel Begunkov
Quoted 5 lines · Ming Lei

Since commit 8f6c829491fe ("io_uring: remove struct io_tw_state::locked"), io_req_complete_post() is only called from io-wq submit work, where the request reference is guaranteed to be grabbed and won't drop to zero in io_req_complete_post().

Quoted 7 lines
Quoted 1 line

Kill the dead code, meantime add req_ref_put() to put the reference.

Interesting... a nice clean up. The assumption is too implicit to my taste, but should be just fine if we add

if (WARN_ON_ONCE(!(issue_flags & IO_URING_F_IOWQ)))

    return;

And include a comment as to why that is there as well.

Signature · 1 line
Jens Axboe