2 bugs related to suspend to disk

2 bugs related to suspend to disk

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

Marcin

Re: 2 bugs related to suspend to disk

[Rafael J. Wysocki]

On Sunday 24 May 2009, Marcin Slusarz wrote:
> 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).

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.

Best,
Rafael

Re: [linux-pm] 2 bugs related to suspend to disk

[Sebastian Ott]

hi,

On Sun, 24 May 2009, Rafael J. Wysocki wrote:

> On Sunday 24 May 2009, Marcin Slusarz wrote:
> > 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).
> 
> 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 <sebott@linux.vnet.ibm.com>
---
 mm/swapfile.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.5/mm/swapfile.c
===================================================================
--- linux-2.5.orig/mm/swapfile.c	2009-03-24 13:51:00.000000000 +0100
+++ linux-2.5/mm/swapfile.c	2009-05-25 15:33:34.000000000 +0200
@@ -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);
 			if (se->start_block == offset) {
+				spin_unlock(&swap_lock);
 				if (bdev_p)
 					*bdev_p = bdget(sis->bdev->bd_dev);
 
-				spin_unlock(&swap_lock);
 				bdput(bdev);
 				return i;
 			}

Re: [linux-pm] 2 bugs related to suspend to disk

[Rafael J. Wysocki]

On Monday 25 May 2009, Sebastian Ott wrote:
> hi,
> 
> On Sun, 24 May 2009, Rafael J. Wysocki wrote:
> 
> > On Sunday 24 May 2009, Marcin Slusarz wrote:
> > > 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).
> > 
> > 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.

Well, it didn't cause any problems in the past.

> 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

I'll have a look, thanks for the patch.

> regards, sebastian
> ---
> 
> don't call bdget with swap_lock held
> 
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
> ---
>  mm/swapfile.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-2.5/mm/swapfile.c
> ===================================================================
> --- linux-2.5.orig/mm/swapfile.c	2009-03-24 13:51:00.000000000 +0100
> +++ linux-2.5/mm/swapfile.c	2009-05-25 15:33:34.000000000 +0200
> @@ -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);
>  			if (se->start_block == offset) {
> +				spin_unlock(&swap_lock);
>  				if (bdev_p)
>  					*bdev_p = bdget(sis->bdev->bd_dev);
>  
> -				spin_unlock(&swap_lock);
>  				bdput(bdev);
>  				return i;
>  			}
> --

Best,
Rafael

Re: 2 bugs related to suspend to disk

[Pavel Machek]

Hi!


> 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?
Does it produce some output?
									Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

Re: 2 bugs related to suspend to disk

[Marcin Slusarz]

Pavel Machek wrote:
> Hi!
> 
> 
>> 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!

Marcin

Re: 2 bugs related to suspend to disk

[Rafael J. Wysocki]

On Sunday 24 May 2009, Marcin Slusarz wrote:
> Pavel Machek wrote:
> > Hi!
> > 
> > 
> >> 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?

Rafael

Re: 2 bugs related to suspend to disk

[Marcin Slusarz]

Rafael J. Wysocki wrote:
> On Sunday 24 May 2009, Marcin Slusarz wrote:
>> Pavel Machek wrote:
>>> Hi!
>>>
>>>
>>>> 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?

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)

Marcin

Re: 2 bugs related to suspend to disk

[Rafael J. Wysocki]

On Monday 25 May 2009, Marcin Slusarz wrote:
> Rafael J. Wysocki wrote:
> > On Sunday 24 May 2009, Marcin Slusarz wrote:
> >> Pavel Machek wrote:
> >>> Hi!
> >>>
> >>>
> >>>> 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?
> 
> 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

Re: 2 bugs related to suspend to disk

[Marcin Slusarz]

Rafael J. Wysocki wrote
> On Monday 25 May 2009, Marcin Slusarz wrote:
>> Rafael J. Wysocki wrote:
>>> On Sunday 24 May 2009, Marcin Slusarz wrote:
>>>> Pavel Machek wrote:
>>>>> Hi!
>>>>>
>>>>>
>>>>>> 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?
>> 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?

BUG disappeared with this patch. Is this a final fix?

Marcin

Re: 2 bugs related to suspend to disk

[Rafael J. Wysocki]

On Wednesday 27 May 2009, Marcin Slusarz wrote:
> Rafael J. Wysocki wrote
> > On Monday 25 May 2009, Marcin Slusarz wrote:
> >> Rafael J. Wysocki wrote:
> >>> On Sunday 24 May 2009, Marcin Slusarz wrote:
> >>>> Pavel Machek wrote:
> >>>>> Hi!
> >>>>>
> >>>>>
> >>>>>> 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?
> >> 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?
> 
> BUG disappeared with this patch.

Thanks for testing.

> Is this a final fix?

I'm not sure yet.

Best,
Rafael

Re: 2 bugs related to suspend to disk

[Marcin Slusarz]

Rafael J. Wysocki pisze:
> On Wednesday 27 May 2009, Marcin Slusarz wrote:
>> Rafael J. Wysocki wrote
>>> On Monday 25 May 2009, Marcin Slusarz wrote:
>>>> Rafael J. Wysocki wrote:
>>>>> On Sunday 24 May 2009, Marcin Slusarz wrote:
>>>>>> Pavel Machek wrote:
>>>>>>> Hi!
>>>>>>>
>>>>>>>
>>>>>>>> 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?
>>>> 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?
>> BUG disappeared with this patch.
> 
> Thanks for testing.
> 
>> Is this a final fix?
> 
> I'm not sure yet.


This bug (first) is still with us as of 2.6.31-rc2-faf80d62e44dc627efb741f48db50c1858d1667c

Marcin