Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Jens Axboe <axboe@kernel.dk>
To: stable@vger.kernel.org
Subject: [PATCH 6.1.y 0/4] io_uring fixes for 6.1-stable
Date: Sat, 21 Nov 2026 21:30:02 +0000	[thread overview]
Message-ID: <20261121213006.1787626-1-axboe@kernel.dk> (raw)

Hi Greg,

Here are io_uring fixes for 6.1-stable. All 4 patches are in Linus's
tree. Patches 2-4 came with the io_uring-7.4 pull, merged as commit
78d9aedf2342 (tag io_uring-7.4-20261119); the others were merged
earlier.

They apply on top of v6.1.192 plus queue-6.1 at stable-queue commit
3dd4b2d3c1f7, and also to v6.1.192 alone.

Patches 1-4 needed changes for 6.1; the [axboe: ...] note at the end of
each says what was changed and why. The rest are clean backports.

Patch 1/4 (io_uring: enable toggle of iowait usage when waiting on CQEs)
is a feature, not a fix. It is in stable because the QEMU developers
asked for it: QEMU uses IORING_ENTER_NO_IOWAIT and wants it supported on
all current stable kernels. Nothing changes unless the flag is set.

Testing: ran the liburing-2.15-75-ga10946dc test suite in KVM guests
(PROVE_LOCKING on) on the baseline v6.1.192 kernel and on the patched
kernel, which is v6.1.192 plus these patches and the other io_uring
commits already queued. The patched kernel failed the same tests as the
baseline, except connect-backlog, which failed only on the baseline (a
flaky test). The failures that remain are on both kernels (napi-test
timeout, send-zerocopy, timestamp and similar). No new dmesg splat
(WARNING, BUG, lockdep, KASAN, Oops). io_uring/ builds without warnings
on the release plus queue plus patches.

CVE assessment, by the io_uring maintainer:

Should not get a CVE:
  1/4 io_uring: enable toggle of iowait usage when waiting on CQEs
      Feature, not a fix. IORING_ENTER_NO_IOWAIT only skips setting
      in_iowait; nothing changes unless the flag is set.
  2/4 io_uring: fail soft links on negative IOU_COMPLETE results
      io_issue_sqe() now calls req_set_fail() for negative IOU_COMPLETE
      results, so IOSQE_IO_LINK dependents of a failed request are
      cancelled. This only changes link semantics of the caller's own
      requests.
  3/4 io_uring/rw: fail soft links on IOPOLL short or error IO
      The IOPOLL completion path now calls req_set_fail() when the
      result changed, so linked requests are cancelled after a short or
      failed read/write. Only the caller's own link chain is affected.
  4/4 io_uring/rsrc: keep the old file when a file update fails
      The old file was dropped from the registered slot before the new
      fd was checked, so a failed update left the slot empty and posted
      its tag CQE. Only the caller's own file table, no refcount or
      lifetime problem.

Cheng Yongkang (1):
  io_uring/rsrc: keep the old file when a file update fails

Jens Axboe (1):
  io_uring: enable toggle of iowait usage when waiting on CQEs

Yang Xiuwei (2):
  io_uring: fail soft links on negative IOU_COMPLETE results
  io_uring/rw: fail soft links on IOPOLL short or error IO

 include/uapi/linux/io_uring.h |  2 ++
 io_uring/io_uring.c           | 23 ++++++++++++++---------
 io_uring/rsrc.c               | 26 ++++++++++++++++----------
 io_uring/rw.c                 |  1 +
 4 files changed, 33 insertions(+), 19 deletions(-)

-- 
2.55.0


             reply	other threads:[~2026-11-21 21:30 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-21 21:30 Jens Axboe [this message]
2026-11-21 21:30 ` [PATCH 6.1.y 1/4] io_uring: enable toggle of iowait usage when waiting on CQEs Jens Axboe
2026-11-21 21:30 ` [PATCH 6.1.y 2/4] io_uring: fail soft links on negative IOU_COMPLETE results Jens Axboe
2026-11-21 21:30 ` [PATCH 6.1.y 3/4] io_uring/rw: fail soft links on IOPOLL short or error IO Jens Axboe
2026-11-21 21:30 ` [PATCH 6.1.y 4/4] io_uring/rsrc: keep the old file when a file update fails 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 \
    --in-reply-to=20261121213006.1787626-1-axboe@kernel.dk \
    --to=axboe@kernel.dk \
    --cc=stable@vger.kernel.org \
    /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