linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
@ 2016-03-14  3:53 Clark Williams
  2016-03-14  8:49 ` Thomas Gleixner
  0 siblings, 1 reply; 7+ messages in thread
From: Clark Williams @ 2016-03-14  3:53 UTC (permalink / raw)
  To: Daniel Wagner, Sebastian Andrzej Siewior; +Cc: RT, LKML

[-- Attachment #1: Type: text/plain, Size: 1262 bytes --]

I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:

Call Trace:
 [<ffffffff813c13c0>] dump_stack+0x65/0x85
 [<ffffffff810a7572>] warn_slowpath_common+0x82/0xd0
 [<ffffffff810a76ca>] warn_slowpath_null+0x1a/0x20
 [<ffffffff810ec8d8>] swake_up_all_locked+0x68/0x80
 [<ffffffff810ecd40>] complete_all+0x30/0x50
 [<ffffffff81506328>] device_resume_noirq+0x48/0x190
 [<ffffffff8150648d>] async_resume_noirq+0x1d/0x50
 [<ffffffff810ca188>] async_run_entry_fn+0x48/0x130
 [<ffffffff810c14a9>] process_one_work+0x139/0x480
 [<ffffffff810c1847>] worker_thread+0x57/0x490
 [<ffffffff810c17f0>] ? process_one_work+0x480/0x480
 [<ffffffff810c779d>] kthread+0xed/0x110
 [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
ehci-pci 0000:00:1a.0: System wakeup disabled by ACPI
 [<ffffffff817b0d0f>] ret_from_fork+0x3f/0x70
 [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
---[ end trace 0000000000000002 ]---



This trace (and a similar one with device_resume) happens on all cpus so the trace info is kinda jumbled up. I'll try it with WARN_ON_ONCE instead tomorrow. 

I'll send the console log if you want it. 

Clark

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-03-14  3:53 [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11 Clark Williams
@ 2016-03-14  8:49 ` Thomas Gleixner
  2016-03-30 10:22   ` Sebastian Andrzej Siewior
  2016-04-01 10:33   ` Sebastian Andrzej Siewior
  0 siblings, 2 replies; 7+ messages in thread
From: Thomas Gleixner @ 2016-03-14  8:49 UTC (permalink / raw)
  To: Clark Williams; +Cc: Daniel Wagner, Sebastian Andrzej Siewior, RT, LKML

On Sun, 13 Mar 2016, Clark Williams wrote:

> I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:
> 
> Call Trace:
>  [<ffffffff813c13c0>] dump_stack+0x65/0x85
>  [<ffffffff810a7572>] warn_slowpath_common+0x82/0xd0
>  [<ffffffff810a76ca>] warn_slowpath_null+0x1a/0x20
>  [<ffffffff810ec8d8>] swake_up_all_locked+0x68/0x80
>  [<ffffffff810ecd40>] complete_all+0x30/0x50
>  [<ffffffff81506328>] device_resume_noirq+0x48/0x190
>  [<ffffffff8150648d>] async_resume_noirq+0x1d/0x50
>  [<ffffffff810ca188>] async_run_entry_fn+0x48/0x130
>  [<ffffffff810c14a9>] process_one_work+0x139/0x480
>  [<ffffffff810c1847>] worker_thread+0x57/0x490
>  [<ffffffff810c17f0>] ? process_one_work+0x480/0x480
>  [<ffffffff810c779d>] kthread+0xed/0x110
>  [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
> ehci-pci 0000:00:1a.0: System wakeup disabled by ACPI
>  [<ffffffff817b0d0f>] ret_from_fork+0x3f/0x70
>  [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
> ---[ end trace 0000000000000002 ]---
> 
> This trace (and a similar one with device_resume) happens on all cpus so the
> trace info is kinda jumbled up. I'll try it with WARN_ON_ONCE instead
> tomorrow.

If resume is the only case, then we can filter that out and not worry about it
at all :)

Thanks,

	tglx

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-03-14  8:49 ` Thomas Gleixner
@ 2016-03-30 10:22   ` Sebastian Andrzej Siewior
  2016-03-30 13:52     ` Clark Williams
  2016-04-01 10:33   ` Sebastian Andrzej Siewior
  1 sibling, 1 reply; 7+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-03-30 10:22 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: Clark Williams, Daniel Wagner, RT, LKML

* Thomas Gleixner | 2016-03-14 09:49:52 [+0100]:

>On Sun, 13 Mar 2016, Clark Williams wrote:
>
>> I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:
>> This trace (and a similar one with device_resume) happens on all cpus so the
>> trace info is kinda jumbled up. I'll try it with WARN_ON_ONCE instead
>> tomorrow.
>
>If resume is the only case, then we can filter that out and not worry about it
>at all :)

