Merge branch 'io_uring-7.1' into for-next

axboe · axboe · commit b388df34752d · 2026-04-16T10:07:40.000-06:00
* io_uring-7.1:
  io_uring/tctx: mark io_wq as exiting before error path teardown
diff --git a/io_uring/tctx.c b/io_uring/tctx.c
@@ -171,8 +171,10 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)
 	}
 	if (!current->io_uring) {
 err_free:
-		if (tctx->io_wq)
+		if (tctx->io_wq) {
+			io_wq_exit_start(tctx->io_wq);
 			io_wq_put_and_exit(tctx->io_wq);
+		}
 		percpu_counter_destroy(&tctx->inflight);
 		kfree(tctx);
 	}

Original file line number	Diff line number	Diff line change
`@@ -171,8 +171,10 @@ int __io_uring_add_tctx_node(struct io_ring_ctx *ctx)`
`171`	`171`	`}`
`172`	`172`	`if (!current->io_uring) {`
`173`	`173`	`err_free:`
`174`		`- if (tctx->io_wq)`
	`174`	`+ if (tctx->io_wq) {`
	`175`	`+ io_wq_exit_start(tctx->io_wq);`
`175`	`176`	`io_wq_put_and_exit(tctx->io_wq);`
	`177`	`+ }`
`176`	`178`	`percpu_counter_destroy(&tctx->inflight);`
`177`	`179`	`kfree(tctx);`
`178`	`180`	`}`