From: Pavel Begunkov <[email protected]>
To: Sidong Yang <[email protected]>,
Josef Bacik <[email protected]>,
David Sterba <[email protected]>, Jens Axboe <[email protected]>
Cc: [email protected], [email protected],
[email protected]
Subject: Re: [RFC PATCH v3 1/3] io-uring/cmd: add iou_vec field for io_uring_cmd
Date: Sun, 16 Mar 2025 07:24:32 +0000 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
On 3/15/25 17:23, Sidong Yang wrote:
> This patch adds iou_vec field for io_uring_cmd. Also it needs to be
> cleanup for cache. It could be used in uring cmd api that imports
> multiple fixed buffers.
Sidong, I think you accidentially erased my authorship over the
patch. The only difference I see is that you rebased it and dropped
prep patches by placing iou_vec into struct io_uring_cmd_data. And
the prep patch was mandatory, once something is exported there is
a good chance it gets [ab]used, and iou_vec is not ready for it.
> Signed-off-by: Sidong Yang <[email protected]>
> ---
> include/linux/io_uring/cmd.h | 1 +
> io_uring/io_uring.c | 2 +-
> io_uring/opdef.c | 1 +
> io_uring/uring_cmd.c | 20 ++++++++++++++++++++
> io_uring/uring_cmd.h | 3 +++
> 5 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/io_uring/cmd.h b/include/linux/io_uring/cmd.h
> index 598cacda4aa3..74b9f0aec229 100644
> --- a/include/linux/io_uring/cmd.h
> +++ b/include/linux/io_uring/cmd.h
> @@ -22,6 +22,7 @@ struct io_uring_cmd {
> struct io_uring_cmd_data {
> void *op_data;
> struct io_uring_sqe sqes[2];
> + struct iou_vec iou_vec;
> };
>
> static inline const void *io_uring_sqe_cmd(const struct io_uring_sqe *sqe)
> diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
> index 5ff30a7092ed..55334fa53abf 100644
> --- a/io_uring/io_uring.c
> +++ b/io_uring/io_uring.c
> @@ -289,7 +289,7 @@ static void io_free_alloc_caches(struct io_ring_ctx *ctx)
> io_alloc_cache_free(&ctx->apoll_cache, kfree);
> io_alloc_cache_free(&ctx->netmsg_cache, io_netmsg_cache_free);
> io_alloc_cache_free(&ctx->rw_cache, io_rw_cache_free);
> - io_alloc_cache_free(&ctx->uring_cache, kfree);
> + io_alloc_cache_free(&ctx->uring_cache, io_cmd_cache_free);
> io_alloc_cache_free(&ctx->msg_cache, kfree);
> io_futex_cache_free(ctx);
> io_rsrc_cache_free(ctx);
> diff --git a/io_uring/opdef.c b/io_uring/opdef.c
> index 7fd173197b1e..e275180c2077 100644
> --- a/io_uring/opdef.c
> +++ b/io_uring/opdef.c
> @@ -755,6 +755,7 @@ const struct io_cold_def io_cold_defs[] = {
> },
> [IORING_OP_URING_CMD] = {
> .name = "URING_CMD",
> + .cleanup = io_uring_cmd_cleanup,
> },
> [IORING_OP_SEND_ZC] = {
> .name = "SEND_ZC",
> diff --git a/io_uring/uring_cmd.c b/io_uring/uring_cmd.c
> index de39b602aa82..315c603cfdd4 100644
> --- a/io_uring/uring_cmd.c
> +++ b/io_uring/uring_cmd.c
> @@ -28,6 +28,13 @@ static void io_req_uring_cleanup(struct io_kiocb *req, unsigned int issue_flags)
>
> if (issue_flags & IO_URING_F_UNLOCKED)
> return;
> +
> + req->flags &= ~REQ_F_NEED_CLEANUP;
> +
> + io_alloc_cache_vec_kasan(&cache->iou_vec);
> + if (cache->iou_vec.nr > IO_VEC_CACHE_SOFT_CAP)
> + io_vec_free(&cache->iou_vec);
> +
> if (io_alloc_cache_put(&req->ctx->uring_cache, cache)) {
> ioucmd->sqe = NULL;
> req->async_data = NULL;
> @@ -35,6 +42,11 @@ static void io_req_uring_cleanup(struct io_kiocb *req, unsigned int issue_flags)
> }
> }
>
> +void io_uring_cmd_cleanup(struct io_kiocb *req)
> +{
> + io_req_uring_cleanup(req, 0);
> +}
> +
> bool io_uring_try_cancel_uring_cmd(struct io_ring_ctx *ctx,
> struct io_uring_task *tctx, bool cancel_all)
> {
> @@ -339,3 +351,11 @@ int io_uring_cmd_sock(struct io_uring_cmd *cmd, unsigned int issue_flags)
> }
> EXPORT_SYMBOL_GPL(io_uring_cmd_sock);
> #endif
> +
> +void io_cmd_cache_free(const void *entry)
> +{
> + struct io_uring_cmd_data *cache = (struct io_uring_cmd_data *)entry;
> +
> + io_vec_free(&cache->iou_vec);
> + kfree(cache);
> +}
> diff --git a/io_uring/uring_cmd.h b/io_uring/uring_cmd.h
> index f6837ee0955b..d2b9c1522e22 100644
> --- a/io_uring/uring_cmd.h
> +++ b/io_uring/uring_cmd.h
> @@ -1,7 +1,10 @@
> // SPDX-License-Identifier: GPL-2.0
> +#include <linux/io_uring_types.h>
>
> int io_uring_cmd(struct io_kiocb *req, unsigned int issue_flags);
> int io_uring_cmd_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe);
> +void io_uring_cmd_cleanup(struct io_kiocb *req);
>
> bool io_uring_try_cancel_uring_cmd(struct io_ring_ctx *ctx,
> struct io_uring_task *tctx, bool cancel_all);
> +void io_cmd_cache_free(const void *entry);
--
Pavel Begunkov
next prev parent reply other threads:[~2025-03-16 7:23 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-15 17:23 [RFC PATCH v3 0/3] introduce io_uring_cmd_import_fixed_vec Sidong Yang
2025-03-15 17:23 ` [RFC PATCH v3 1/3] io-uring/cmd: add iou_vec field for io_uring_cmd Sidong Yang
2025-03-16 7:24 ` Pavel Begunkov [this message]
2025-03-16 8:02 ` Sidong Yang
2025-03-16 8:49 ` Sidong Yang
2025-03-15 17:23 ` [RFC PATCH v3 2/3] io-uring/cmd: introduce io_uring_cmd_import_fixed_vec Sidong Yang
2025-03-15 17:23 ` [RFC PATCH v3 3/3] btrfs: ioctl: introduce btrfs_uring_import_iovec() Sidong Yang
2025-03-16 7:22 ` [RFC PATCH v3 0/3] introduce io_uring_cmd_import_fixed_vec Pavel Begunkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
[email protected] \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox