2 bugs related to suspend to disk

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Quoted 31 lines · Marcin Slusarz

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

Quoted 3 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Both look strange, at least the first one does.

Thanks for the report, I'll do my best to take care of this as soon as I can.

Quoted 31 lines · Marcin Slusarz

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

Quoted 3 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Both look strange, at least the first one does.

Thanks for the report, I'll do my best to take care of this as soon as I can.

hi,

Quoted 36 lines · Rafael J. Wysocki

Quoted 34 lines · Marcin Slusarz

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Quoted 4 lines

Both look strange, at least the first one does.

Thanks for the report, I'll do my best to take care of this as soon as I can.

i've seen a similar warning, the problem seems to be that swap_type_of calls bdget with the swap_lock held.

with the attached patch i don't see this warning any more - but i'm not sure if this is the correct way to fix this

regards, sebastian
---

don't call bdget with swap_lock held

Signed-off-by Sebastian Ott <[email protected]>

---
 mm/swapfile.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.5/mm/swapfile.c
===================================================================

mm/swapfile.c +1 -1

@@ -634,10 +634,10 @@ int swap_type_of(dev_t device, sector_t 
 			continue;
 
 		if (!bdev) {
+			spin_unlock(&swap_lock);
 			if (bdev_p)
 				*bdev_p = bdget(sis->bdev->bd_dev);
 
-			spin_unlock(&swap_lock);
 			return i;
 		}
 		if (bdev == sis->bdev) {

@@ -646,10 +646,10 @@ int swap_type_of(dev_t device, sector_t 
 			se = list_entry(sis->extent_list.next,
 					struct swap_extent, list);

hi,

Quoted 36 lines · Rafael J. Wysocki

Quoted 34 lines · Marcin Slusarz

1) echo platform > /sys/power/disk; echo disk > /sys/power/state

works but prints:

BUG: sleeping function called from invalid context at include/linux/writeback.h:87
in_atomic(): 1, irqs_disabled(): 0, pid: 6509, name: sh
3 locks held by sh/6509:
 #0:  (&buffer->mutex){+.+.+.}, at: [<>] sysfs_write_file+0x38/0x119
 #1:  (pm_mutex){+.+.+.}, at: [<>] hibernate+0x17/0x169
 #2:  (swap_lock){+.+...}, at: [<>] swap_type_of+0x2e/0xed
Pid: 6509, comm: sh Not tainted 2.6.30-rc7-mod #124
Call Trace:
 ? __debug_show_held_locks
 ? bdev_test
 __might_sleep
 ifind
 ? bdev_test
 iget5_locked
 ? bdev_set
 bdget
 swap_type_of
 swsusp_write
 ? acpi_sleep_tts_switch
 hibernate
 state_store
 kobj_attr_store
 sysfs_write_file
 vfs_write
 sys_write
 system_call_fastpath

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

It's not a regression, because I never tried to STD (STR worked).

Quoted 4 lines

Both look strange, at least the first one does.

Thanks for the report, I'll do my best to take care of this as soon as I can.

i've seen a similar warning, the problem seems to be that swap_type_of calls bdget with the swap_lock held.

with the attached patch i don't see this warning any more - but i'm not sure if this is the correct way to fix this

regards, sebastian
---

don't call bdget with swap_lock held

Signed-off-by Sebastian Ott <[email protected]>

---
 mm/swapfile.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.5/mm/swapfile.c
===================================================================

mm/swapfile.c +1 -1

@@ -634,10 +634,10 @@ int swap_type_of(dev_t device, sector_t 
 			continue;
 
 		if (!bdev) {
+			spin_unlock(&swap_lock);
 			if (bdev_p)
 				*bdev_p = bdget(sis->bdev->bd_dev);
 
-			spin_unlock(&swap_lock);
 			return i;
 		}
 		if (bdev == sis->bdev) {

@@ -646,10 +646,10 @@ int swap_type_of(dev_t device, sector_t 
 			se = list_entry(sis->extent_list.next,
 					struct swap_extent, list);

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

Quoted 1 line

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

Quoted 1 line

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

Quoted 7 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Quoted 4 lines

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

Quoted 7 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Quoted 4 lines

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

Quoted 13 lines · Rafael J. Wysocki

Quoted 11 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

Quoted 3 lines

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Quoted 16 lines

Quoted 15 lines · Rafael J. Wysocki

Quoted 11 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

Quoted 4 lines

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Thanks.

Can you please test the patch sent by Sebastian Ott in this thread?

Quoted 16 lines

Quoted 15 lines · Rafael J. Wysocki

Quoted 11 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

Quoted 4 lines

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Thanks.

Can you please test the patch sent by Sebastian Ott in this thread?

Rafael J. Wysocki wrote

Quoted 22 lines · Marcin Slusarz

Quoted 20 lines

Quoted 7 lines · Rafael J. Wysocki

Quoted 6 lines · Marcin Slusarz

Quoted 5 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

Quoted 8 lines

Quoted 5 lines

Quoted 1 line

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Quoted 3 lines

Thanks.

Can you please test the patch sent by Sebastian Ott in this thread?

BUG disappeared with this patch.

Is this a final fix?

Rafael J. Wysocki wrote

Quoted 22 lines · Marcin Slusarz

Quoted 20 lines

Quoted 7 lines · Rafael J. Wysocki

Quoted 6 lines · Marcin Slusarz

Quoted 5 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

Quoted 8 lines

Quoted 5 lines

Quoted 1 line

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Quoted 3 lines

Thanks.

Can you please test the patch sent by Sebastian Ott in this thread?

BUG disappeared with this patch.

Is this a final fix?

Quoted 24 lines

Rafael J. Wysocki wrote

Quoted 23 lines · Marcin Slusarz

Quoted 12 lines

Quoted 11 lines · Rafael J. Wysocki

Quoted 10 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Quoted 8 lines

Quoted 4 lines

Quoted 1 line

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Thanks.

Quoted 2 lines

Quoted 1 line

Can you please test the patch sent by Sebastian Ott in this thread?

BUG disappeared with this patch.

Thanks for testing.

Quoted 1 line

Is this a final fix?

I'm not sure yet.

Quoted 24 lines

Rafael J. Wysocki wrote

Quoted 23 lines · Marcin Slusarz

Quoted 12 lines

Quoted 11 lines · Rafael J. Wysocki

Quoted 10 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Quoted 8 lines

Quoted 4 lines

Quoted 1 line

Thanks and sorry for the noise!

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)

Thanks.

Quoted 2 lines

Quoted 1 line

Can you please test the patch sent by Sebastian Ott in this thread?

BUG disappeared with this patch.

Thanks for testing.

Quoted 1 line

Is this a final fix?

I'm not sure yet.

Quoted 13 lines · Rafael J. Wysocki

Quoted 11 lines · Marcin Slusarz

Quoted 6 lines · Pavel Machek

Hi!

Quoted 2 lines

2) "s2disk" (from suspend-0.8) suspends, but doesn't resume (and I need to mkswap && swapon -a later)

I'm afraid we need more details here. Is "resume" binary being ran?

Excellent question ;) - I didn't know it has to. I'll try to setup initramfs tomorrow.

Thanks and sorry for the noise!

Quoted 3 lines

However, the issue reported as 1) is not really a noise IMO. :-)

Can you please attach a full dmesg output containing these messages?

I've uploaded .config, dmesg (BUG was not saved) and 2 pictures of screen just before power loss to http://www.kadu.net/~joi/kernel/2009.05.25/
(Please ignore first suspend failure (3681.078646 - 3685.514358) - I forgot to restore swap)