I see here 3 to 7 loops on each warning in the resume case and I see
approx 7 warnings. It wakes always a kworker/u*/* task.
system_state is always set to SYSTEM_RUNNING so I am not sure what can
be used for filtering.
Any suggestions?

>Thanks,
>
>	tglx

Sebastian

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-03-30 10:22   ` Sebastian Andrzej Siewior
@ 2016-03-30 13:52     ` Clark Williams
  2016-03-30 14:24       ` Sebastian Andrzej Siewior
  0 siblings, 1 reply; 7+ messages in thread
From: Clark Williams @ 2016-03-30 13:52 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior; +Cc: Thomas Gleixner, Daniel Wagner, RT, LKML

[-- Attachment #1: Type: text/plain, Size: 7598 bytes --]

On Wed, 30 Mar 2016 12:22:51 +0200
Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:

> * Thomas Gleixner | 2016-03-14 09:49:52 [+0100]:
> 
> >On Sun, 13 Mar 2016, Clark Williams wrote:
> >  
> >> I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:
> >> This trace (and a similar one with device_resume) happens on all cpus so the
> >> trace info is kinda jumbled up. I'll try it with WARN_ON_ONCE instead
> >> tomorrow.  
> >
> >If resume is the only case, then we can filter that out and not worry about it
> >at all :)  
> 
> I see here 3 to 7 loops on each warning in the resume case and I see
> approx 7 warnings. It wakes always a kworker/u*/* task.
> system_state is always set to SYSTEM_RUNNING so I am not sure what can
> be used for filtering.
> Any suggestions?
> 
> >Thanks,
> >
> >	tglx  
> 
> Sebastian

I added this debugging patch (mainly to get a better idea of who was waking and how much they were waking):

diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
index 8459561f0379..dff527305369 100644
--- a/kernel/sched/swait.c
+++ b/kernel/sched/swait.c
@@ -42,7 +42,11 @@ void swake_up_all_locked(struct swait_queue_head *q)
                list_del_init(&curr->task_list);
                wakes++;
        }
-       WARN_ON(wakes > 2);
+       if (wakes > 2) {
+               printk("swake_up_all_locked: %d wakes done on cpu %d: %s (pid: %d)\n",
+                      wakes, raw_smp_processor_id(), current->comm, current->pid);
+               WARN_ON_ONCE(wakes > 2);
+       }
 }
 EXPORT_SYMBOL(swake_up_all_locked);


I'm seeing output like this with between 3 and 9 wakeups per kworker:

swake_up_all_locked: 3 wakes done on cpu 6: kworker/u16:37 (pid: 15725)
------------[ cut here ]------------
WARNING: CPU: 6 PID: 15725 at /home/williams/src/linux-rt/kernel/rt-linux.git/kernel/sched/swait.c:48 swake_up_all_locked+0xa5/0xb0()
swake_up_all_locked: more than two wakeups on queue
Modules linked in: tun hid_logitech_hidpp hid_logitech_dj ccm rfcomm bnep btusb btrtl btbcm btintel bluetooth fuse rpcsec_gss_krb5 nfsv4 dns_resolver nfs fscache nf_con
 videobuf2_v4l2 videobuf2_core videobuf2_memops kvm snd_seq_device thinkpad_acpi snd_pcm v4l2_common iTCO_wdt videodev snd_timer cfg80211 iTCO_vendor_support snd mei_me
CPU: 6 PID: 15725 Comm: kworker/u16:37 Not tainted 4.4.6-rt12+ #20
Hardware name: LENOVO 24293E8/24293E8, BIOS G4ET94WW (2.54 ) 05/23/2013
Workqueue: events_unbound async_run_entry_fn
 0000000000000086 000000006760687a ffff8802be2cbc90 ffffffff813c1720
 ffff8802be2cbcd8 0000000000000009 ffff8802be2cbcc8 ffffffff810a7572
 ffff880400b531c0 0000000000000003 ffff880400b531a8 ffff880400b531c0
Call Trace:
 [<ffffffff813c1720>] dump_stack+0x65/0x85
 [<ffffffff810a7572>] warn_slowpath_common+0x82/0xd0
 [<ffffffff810a761c>] warn_slowpath_fmt+0x5c/0x80
 [<ffffffff810ec765>] swake_up_all_locked+0xa5/0xb0
 [<ffffffff810ecd70>] complete_all+0x30/0x50
 [<ffffffff815066e8>] device_resume_noirq+0x48/0x190
 [<ffffffff8150684d>] async_resume_noirq+0x1d/0x50
 [<ffffffff810ca188>] async_run_entry_fn+0x48/0x130
 [<ffffffff810c14a9>] process_one_work+0x139/0x480
 [<ffffffff810c1847>] worker_thread+0x57/0x490
 [<ffffffff810c17f0>] ? process_one_work+0x480/0x480
 [<ffffffff810c779d>] kthread+0xed/0x110
 [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
 [<ffffffff817b118f>] ret_from_fork+0x3f/0x70
 [<ffffffff810c76b0>] ? kthread_worker_fn+0x150/0x150
---[ end trace 0000000000000002 ]---
swake_up_all_locked: 3 wakes done on cpu 7: kworker/u16:73 (pid: 15772)
swake_up_all_locked: 6 wakes done on cpu 3: kworker/u16:13 (pid: 15671)
swake_up_all_locked: 4 wakes done on cpu 6: kworker/u16:38 (pid: 15727)
swake_up_all_locked: 9 wakes done on cpu 7: kworker/u16:74 (pid: 15773)
ehci-pci 0000:00:1a.0: System wakeup disabled by ACPI
xhci_hcd 0000:00:14.0: System wakeup disabled by ACPI
swake_up_all_locked: 3 wakes done on cpu 0: kworker/u16:30 (pid: 15712)
swake_up_all_locked: 3 wakes done on cpu 2: kworker/u16:0 (pid: 13668)
swake_up_all_locked: 4 wakes done on cpu 6: kworker/u16:31 (pid: 15715)
swake_up_all_locked: 5 wakes done on cpu 4: kworker/u16:63 (pid: 15762)
swake_up_all_locked: 4 wakes done on cpu 5: kworker/u16:112 (pid: 15811)
swake_up_all_locked: 5 wakes done on cpu 0: kworker/u16:45 (pid: 15734)
sdhci-pci 0000:02:00.0: MMC controller base frequency changed to 50Mhz.
swake_up_all_locked: 7 wakes done on cpu 4: kworker/u16:64 (pid: 15763)
swake_up_all_locked: 5 wakes done on cpu 0: kworker/u16:53 (pid: 15747)
swake_up_all_locked: 3 wakes done on cpu 4: kworker/u16:88 (pid: 15787)
swake_up_all_locked: 5 wakes done on cpu 4: kworker/u16:99 (pid: 15798)
swake_up_all_locked: 4 wakes done on cpu 4: kworker/u16:100 (pid: 15799)
PM: noirq resume of devices complete after 12.801 msecs
PM: early resume of devices complete after 1.340 msecs
e1000e 0000:00:19.0: System wakeup disabled by ACPI
swake_up_all_locked: 5 wakes done on cpu 3: kworker/u16:101 (pid: 15800)
swake_up_all_locked: 5 wakes done on cpu 1: kworker/u16:90 (pid: 15789)
sd 0:0:0:0: [sda] Starting disk
rtc_cmos 00:02: System wakeup disabled by ACPI
tpm_tis 00:05: TPM is disabled/deactivated (0x6)
swake_up_all_locked: 3 wakes done on cpu 7: kworker/u16:92 (pid: 15791)
swake_up_all_locked: 3 wakes done on cpu 1: kworker/u16:119 (pid: 15821)
swake_up_all_locked: 4 wakes done on cpu 6: kworker/u16:68 (pid: 15767)
swake_up_all_locked: 4 wakes done on cpu 0: kworker/u16:91 (pid: 15790)
swake_up_all_locked: 3 wakes done on cpu 2: kworker/u16:52 (pid: 15746)
swake_up_all_locked: 5 wakes done on cpu 1: kworker/u16:35 (pid: 15722)
swake_up_all_locked: 9 wakes done on cpu 0: kworker/u16:64 (pid: 15763)
swake_up_all_locked: 7 wakes done on cpu 1: kworker/u16:118 (pid: 15819)
swake_up_all_locked: 4 wakes done on cpu 6: kworker/u16:6 (pid: 30341)
usb 1-1.6: reset high-speed USB device number 3 using ehci-pci
ata1: SATA link up 6.0 Gbps (SStatus 133 SControl 300)
ata2: SATA link up 1.5 Gbps (SStatus 113 SControl 300)
ata1.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
ata1.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
ata1.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
ata1.00: ACPI cmd ef/02:00:00:00:00:a0 (SET FEATURES) succeeded
ata1.00: ACPI cmd f5/00:00:00:00:00:a0 (SECURITY FREEZE LOCK) filtered out
ata1.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
ata5: SATA link down (SStatus 0 SControl 300)
ata2.00: ACPI cmd e3/00:1f:00:00:00:a0 (IDLE) succeeded
ata1.00: configured for UDMA/133
ata2.00: ACPI cmd e3/00:02:00:00:00:a0 (IDLE) succeeded
ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
ata2.00: ACPI cmd e3/00:1f:00:00:00:a0 (IDLE) succeeded
ata2.00: ACPI cmd e3/00:02:00:00:00:a0 (IDLE) succeeded
ata2.00: ACPI cmd ef/10:03:00:00:00:a0 (SET FEATURES) filtered out
ata2.00: configured for UDMA/133
usb 2-1.5: reset low-speed USB device number 3 using ehci-pci
firewire_core 0000:02:00.3: rediscovered device fw0
swake_up_all_locked: 3 wakes done on cpu 6: kworker/u16:69 (pid: 15768)
usb 1-1.4: reset full-speed USB device number 4 using ehci-pci
swake_up_all_locked: 5 wakes done on cpu 3: kworker/u16:34 (pid: 15721)
swake_up_all_locked: 4 wakes done on cpu 1: kworker/u16:45 (pid: 15734)
PM: resume of devices complete after 953.926 msecs
PM: Finishing wakeup.
Restarting tasks ... 


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-03-30 13:52     ` Clark Williams
@ 2016-03-30 14:24       ` Sebastian Andrzej Siewior
  0 siblings, 0 replies; 7+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-03-30 14:24 UTC (permalink / raw)
  To: Clark Williams; +Cc: Thomas Gleixner, Daniel Wagner, RT, LKML

On 03/30/2016 03:52 PM, Clark Williams wrote:
> On Wed, 30 Mar 2016 12:22:51 +0200
> I'm seeing output like this with between 3 and 9 wakeups per kworker:
same here. And with

--- a/kernel/sched/swait.c
+++ b/kernel/sched/swait.c
@@ -32,17 +32,24 @@ EXPORT_SYMBOL(swake_up_locked);
 void swake_up_all_locked(struct swait_queue_head *q)
 {
        struct swait_queue *curr;
+       char comms[512];
        int wakes = 0;

+       comms[0] = '\0';
        while (!list_empty(&q->task_list)) {

                curr = list_first_entry(&q->task_list, typeof(*curr),
                                        task_list);
+               strcat(comms, curr->task->comm);
+               strcat(comms, " ");
                wake_up_process(curr->task);
                list_del_init(&curr->task_list);
                wakes++;
        }
-       WARN_ON(wakes > 2);
+       if (wakes > 2) {
+               pr_err("%s(%d) %d\n", __func__, __LINE__, wakes);
+               pr_err("%s(%d) %s\n", __func__, __LINE__, comms);
+       }
 }
 EXPORT_SYMBOL(swake_up_all_locked);

you would see that it wakes other kworker :)

