summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2020-09-17 22:36:21 +0100
committerBen Hutchings <benh@debian.org>2020-09-18 01:19:09 +0100
commitf748212fb137252dc332105d8d45747161a35aff (patch)
treeec9daf574d6a695df20928f943491531f0349428 /debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch
parent971ce324f6d97ee5508a1fe6b171f2664e3e8dc7 (diff)
downloadlinux-debian-f748212fb137252dc332105d8d45747161a35aff.tar.gz
[rt] Update to 5.9-rc5-rt7 and re-enable
Diffstat (limited to 'debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch')
-rw-r--r--debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch66
1 files changed, 0 insertions, 66 deletions
diff --git a/debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch b/debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch
deleted file mode 100644
index b0ad92aea..000000000
--- a/debian/patches-rt/squashfs-make-use-of-local-lock-in-multi_cpu-decompr.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From: Julia Cartwright <julia@ni.com>
-Date: Mon, 7 May 2018 08:58:57 -0500
-Subject: [PATCH] squashfs: make use of local lock in multi_cpu
- decompressor
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.6/older/patches-5.6.10-rt5.tar.xz
-
-Currently, the squashfs multi_cpu decompressor makes use of
-get_cpu_ptr()/put_cpu_ptr(), which unconditionally disable preemption
-during decompression.
-
-Because the workload is distributed across CPUs, all CPUs can observe a
-very high wakeup latency, which has been seen to be as much as 8000us.
-
-Convert this decompressor to make use of a local lock, which will allow
-execution of the decompressor with preemption-enabled, but also ensure
-concurrent accesses to the percpu compressor data on the local CPU will
-be serialized.
-
-Cc: stable-rt@vger.kernel.org
-Reported-by: Alexander Stein <alexander.stein@systec-electronic.com>
-Tested-by: Alexander Stein <alexander.stein@systec-electronic.com>
-Signed-off-by: Julia Cartwright <julia@ni.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
----
- fs/squashfs/decompressor_multi_percpu.c | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
---- a/fs/squashfs/decompressor_multi_percpu.c
-+++ b/fs/squashfs/decompressor_multi_percpu.c
-@@ -8,6 +8,7 @@
- #include <linux/slab.h>
- #include <linux/percpu.h>
- #include <linux/buffer_head.h>
-+#include <linux/locallock.h>
-
- #include "squashfs_fs.h"
- #include "squashfs_fs_sb.h"
-@@ -23,6 +24,8 @@ struct squashfs_stream {
- void *stream;
- };
-
-+static DEFINE_LOCAL_IRQ_LOCK(stream_lock);
-+
- void *squashfs_decompressor_create(struct squashfs_sb_info *msblk,
- void *comp_opts)
- {
-@@ -77,10 +80,15 @@ int squashfs_decompress(struct squashfs_
- {
- struct squashfs_stream __percpu *percpu =
- (struct squashfs_stream __percpu *) msblk->stream;
-- struct squashfs_stream *stream = get_cpu_ptr(percpu);
-- int res = msblk->decompressor->decompress(msblk, stream->stream, bh, b,
-- offset, length, output);
-- put_cpu_ptr(stream);
-+ struct squashfs_stream *stream;
-+ int res;
-+
-+ stream = get_locked_ptr(stream_lock, percpu);
-+
-+ res = msblk->decompressor->decompress(msblk, stream->stream, bh, b,
-+ offset, length, output);
-+
-+ put_locked_ptr(stream_lock, stream);
-
- if (res < 0)
- ERROR("%s decompression failed, data probably corrupt\n",