Commit 0537fbb6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'io_uring-6.15-20250424' of git://git.kernel.dk/linux 

Pull io_uring fixes from Jens Axboe:

 - Fix an older bug for handling of fallback task_work, when the task is
   exiting. Found by code inspection while reworking cancelation.

 - Fix duplicate flushing in one of the CQE posting helpers.

* tag 'io_uring-6.15-20250424' of git://git.kernel.dk/linux:
  io_uring: fix 'sync' handling of io_fallback_tw()
  io_uring: don't duplicate flushing in io_req_post_cqe
parents 6e3597f1 edd43f4d

io_uring/io_uring.c

+15 −9
Original line number Diff line number Diff line
@@ -872,10 +872,15 @@ bool io_req_post_cqe(struct io_kiocb *req, s32 res, u32 cflags) 
	lockdep_assert(!io_wq_current_is_worker());

	lockdep_assert_held(&ctx->uring_lock);



	__io_cq_lock(ctx);

	if (!ctx->lockless_cq) {

		spin_lock(&ctx->completion_lock);

		posted = io_fill_cqe_aux(ctx, req->cqe.user_data, res, cflags);

		spin_unlock(&ctx->completion_lock);

	} else {

		posted = io_fill_cqe_aux(ctx, req->cqe.user_data, res, cflags);

	}



	ctx->submit_state.cq_flush = true;

	__io_cq_unlock_post(ctx);

	return posted;

}
@@ -1078,20 +1083,21 @@ static __cold void __io_fallback_tw(struct llist_node *node, bool sync) 
	while (node) {

		req = container_of(node, struct io_kiocb, io_task_work.node);

		node = node->next;

		if (sync && last_ctx != req->ctx) {

		if (last_ctx != req->ctx) {

			if (last_ctx) {

				if (sync)

					flush_delayed_work(&last_ctx->fallback_work);

				percpu_ref_put(&last_ctx->refs);

			}

			last_ctx = req->ctx;

			percpu_ref_get(&last_ctx->refs);

		}

		if (llist_add(&req->io_task_work.node,

			      &req->ctx->fallback_llist))

			schedule_delayed_work(&req->ctx->fallback_work, 1);

		if (llist_add(&req->io_task_work.node, &last_ctx->fallback_llist))

			schedule_delayed_work(&last_ctx->fallback_work, 1);

	}



	if (last_ctx) {

		if (sync)

			flush_delayed_work(&last_ctx->fallback_work);

		percpu_ref_put(&last_ctx->refs);

	}