FAILED: patch "[PATCH] io_uring: don't post tag CQEs on file/buffer registration" failed to apply to 6.14-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 6.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.14.y
git checkout FETCH_HEAD
git cherry-pick -x ab6005f3912fff07330297aba08922d2456dcede
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2025041712-twine-constrict-d32d@gregkh' --subject-prefix 'PATCH 6.14.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ab6005f3912fff07330297aba08922d2456dcede Mon Sep 17 00:00:00 2001
From: Pavel Begunkov <[email protected]>
Date: Fri, 4 Apr 2025 15:46:34 +0100
Subject: [PATCH] io_uring: don't post tag CQEs on file/buffer registration
failure
Buffer / file table registration is all or nothing, if it fails all resources we might have partially registered are dropped and the table is killed. If that happens, it doesn't make sense to post any rsrc tag CQEs. That would be confusing to the application, which should not need to handle that case.
io_uring/rsrc.c +16 -1
@@ -175,6 +175,18 @@ void io_rsrc_cache_free(struct io_ring_ctx *ctx)io_alloc_cache_free (&ctx->imu_cache, kfree); } +static void io_clear_table_tags (struct io_rsrc_data *data) +{ +int i; + +for (i =0 ; i < data->nr; i++) { +struct io_rsrc_node *node = data->nodes[i]; + +if (node) + node->tag =0 ; + } +} +__cold void io_rsrc_data_free (struct io_ring_ctx *ctx,struct io_rsrc_data *data) {
@@ -583,6 +595,7 @@ int io_sqe_files_register(struct io_ring_ctx *ctx, void __user *arg,io_file_table_set_alloc_range (ctx,0 , ctx->file_table.data.nr);return 0 ; fail: +io_clear_table_tags (&ctx->file_table.data);io_sqe_files_unregister (ctx);return ret; }
@@ -902,8 +915,10 @@ int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, } ctx->buf_table = data; -if (ret) +if (ret) { +io_clear_table_tags (&ctx->buf_table);io_sqe_buffers_unregister (ctx); + }return ret; }