Sebastian

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-03-14  8:49 ` Thomas Gleixner
  2016-03-30 10:22   ` Sebastian Andrzej Siewior
@ 2016-04-01 10:33   ` Sebastian Andrzej Siewior
  2016-04-03  3:44     ` Clark Williams
  1 sibling, 1 reply; 7+ messages in thread
From: Sebastian Andrzej Siewior @ 2016-04-01 10:33 UTC (permalink / raw)
  To: Thomas Gleixner; +Cc: Clark Williams, Daniel Wagner, RT, LKML

* Thomas Gleixner | 2016-03-14 09:49:52 [+0100]:

>On Sun, 13 Mar 2016, Clark Williams wrote:
>
>> I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:
>If resume is the only case, then we can filter that out and not worry about it
>at all :)

This works with the "mem" and "disk" target:

--- a/include/linux/suspend.h
+++ b/include/linux/suspend.h
@@ -194,6 +194,12 @@ struct platform_freeze_ops {
 	void (*end)(void);
 };
 
+#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATION)
+extern bool pm_in_action;
+#else
+# define pm_in_action false
+#endif
+
 #ifdef CONFIG_SUSPEND
 /**
  * suspend_set_ops - set platform dependent suspend operations
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
index bfd9e0982f15..fbb23f93e8d6 100644
--- a/kernel/power/hibernate.c
+++ b/kernel/power/hibernate.c
@@ -648,6 +648,10 @@ static void power_down(void)
 		cpu_relax();
 }
 
+#ifndef CONFIG_SUSPEND
+bool pm_in_action;
+#endif
+
 /**
  * hibernate - Carry out system hibernation, including saving the image.
  */
