From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org,
linux-rt-users <linux-rt-users@vger.kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Carsten Emde <C.Emde@osadl.org>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
John Kacur <jkacur@redhat.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Julia Cartwright <julia@ni.com>,
Daniel Wagner <daniel.wagner@siemens.com>,
tom.zanussi@linux.intel.com, stable-rt@vger.kernel.org,
Alexander Stein <alexander.stein@systec-electronic.com>
Subject: [PATCH RT 03/22] squashfs: make use of local lock in multi_cpu decompressor
Date: Wed, 05 Sep 2018 08:27:57 -0400 [thread overview]
Message-ID: <20180905122834.792329062@goodmis.org> (raw)
In-Reply-To: 20180905122754.443196118@goodmis.org
4.14.63-rt41-rc1 stable review patch.
If anyone has any objections, please let me know.
------------------
From: Julia Cartwright <julia@ni.com>
[ Upstream commit c160736542d7b3d67da32848d2f028b8e35730e5 ]
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>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
fs/squashfs/decompressor_multi_percpu.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/fs/squashfs/decompressor_multi_percpu.c b/fs/squashfs/decompressor_multi_percpu.c
index 23a9c28ad8ea..6a73c4fa88e7 100644
--- a/fs/squashfs/decompressor_multi_percpu.c
+++ b/fs/squashfs/decompressor_multi_percpu.c
@@ -10,6 +10,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"
@@ -25,6 +26,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)
{
@@ -79,10 +82,15 @@ int squashfs_decompress(struct squashfs_sb_info *msblk, struct buffer_head **bh,
{
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",
--
2.18.0
next prev parent reply other threads:[~2018-09-05 12:30 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 12:27 [PATCH RT 00/22] Linux 4.14.63-rt41-rc1 Steven Rostedt
2018-09-05 12:27 ` [PATCH RT 01/22] sched/fair: Fix CFS bandwidth control lockdep DEADLOCK report Steven Rostedt
2018-09-05 12:27 ` [PATCH RT 02/22] locallock: provide {get,put}_locked_ptr() variants Steven Rostedt
2018-09-05 12:27 ` Steven Rostedt [this message]
2018-09-05 12:27 ` [PATCH RT 04/22] PM / suspend: Prevent might sleep splats (updated) Steven Rostedt
2018-09-05 12:27 ` [PATCH RT 05/22] PM / wakeup: Make events_lock a RAW_SPINLOCK Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 06/22] PM / s2idle: Make s2idle_wait_head swait based Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 07/22] seqlock: provide the same ordering semantics as mainline Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 08/22] Revert "x86: UV: raw_spinlock conversion" Steven Rostedt
2018-09-06 7:35 ` Sebastian Andrzej Siewior
2018-09-06 8:38 ` Mike Galbraith
2018-09-06 12:58 ` Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 09/22] Revert "timer: delay waking softirqs from the jiffy tick" Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 10/22] irqchip/gic-v3-its: Make its_lock a raw_spin_lock_t Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 11/22] irqchip/gic-v3-its: Move ITS ->pend_page allocation into an early CPU up hook Steven Rostedt
2018-09-06 7:40 ` Sebastian Andrzej Siewior
2018-09-07 19:28 ` Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 12/22] sched/migrate_disable: fallback to preempt_disable() instead barrier() Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 13/22] x86/ioapic: Dont let setaffinity unmask threaded EOI interrupt too early Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 14/22] efi: Allow efi=runtime Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 15/22] efi: Disable runtime services on RT Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 16/22] crypto: cryptd - add a lock instead preempt_disable/local_bh_disable Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 17/22] crypto: scompress - serialize RT percpu scratch buffer access with a local lock Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 18/22] sched/core: Avoid __schedule() being called twice in a row Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 19/22] Revert "arm64/xen: Make XEN depend on !RT" Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 20/22] sched: Allow pinned user tasks to be awakened to the CPU they pinned Steven Rostedt
2018-09-05 12:28 ` [PATCH RT 22/22] Linux 4.14.63-rt41-rc1 Steven Rostedt
[not found] ` <20180905122837.830614967@goodmis.org>
2018-09-05 12:34 ` [PATCH RT 21/22] Drivers: hv: vmbus: include header for get_irq_regs() Steven Rostedt
2018-09-06 7:54 ` [PATCH RT 00/22] Linux 4.14.63-rt41-rc1 Sebastian Andrzej Siewior
2018-09-06 16:43 ` Steven Rostedt
2018-09-06 19:30 ` Sebastian Andrzej Siewior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180905122834.792329062@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--cc=alexander.stein@systec-electronic.com \
--cc=bigeasy@linutronix.de \
--cc=daniel.wagner@siemens.com \
--cc=jkacur@redhat.com \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=stable-rt@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).