io_uring fix for 5.10 and 5.15 stable

io_uring fix for 5.10 and 5.15 stable

[Jens Axboe]

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

Hi,

Here's a fix that should go into 5.10-stable and 5.15-stable.
Greg, can you get this applied? Thanks!

-- 
Jens Axboe

[-- Attachment #2: 0001-io_uring-hold-uring-mutex-around-poll-removal.patch --]
[-- Type: text/x-patch, Size: 1499 bytes --]

From 3f1f052a5f8e2f9c568c4e0a34057b9049e948d9 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Fri, 16 Jun 2023 21:12:06 -0600
Subject: [PATCH] io_uring: hold uring mutex around poll removal

Snipped from commit 9ca9fb24d5febccea354089c41f96a8ad0d853f8 upstream.

While reworking the poll hashing in the v6.0 kernel, we ended up
grabbing the ctx->uring_lock in poll update/removal. This also fixed
a bug with linked timeouts racing with timeout expiry and poll
removal.

Bring back just the locking fix for that.

Reported-and-tested-by: Querijn Voet <querijnqyn@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
 io_uring/io_uring.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
index 2d6f275d180e..1d8adc57a44a 100644
--- a/io_uring/io_uring.c
+++ b/io_uring/io_uring.c
@@ -6111,6 +6111,8 @@ static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags)
 	struct io_kiocb *preq;
 	int ret2, ret = 0;
 
+	io_ring_submit_lock(ctx, !(issue_flags & IO_URING_F_NONBLOCK));
+
 	spin_lock(&ctx->completion_lock);
 	preq = io_poll_find(ctx, req->poll_update.old_user_data, true);
 	if (!preq || !io_poll_disarm(preq)) {
@@ -6142,6 +6144,7 @@ static int io_poll_update(struct io_kiocb *req, unsigned int issue_flags)
 		req_set_fail(req);
 	/* complete update request, we're done with it */
 	io_req_complete(req, ret);
+	io_ring_submit_unlock(ctx, !(issue_flags & IO_URING_F_NONBLOCK));
 	return 0;
 }
 
-- 
2.39.2

Re: io_uring fix for 5.10 and 5.15 stable

[Greg Kroah-Hartman]

On Fri, Jun 16, 2023 at 09:15:25PM -0600, Jens Axboe wrote:
> Hi,
> 
> Here's a fix that should go into 5.10-stable and 5.15-stable.
> Greg, can you get this applied? Thanks!

Now queued up, thanks.

greg k-h