5.3-stable patches

added patches:
	io_uring-only-flush-workqueues-on-fileset-removal.patch

diff --git a/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch b/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch
new file mode 100644 (file)
index 0000000..724d704
--- /dev/null
+++ b/queue-5.3/io_uring-only-flush-workqueues-on-fileset-removal.patch
@@ -0,0 +1,34 @@
+From 8a99734081775c012a4a6c442fdef0379fe52bdf Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Wed, 9 Oct 2019 14:40:13 -0600
+Subject: io_uring: only flush workqueues on fileset removal
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit 8a99734081775c012a4a6c442fdef0379fe52bdf upstream.
+
+We should not remove the workqueue, we just need to ensure that the
+workqueues are synced. The workqueues are torn down on ctx removal.
+
+Cc: stable@vger.kernel.org
+Fixes: 6b06314c47e1 ("io_uring: add file set registration")
+Reported-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/io_uring.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/fs/io_uring.c
++++ b/fs/io_uring.c
+@@ -2566,7 +2566,8 @@ static void io_destruct_skb(struct sk_bu
+ {
+       struct io_ring_ctx *ctx = skb->sk->sk_user_data;
+ 
+-      io_finish_async(ctx);
++      if (ctx->sqo_wq)
++              flush_workqueue(ctx->sqo_wq);
+       unix_destruct_scm(skb);
+ }
+ 

diff --git a/queue-5.3/series b/queue-5.3/series
index 50c98ebfc519f4a048a71c81d54aceca7b32de7b..89f793fce83ed44d6541e84890ac2fd707a1fb8f 100644 (file)
--- a/queue-5.3/series
+++ b/queue-5.3/series
@@ -107,3 +107,4 @@ tracing-get-trace_array-reference-for-available_tracers-files.patch
 hwmon-fix-hwmon_p_min_alarm-mask.patch
 mtd-rawnand-au1550nd-fix-au_read_buf16-prototype.patch
 x86-asm-fix-mwaitx-c-state-hint-value.patch
+io_uring-only-flush-workqueues-on-fileset-removal.patch