@@ -660,6 +664,8 @@ int hibernate(void)
 		return -EPERM;
 	}
 
+	pm_in_action = true;
+
 	lock_system_sleep();
 	/* The snapshot device should not be opened while we're running */
 	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
@@ -725,6 +731,7 @@ int hibernate(void)
 	atomic_inc(&snapshot_device_available);
  Unlock:
 	unlock_system_sleep();
+	pm_in_action = false;
 	return error;
 }
 
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 80ebc0726290..393bc342c586 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -522,6 +522,8 @@ static int enter_state(suspend_state_t state)
 	return error;
 }
 
+bool pm_in_action;
+
 /**
  * pm_suspend - Externally visible function for suspending the system.
  * @state: System sleep state to enter.
@@ -536,6 +538,8 @@ int pm_suspend(suspend_state_t state)
 	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
 		return -EINVAL;
 
+	pm_in_action = true;
+
 	error = enter_state(state);
 	if (error) {
 		suspend_stats.fail++;
@@ -543,6 +547,7 @@ int pm_suspend(suspend_state_t state)
 	} else {
 		suspend_stats.success++;
 	}
+	pm_in_action = false;
 	return error;
 }
 EXPORT_SYMBOL(pm_suspend);
diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
index 8459561f0379..205fe36868f9 100644
--- a/kernel/sched/swait.c
+++ b/kernel/sched/swait.c
@@ -1,5 +1,6 @@
 #include <linux/sched.h>
 #include <linux/swait.h>
+#include <linux/suspend.h>
 
 void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
 			     struct lock_class_key *key)
@@ -42,7 +43,9 @@ void swake_up_all_locked(struct swait_queue_head *q)
 		list_del_init(&curr->task_list);
 		wakes++;
 	}
-	WARN_ON(wakes > 2);
+	if (pm_in_action)
+		return;
+	WARN(wakes > 2, "complate_all() with %d waiters\n", wakes);
 }
 EXPORT_SYMBOL(swake_up_all_locked);
 
Sebastian

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11
  2016-04-01 10:33   ` Sebastian Andrzej Siewior
@ 2016-04-03  3:44     ` Clark Williams
  0 siblings, 0 replies; 7+ messages in thread
From: Clark Williams @ 2016-04-03  3:44 UTC (permalink / raw)
  To: Sebastian Andrzej Siewior; +Cc: Thomas Gleixner, Daniel Wagner, RT, LKML

[-- Attachment #1: Type: text/plain, Size: 3580 bytes --]

On Fri, 1 Apr 2016 12:33:18 +0200
Sebastian Andrzej Siewior <bigeasy@linutronix.de> wrote:

> * Thomas Gleixner | 2016-03-14 09:49:52 [+0100]:
> 
> >On Sun, 13 Mar 2016, Clark Williams wrote:
> >  
> >> I'm hitting the WARN_ON(wakes > 2) in $SUBJECT when resuming from suspend on my laptop (quad-core i7 with HT on). Looks like the warning gets hit 36 times on resume. E.g.:  
> >If resume is the only case, then we can filter that out and not worry about it
> >at all :)  
> 
> This works with the "mem" and "disk" target:
> 
> --- a/include/linux/suspend.h
> +++ b/include/linux/suspend.h
> @@ -194,6 +194,12 @@ struct platform_freeze_ops {
>  	void (*end)(void);
>  };
>  
> +#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATION)
> +extern bool pm_in_action;
> +#else
> +# define pm_in_action false
> +#endif
> +
>  #ifdef CONFIG_SUSPEND
>  /**
>   * suspend_set_ops - set platform dependent suspend operations
> diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
> index bfd9e0982f15..fbb23f93e8d6 100644
> --- a/kernel/power/hibernate.c
> +++ b/kernel/power/hibernate.c
> @@ -648,6 +648,10 @@ static void power_down(void)
>  		cpu_relax();
>  }
>  
> +#ifndef CONFIG_SUSPEND
> +bool pm_in_action;
> +#endif
> +
>  /**
>   * hibernate - Carry out system hibernation, including saving the image.
>   */
> @@ -660,6 +664,8 @@ int hibernate(void)
>  		return -EPERM;
>  	}
>  
> +	pm_in_action = true;
> +
>  	lock_system_sleep();
>  	/* The snapshot device should not be opened while we're running */
>  	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
> @@ -725,6 +731,7 @@ int hibernate(void)
>  	atomic_inc(&snapshot_device_available);
>   Unlock:
>  	unlock_system_sleep();
> +	pm_in_action = false;
>  	return error;
>  }
>  
> diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
> index 80ebc0726290..393bc342c586 100644
> --- a/kernel/power/suspend.c
> +++ b/kernel/power/suspend.c
> @@ -522,6 +522,8 @@ static int enter_state(suspend_state_t state)
>  	return error;
>  }
>  
> +bool pm_in_action;
> +
>  /**
>   * pm_suspend - Externally visible function for suspending the system.
>   * @state: System sleep state to enter.
> @@ -536,6 +538,8 @@ int pm_suspend(suspend_state_t state)
>  	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
>  		return -EINVAL;
>  
> +	pm_in_action = true;
> +
>  	error = enter_state(state);
>  	if (error) {
>  		suspend_stats.fail++;
> @@ -543,6 +547,7 @@ int pm_suspend(suspend_state_t state)
>  	} else {
>  		suspend_stats.success++;
>  	}
> +	pm_in_action = false;
>  	return error;
>  }
>  EXPORT_SYMBOL(pm_suspend);
> diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
> index 8459561f0379..205fe36868f9 100644
> --- a/kernel/sched/swait.c
> +++ b/kernel/sched/swait.c
> @@ -1,5 +1,6 @@
>  #include <linux/sched.h>
>  #include <linux/swait.h>
> +#include <linux/suspend.h>
>  
>  void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
>  			     struct lock_class_key *key)
> @@ -42,7 +43,9 @@ void swake_up_all_locked(struct swait_queue_head *q)
>  		list_del_init(&curr->task_list);
>  		wakes++;
>  	}
> -	WARN_ON(wakes > 2);
> +	if (pm_in_action)
> +		return;
> +	WARN(wakes > 2, "complate_all() with %d waiters\n", wakes);
>  }
>  EXPORT_SYMBOL(swake_up_all_locked);
>  
> Sebastian

Applied to 4.4.6-rt12, suspended/resumed multiple times with no warnings from swake_up_all_locked().

Tested-by: Clark Williams <williams@redhat.com>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 801 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2016-04-03  3:44 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-14  3:53 [RT] Warning from swake_up_all_locked in rt-4.4.4-rt11 Clark Williams
2016-03-14  8:49 ` Thomas Gleixner
2016-03-30 10:22   ` Sebastian Andrzej Siewior
2016-03-30 13:52     ` Clark Williams
2016-03-30 14:24       ` Sebastian Andrzej Siewior
2016-04-01 10:33   ` Sebastian Andrzej Siewior
2016-04-03  3:44     ` Clark Williams

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).