mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
io_uring/fdinfo: fix sqe dumping for IORING_SETUP_SQE128
[ Upstream commit3b8fdd1dc3
] If we have doubly sized SQEs, then we need to shift the sq index by 1 to account for using two entries for a single request. The CQE dumping gets this right, but the SQE one does not. Improve the SQE dumping in general, the information dumped is pretty sparse and doesn't even cover the whole basic part of the SQE. Include information on the extended part of the SQE, if doubly sized SQEs are in use. A typical dump now looks like the following: [...] SQEs: 32 32: opcode:URING_CMD, fd:0, flags:1, off:3225964160, addr:0x0, rw_flags:0x0, buf_index:0 user_data:2721, e0:0x0, e1:0xffffb8041000, e2:0x100000000000, e3:0x5500, e4:0x7, e5:0x0, e6:0x0, e7:0x0 33: opcode:URING_CMD, fd:0, flags:1, off:3225964160, addr:0x0, rw_flags:0x0, buf_index:0 user_data:2722, e0:0x0, e1:0xffffb8043000, e2:0x100000000000, e3:0x5508, e4:0x7, e5:0x0, e6:0x0, e7:0x0 34: opcode:URING_CMD, fd:0, flags:1, off:3225964160, addr:0x0, rw_flags:0x0, buf_index:0 user_data:2723, e0:0x0, e1:0xffffb8045000, e2:0x100000000000, e3:0x5510, e4:0x7, e5:0x0, e6:0x0, e7:0x0 [...] Fixes:ebdeb7c01d
("io_uring: add support for 128-byte SQEs") Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
ecc1e2aab5
commit
c1796c6b2b
1 changed files with 26 additions and 6 deletions
|
@ -60,6 +60,7 @@ static __cold void __io_uring_show_fdinfo(struct io_ring_ctx *ctx,
|
|||
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_shift = 0;
|
||||
unsigned int sq_entries, cq_entries;
|
||||
bool has_lock;
|
||||
bool is_cqe32 = (ctx->flags & IORING_SETUP_CQE32);
|
||||
|
@ -67,6 +68,8 @@ static __cold void __io_uring_show_fdinfo(struct io_ring_ctx *ctx,
|
|||
|
||||
if (is_cqe32)
|
||||
cq_shift = 1;
|
||||
if (ctx->flags & IORING_SETUP_SQE128)
|
||||
sq_shift = 1;
|
||||
|
||||
/*
|
||||
* we may get imprecise sqe and cqe info if uring is actively running
|
||||
|
@ -82,19 +85,36 @@ static __cold void __io_uring_show_fdinfo(struct io_ring_ctx *ctx,
|
|||
seq_printf(m, "CqHead:\t%u\n", cq_head);
|
||||
seq_printf(m, "CqTail:\t%u\n", cq_tail);
|
||||
seq_printf(m, "CachedCqTail:\t%u\n", ctx->cached_cq_tail);
|
||||
seq_printf(m, "SQEs:\t%u\n", sq_tail - ctx->cached_sq_head);
|
||||
seq_printf(m, "SQEs:\t%u\n", sq_tail - sq_head);
|
||||
sq_entries = min(sq_tail - sq_head, ctx->sq_entries);
|
||||
for (i = 0; i < sq_entries; i++) {
|
||||
unsigned int entry = i + sq_head;
|
||||
unsigned int sq_idx = READ_ONCE(ctx->sq_array[entry & sq_mask]);
|
||||
struct io_uring_sqe *sqe;
|
||||
unsigned int sq_idx;
|
||||
|
||||
sq_idx = READ_ONCE(ctx->sq_array[entry & sq_mask]);
|
||||
if (sq_idx > sq_mask)
|
||||
continue;
|
||||
sqe = &ctx->sq_sqes[sq_idx];
|
||||
seq_printf(m, "%5u: opcode:%d, fd:%d, flags:%x, user_data:%llu\n",
|
||||
sq_idx, sqe->opcode, sqe->fd, sqe->flags,
|
||||
sqe->user_data);
|
||||
sqe = &ctx->sq_sqes[sq_idx << 1];
|
||||
seq_printf(m, "%5u: opcode:%s, fd:%d, flags:%x, off:%llu, "
|
||||
"addr:0x%llx, rw_flags:0x%x, buf_index:%d "
|
||||
"user_data:%llu",
|
||||
sq_idx, io_uring_get_opcode(sqe->opcode), sqe->fd,
|
||||
sqe->flags, (unsigned long long) sqe->off,
|
||||
(unsigned long long) sqe->addr, sqe->rw_flags,
|
||||
sqe->buf_index, sqe->user_data);
|
||||
if (sq_shift) {
|
||||
u64 *sqeb = (void *) (sqe + 1);
|
||||
int size = sizeof(struct io_uring_sqe) / sizeof(u64);
|
||||
int j;
|
||||
|
||||
for (j = 0; j < size; j++) {
|
||||
seq_printf(m, ", e%d:0x%llx", j,
|
||||
(unsigned long long) *sqeb);
|
||||
sqeb++;
|
||||
}
|
||||
}
|
||||
seq_printf(m, "\n");
|
||||
}
|
||||
seq_printf(m, "CQEs:\t%u\n", cq_tail - cq_head);
|
||||
cq_entries = min(cq_tail - cq_head, ctx->cq_entries);
|
||||
|
|
Loading…
Reference in a new issue