From: Stefan Roesch <[email protected]>
To: <[email protected]>, <[email protected]>,
<[email protected]>
Cc: <[email protected]>, <[email protected]>
Subject: [PATCH v4 10/12] io_uring: support CQE32 in /proc info
Date: Tue, 26 Apr 2022 11:21:32 -0700 [thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
This exposes the extra1 and extra2 fields in the /proc output.
Signed-off-by: Stefan Roesch <[email protected]>
Reviewed-by: Kanchan Joshi <[email protected]>
---
fs/io_uring.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 9dd075e39850..e1b84204b0ab 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -11354,10 +11354,15 @@ static __cold void __io_uring_show_fdinfo(struct io_ring_ctx *ctx,
unsigned int sq_tail = READ_ONCE(r->sq.tail);
unsigned int cq_head = READ_ONCE(r->cq.head);
unsigned int cq_tail = READ_ONCE(r->cq.tail);
+ unsigned int cq_shift = 0;
unsigned int sq_entries, cq_entries;
bool has_lock;
+ bool is_cqe32 = (ctx->flags & IORING_SETUP_CQE32);
unsigned int i;
+ if (is_cqe32)
+ cq_shift = 1;
+
/*
* we may get imprecise sqe and cqe info if uring is actively running
* since we get cached_sq_head and cached_cq_tail without uring_lock
@@ -11390,11 +11395,18 @@ static __cold void __io_uring_show_fdinfo(struct io_ring_ctx *ctx,
cq_entries = min(cq_tail - cq_head, ctx->cq_entries);
for (i = 0; i < cq_entries; i++) {
unsigned int entry = i + cq_head;
- struct io_uring_cqe *cqe = &r->cqes[entry & cq_mask];
+ struct io_uring_cqe *cqe = &r->cqes[(entry & cq_mask) << cq_shift];
- seq_printf(m, "%5u: user_data:%llu, res:%d, flag:%x\n",
+ if (!is_cqe32) {
+ seq_printf(m, "%5u: user_data:%llu, res:%d, flag:%x\n",
entry & cq_mask, cqe->user_data, cqe->res,
cqe->flags);
+ } else {
+ seq_printf(m, "%5u: user_data:%llu, res:%d, flag:%x, "
+ "extra1:%llu, extra2:%llu\n",
+ entry & cq_mask, cqe->user_data, cqe->res,
+ cqe->flags, cqe->big_cqe[0], cqe->big_cqe[1]);
+ }
}
/*
--
2.30.2
next prev parent reply other threads:[~2022-04-26 18:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-26 18:21 [PATCH v4 00/12] add large CQE support for io-uring Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 01/12] io_uring: support CQE32 in io_uring_cqe Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 02/12] io_uring: store add. return values for CQE32 Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 03/12] io_uring: change ring size calculation " Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 04/12] io_uring: add CQE32 setup processing Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 05/12] io_uring: add CQE32 completion processing Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 06/12] io_uring: modify io_get_cqe for CQE32 Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 07/12] io_uring: flush completions " Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 08/12] io_uring: overflow processing " Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 09/12] io_uring: add tracing for additional CQE32 fields Stefan Roesch
2022-04-26 18:21 ` Stefan Roesch [this message]
2022-04-26 18:21 ` [PATCH v4 11/12] io_uring: enable CQE32 Stefan Roesch
2022-04-26 18:21 ` [PATCH v4 12/12] io_uring: support CQE32 for nop operation Stefan Roesch
2022-04-26 22:58 ` [PATCH v4 00/12] add large CQE support for io-uring Jens Axboe
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] \
/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