refresh queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64...

diff --git a/queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on.patch b/queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch
similarity index 78%
rename from queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on.patch
rename to queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch
index 0dafcbb138393468d26b23a934b6b82fc808ee38..5323cdf54ed65494ba81c0cfee3935c6acb65bfe 100644 (file)
--- a/queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on.patch
+++ b/queue-6.8/io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch
@@ -1,12 +1,11 @@
-From 80eb4b220963a07c2d5f7a5f96a722e906c933e2 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
+From bc6210111b4314ab32aa81c51e97d6b85d35340a Mon Sep 17 00:00:00 2001
+From: Alexey Izbyshev <izbyshev@ispras.ru>
 Date: Fri, 5 Apr 2024 15:55:51 +0300
-Subject: io_uring: Fix io_cqring_wait() not restoring sigmask on
- get_timespec64() failure
+Subject: io_uring: Fix io_cqring_wait() not restoring sigmask on get_timespec64() failure
 
 From: Alexey Izbyshev <izbyshev@ispras.ru>
 
-[ Upstream commit 978e5c19dfefc271e5550efba92fcef0d3f62864 ]
+Commit 978e5c19dfefc271e5550efba92fcef0d3f62864 upstream.
 
 This bug was introduced in commit 950e79dd7313 ("io_uring: minor
 io_cqring_wait() optimization"), which was made in preparation for
@@ -20,15 +19,14 @@ Signed-off-by: Alexey Izbyshev <izbyshev@ispras.ru>
 Link: https://lore.kernel.org/r/20240405125551.237142-1-izbyshev@ispras.ru
 Signed-off-by: Jens Axboe <axboe@kernel.dk>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- io_uring/io_uring.c | 26 +++++++++++++-------------
+ io_uring/io_uring.c |   26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
-diff --git a/io_uring/io_uring.c b/io_uring/io_uring.c
-index 3fc792dfc6ae7..dc0235ff472d3 100644
 --- a/io_uring/io_uring.c
 +++ b/io_uring/io_uring.c
-@@ -2610,19 +2610,6 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
+@@ -2610,19 +2610,6 @@ static int io_cqring_wait(struct io_ring
        if (__io_cqring_events_user(ctx) >= min_events)
                return 0;
  
@@ -48,7 +46,7 @@ index 3fc792dfc6ae7..dc0235ff472d3 100644
        init_waitqueue_func_entry(&iowq.wq, io_wake_function);
        iowq.wq.private = current;
        INIT_LIST_HEAD(&iowq.wq.entry);
-@@ -2639,6 +2626,19 @@ static int io_cqring_wait(struct io_ring_ctx *ctx, int min_events,
+@@ -2639,6 +2626,19 @@ static int io_cqring_wait(struct io_ring
                iowq.timeout = ktime_add_ns(timespec64_to_ktime(ts), ktime_get_ns());
        }
  
@@ -68,6 +66,3 @@ index 3fc792dfc6ae7..dc0235ff472d3 100644
        trace_io_uring_cqring_wait(ctx, min_events);
        do {
                int nr_wait = (int) iowq.cq_tail - READ_ONCE(ctx->rings->cq.tail);
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index c76a125ec81a218fd007e55ed8c0158fbb26d1c2..fe38f11e8f2b53e8b05e605e1a6894e9c183d216 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -1,2 +1,2 @@
-io_uring-fix-io_cqring_wait-not-restoring-sigmask-on.patch
+io_uring-fix-io_cqring_wait-not-restoring-sigmask-on-get_timespec64-failure.patch
 drm-i915-cdclk-fix-voltage_level-programming-edge-ca.patch