Commit 731e5e1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2bfcee56 f024d3a8

io_uring/fdinfo.c

+2 −2
Original line number Diff line number Diff line
@@ -123,11 +123,11 @@ __cold void io_uring_show_fdinfo(struct seq_file *m, struct file *file) 
	seq_printf(m, "SqMask:\t0x%x\n", sq_mask);

	seq_printf(m, "SqHead:\t%u\n", sq_head);

	seq_printf(m, "SqTail:\t%u\n", sq_tail);

	seq_printf(m, "CachedSqHead:\t%u\n", ctx->cached_sq_head);

	seq_printf(m, "CachedSqHead:\t%u\n", data_race(ctx->cached_sq_head));

	seq_printf(m, "CqMask:\t0x%x\n", cq_mask);

	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, "CachedCqTail:\t%u\n", data_race(ctx->cached_cq_tail));

	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++) {