From: Greg Kroah-Hartman Date: Sun, 16 Jul 2023 19:34:44 +0000 (+0200) Subject: fix up 6.4 io_uring stuff X-Git-Tag: v6.1.39~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=29fd6508e4be6e4eb75ee7c652ac62c559f11a21;p=thirdparty%2Fkernel%2Fstable-queue.git fix up 6.4 io_uring stuff --- diff --git a/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch b/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch index 86c09d1e66f..b426c9c718d 100644 --- a/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch +++ b/queue-6.4/io_uring-wait-interruptibly-for-request-completions-on-exit.patch @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c -@@ -3061,7 +3061,18 @@ static __cold void io_ring_exit_work(str +@@ -3050,7 +3050,18 @@ static __cold void io_ring_exit_work(str /* there is little hope left, don't run it too often */ interval = HZ * 60; } @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman init_completion(&exit.completion); init_task_work(&exit.task_work, io_tctx_exit_cb); -@@ -3085,7 +3096,12 @@ static __cold void io_ring_exit_work(str +@@ -3074,7 +3085,12 @@ static __cold void io_ring_exit_work(str continue; mutex_unlock(&ctx->uring_lock); diff --git a/queue-6.4/series b/queue-6.4/series index 5f99f82d99f..4210f2bdd17 100644 --- a/queue-6.4/series +++ b/queue-6.4/series @@ -797,3 +797,4 @@ netfilter-nf_tables-prevent-oob-access-in-nft_byteorder_eval.patch wireguard-queueing-use-saner-cpu-selection-wrapping.patch wireguard-netlink-send-staged-packets-when-setting-initial-private-key.patch tty-serial-fsl_lpuart-add-earlycon-for-imx8ulp-platform.patch +io_uring-use-io_schedule-in-cqring-wait.patch