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
Subject: [PATCH RT 06/22] PM / s2idle: Make s2idle_wait_head swait based
Date: Wed, 05 Sep 2018 08:28:00 -0400 [thread overview]
Message-ID: <20180905122835.224064505@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: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
[ Upstream commit 93f141324d4860a1294e6899923c01ec5411d70b ]
s2idle_wait_head is used during s2idle with interrupts disabled even on
RT. There is no "custom" wake up function so swait could be used instead
which is also lower weight compared to the wait_queue.
Make s2idle_wait_head a swait_queue_head.
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/power/suspend.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 999236413460..b89605fe0e88 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -27,6 +27,7 @@
#include <linux/export.h>
#include <linux/suspend.h>
#include <linux/syscore_ops.h>
+#include <linux/swait.h>
#include <linux/ftrace.h>
#include <trace/events/power.h>
#include <linux/compiler.h>
@@ -57,7 +58,7 @@ EXPORT_SYMBOL_GPL(pm_suspend_global_flags);
static const struct platform_suspend_ops *suspend_ops;
static const struct platform_s2idle_ops *s2idle_ops;
-static DECLARE_WAIT_QUEUE_HEAD(s2idle_wait_head);
+static DECLARE_SWAIT_QUEUE_HEAD(s2idle_wait_head);
enum s2idle_states __read_mostly s2idle_state;
static DEFINE_RAW_SPINLOCK(s2idle_lock);
@@ -91,8 +92,8 @@ static void s2idle_enter(void)
/* Push all the CPUs into the idle loop. */
wake_up_all_idle_cpus();
/* Make the current CPU wait so it can enter the idle loop too. */
- wait_event(s2idle_wait_head,
- s2idle_state == S2IDLE_STATE_WAKE);
+ swait_event(s2idle_wait_head,
+ s2idle_state == S2IDLE_STATE_WAKE);
cpuidle_pause();
put_online_cpus();
@@ -159,7 +160,7 @@ void s2idle_wake(void)
raw_spin_lock_irqsave(&s2idle_lock, flags);
if (s2idle_state > S2IDLE_STATE_NONE) {
s2idle_state = S2IDLE_STATE_WAKE;
- wake_up(&s2idle_wait_head);
+ swake_up(&s2idle_wait_head);
}
raw_spin_unlock_irqrestore(&s2idle_lock, flags);
}
--
2.18.0
next prev parent reply other threads:[~2018-09-05 12:31 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 ` [PATCH RT 03/22] squashfs: make use of local lock in multi_cpu decompressor Steven Rostedt
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 ` Steven Rostedt [this message]
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=20180905122835.224064505@goodmis.org \
--to=rostedt@goodmis.org \
--cc=C.Emde@osadl.org \
--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=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).