Skip to content

Commit 731e5e1

Browse files
committed
Merge tag 'io_uring-6.15-20250502' of git://git.kernel.dk/linux
Pull io_uring fix from Jens Axboe: "Just a single fix, annotating the fdinfo side SQ/CQ head/tail reads with data_race() as they are known racy. Only serves to silence syzbot testing, by definition these debug outputs are going to be racy as they may change as soon as we've read them" * tag 'io_uring-6.15-20250502' of git://git.kernel.dk/linux: io_uring/fdinfo: annotate racy sq/cq head/tail reads
2 parents 2bfcee5 + f024d3a commit 731e5e1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

io_uring/fdinfo.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file)
123123
seq_printf(m, "SqMask:\t0x%x\n", sq_mask);
124124
seq_printf(m, "SqHead:\t%u\n", sq_head);
125125
seq_printf(m, "SqTail:\t%u\n", sq_tail);
126-
seq_printf(m, "CachedSqHead:\t%u\n", ctx->cached_sq_head);
126+
seq_printf(m, "CachedSqHead:\t%u\n", data_race(ctx->cached_sq_head));
127127
seq_printf(m, "CqMask:\t0x%x\n", cq_mask);
128128
seq_printf(m, "CqHead:\t%u\n", cq_head);
129129
seq_printf(m, "CqTail:\t%u\n", cq_tail);
130-
seq_printf(m, "CachedCqTail:\t%u\n", ctx->cached_cq_tail);
130+
seq_printf(m, "CachedCqTail:\t%u\n", data_race(ctx->cached_cq_tail));
131131
seq_printf(m, "SQEs:\t%u\n", sq_tail - sq_head);
132132
sq_entries = min(sq_tail - sq_head, ctx->sq_entries);
133133
for (i = 0; i < sq_entries; i++) {

0 commit comments

Comments
 (0)