From: Kanchan Joshi <[email protected]>
To: Stefan Roesch <[email protected]>
Cc: [email protected], [email protected],
Jens Axboe <[email protected]>
Subject: Re: [PATCH v2 05/12] io_uring: add CQE32 completion processing
Date: Fri, 22 Apr 2022 07:04:57 +0530 [thread overview]
Message-ID: <CA+1E3rLpz3FE76++pQK4rhHKN6xdhcF8YoUV_g+75rEwwj4OyA@mail.gmail.com> (raw)
In-Reply-To: <[email protected]>
On Thu, Apr 21, 2022 at 10:44 AM Stefan Roesch <[email protected]> wrote:
>
> This adds the completion processing for the large CQE's and makes sure
> that the extra1 and extra2 fields are passed through.
>
> Co-developed-by: Jens Axboe <[email protected]>
> Signed-off-by: Stefan Roesch <[email protected]>
> Signed-off-by: Jens Axboe <[email protected]>
> ---
> fs/io_uring.c | 55 +++++++++++++++++++++++++++++++++++++++++++--------
> 1 file changed, 47 insertions(+), 8 deletions(-)
>
> diff --git a/fs/io_uring.c b/fs/io_uring.c
> index abbd2efbe255..c93a9353c88d 100644
> --- a/fs/io_uring.c
> +++ b/fs/io_uring.c
> @@ -2247,18 +2247,15 @@ static noinline bool io_fill_cqe_aux(struct io_ring_ctx *ctx, u64 user_data,
> return __io_fill_cqe(ctx, user_data, res, cflags);
> }
>
> -static void __io_req_complete_post(struct io_kiocb *req, s32 res,
> - u32 cflags)
> +static void __io_req_complete_put(struct io_kiocb *req)
> {
> - struct io_ring_ctx *ctx = req->ctx;
> -
> - if (!(req->flags & REQ_F_CQE_SKIP))
> - __io_fill_cqe_req(req, res, cflags);
> /*
> * If we're the last reference to this request, add to our locked
> * free_list cache.
> */
> if (req_ref_put_and_test(req)) {
> + struct io_ring_ctx *ctx = req->ctx;
> +
> if (req->flags & IO_REQ_LINK_FLAGS) {
> if (req->flags & IO_DISARM_MASK)
> io_disarm_next(req);
> @@ -2281,8 +2278,23 @@ static void __io_req_complete_post(struct io_kiocb *req, s32 res,
> }
> }
>
> -static void io_req_complete_post(struct io_kiocb *req, s32 res,
> - u32 cflags)
> +static void __io_req_complete_post(struct io_kiocb *req, s32 res,
> + u32 cflags)
> +{
> + if (!(req->flags & REQ_F_CQE_SKIP))
> + __io_fill_cqe_req(req, res, cflags);
> + __io_req_complete_put(req);
> +}
> +
> +static void __io_req_complete_post32(struct io_kiocb *req, s32 res,
> + u32 cflags, u64 extra1, u64 extra2)
> +{
> + if (!(req->flags & REQ_F_CQE_SKIP))
> + __io_fill_cqe32_req(req, res, cflags, extra1, extra2);
> + __io_req_complete_put(req);
> +}
> +
> +static void io_req_complete_post(struct io_kiocb *req, s32 res, u32 cflags)
> {
> struct io_ring_ctx *ctx = req->ctx;
>
> @@ -2293,6 +2305,18 @@ static void io_req_complete_post(struct io_kiocb *req, s32 res,
> io_cqring_ev_posted(ctx);
> }
>
> +static void io_req_complete_post32(struct io_kiocb *req, s32 res,
> + u32 cflags, u64 extra1, u64 extra2)
> +{
> + struct io_ring_ctx *ctx = req->ctx;
> +
> + spin_lock(&ctx->completion_lock);
> + __io_req_complete_post32(req, res, cflags, extra1, extra2);
> + io_commit_cqring(ctx);
> + spin_unlock(&ctx->completion_lock);
> + io_cqring_ev_posted(ctx);
> +}
> +
> static inline void io_req_complete_state(struct io_kiocb *req, s32 res,
> u32 cflags)
> {
> @@ -2310,6 +2334,21 @@ static inline void __io_req_complete(struct io_kiocb *req, unsigned issue_flags,
> io_req_complete_post(req, res, cflags);
> }
>
> +static inline void __io_req_complete32(struct io_kiocb *req,
> + unsigned int issue_flags, s32 res,
> + u32 cflags, u64 extra1, u64 extra2)
> +{
> + if (issue_flags & IO_URING_F_COMPLETE_DEFER) {
> + req->cqe.res = res;
> + req->cqe.flags = cflags;
> + req->extra1 = extra1;
> + req->extra2 = extra2;
> + req->flags |= REQ_F_COMPLETE_INLINE;
nit: we can use the existing helper (io_req_complete_state) to
populate these fields rather than open-coding.
next prev parent reply other threads:[~2022-04-22 1:35 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-20 19:14 [PATCH v2 00/12] add large CQE support for io-uring Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 01/12] io_uring: support CQE32 in io_uring_cqe Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 02/12] io_uring: wire up inline completion path for CQE32 Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 03/12] io_uring: change ring size calculation " Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 04/12] io_uring: add CQE32 setup processing Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 05/12] io_uring: add CQE32 completion processing Stefan Roesch
2022-04-22 1:34 ` Kanchan Joshi [this message]
2022-04-22 21:39 ` Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 06/12] io_uring: modify io_get_cqe for CQE32 Stefan Roesch
2022-04-22 1:25 ` Kanchan Joshi
2022-04-22 23:59 ` Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 07/12] io_uring: flush completions " Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 08/12] io_uring: overflow processing " Stefan Roesch
2022-04-22 2:15 ` Kanchan Joshi
2022-04-22 21:27 ` Stefan Roesch
2022-04-25 10:31 ` Kanchan Joshi
2022-04-20 19:14 ` [PATCH v2 09/12] io_uring: add tracing for additional CQE32 fields Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 10/12] io_uring: support CQE32 in /proc info Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 11/12] io_uring: enable CQE32 Stefan Roesch
2022-04-20 19:14 ` [PATCH v2 12/12] io_uring: support CQE32 for nop operation Stefan Roesch
2022-04-20 22:51 ` [PATCH v2 00/12] add large CQE support for io-uring Jens Axboe
2022-04-21 18:42 ` Pavel Begunkov
2022-04-21 18:49 ` Stefan Roesch
2022-04-21 18:54 ` Jens Axboe
2022-04-21 18:57 ` Pavel Begunkov
2022-04-21 18:59 ` Jens Axboe
2022-04-22 3:09 ` Kanchan Joshi
2022-04-22 5:06 ` Kanchan Joshi
2022-04-22 21:03 ` Stefan Roesch
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 \
--in-reply-to=CA+1E3rLpz3FE76++pQK4rhHKN6xdhcF8YoUV_g+75rEwwj4OyA@mail.gmail.com \
[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