Re: 2.6.22-rc3-mm1

Re: 2.6.22-rc3-mm1

[Michal Piotrowski]

Hi,

Andrew Morton napisał(a):
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> 

FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.

[  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
[  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
[  187.847730] Suspending console(s)

http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config

Regards,
Michal


-- 
"Najbardziej brakowało mi twojego milczenia."
-- Andrzej Sapkowski "Coś więcej"

Re: 2.6.22-rc3-mm1

[Rafael J. Wysocki]

On Thursday, 31 May 2007 17:29, Michal Piotrowski wrote:
> Hi,
> 
> Andrew Morton napisał(a):
> > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> > 
> 
> FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.
> 
> [  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
> [  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
> [  187.847730] Suspending console(s)
> 
> http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
> http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config

Hmm, that might be a couple of things, actually.

To see if the patches directly related to hibernation/suspend cause this, can
you please test 2.6.22-rc3 with the patch series at

http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.22-rc3/patches/

applied?

Greetings,
Rafael

Re: 2.6.22-rc3-mm1

[Michal Piotrowski]

On 31/05/07, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Thursday, 31 May 2007 17:29, Michal Piotrowski wrote:
> > Hi,
> >
> > Andrew Morton napisał(a):
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> > >
> >
> > FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.
> >
> > [  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
> > [  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
> > [  187.847730] Suspending console(s)
> >
> > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
> > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config
>
> Hmm, that might be a couple of things, actually.
>
> To see if the patches directly related to hibernation/suspend cause this, can
> you please test 2.6.22-rc3 with the patch series at
>
> http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.22-rc3/patches/
>
> applied?

Ok, bug is in suspend tree.

>
> Greetings,
> Rafael
>

Regards,
Michal

-- 
"Najbardziej brakowało mi twojego milczenia."
-- Andrzej Sapkowski "Coś więcej"

[PATCH -mm] Freezer: migration_thread should not be freezable (was: Re: Re: 2.6.22-rc3-mm1)

[Rafael J. Wysocki]

On Thursday, 31 May 2007 21:58, Rafael J. Wysocki wrote:
> On Thursday, 31 May 2007 17:29, Michal Piotrowski wrote:
> > Hi,
> > 
> > Andrew Morton napisał(a):
> > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> > > 
> > 
> > FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.
> > 
> > [  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
> > [  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
> > [  187.847730] Suspending console(s)
> > 
> > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
> > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config
> 
> Hmm, that might be a couple of things, actually.
> 
> To see if the patches directly related to hibernation/suspend cause this, can
> you please test 2.6.22-rc3 with the patch series at
> 
> http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.22-rc3/patches/
> 
> applied?

Ahem, I broke it. :-(

Andrew, the following fix is needed on top of
freezer-make-kernel-threads-nonfreezable-by-default.patch

---
From: Rafael J. Wysocki <rjw@sisk.pl>

migration_thread should not be freezable, or it will break hibernation and
suspend on SMP.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/sched.c |    3 ---
 1 file changed, 3 deletions(-)

Index: linux-2.6.22-rc3/kernel/sched.c
===================================================================
--- linux-2.6.22-rc3.orig/kernel/sched.c
+++ linux-2.6.22-rc3/kernel/sched.c
@@ -5157,13 +5157,10 @@ static int migration_thread(void *data)
 	BUG_ON(rq->migration_thread != current);
 
 	set_current_state(TASK_INTERRUPTIBLE);
-	set_freezable();
 	while (!kthread_should_stop()) {
 		struct migration_req *req;
 		struct list_head *head;
 
-		try_to_freeze();
-
 		spin_lock_irq(&rq->lock);
 
 		if (cpu_is_offline(cpu)) {

Re: 2.6.22-rc3-mm1

[Rafael J. Wysocki]

On Thursday, 31 May 2007 23:25, Michal Piotrowski wrote:
> On 31/05/07, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> > On Thursday, 31 May 2007 17:29, Michal Piotrowski wrote:
> > > Hi,
> > >
> > > Andrew Morton napisał(a):
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> > > >
> > >
> > > FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.
> > >
> > > [  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
> > > [  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
> > > [  187.847730] Suspending console(s)
> > >
> > > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
> > > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config
> >
> > Hmm, that might be a couple of things, actually.
> >
> > To see if the patches directly related to hibernation/suspend cause this, can
> > you please test 2.6.22-rc3 with the patch series at
> >
> > http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.22-rc3/patches/
> >
> > applied?
> 
> Ok, bug is in suspend tree.

Yup.  Please see the message I've just sent (with a fix).

Rafael

Re: [PATCH -mm] Freezer: migration_thread should not be freezable (was: Re: Re: 2.6.22-rc3-mm1)

[Michal Piotrowski]

On 31/05/07, Rafael J. Wysocki <rjw@sisk.pl> wrote:
> On Thursday, 31 May 2007 21:58, Rafael J. Wysocki wrote:
> > On Thursday, 31 May 2007 17:29, Michal Piotrowski wrote:
> > > Hi,
> > >
> > > Andrew Morton napisał(a):
> > > > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.22-rc3/2.6.22-rc3-mm1/
> > > >
> > >
> > > FYI suspend to disk doesn't work anymore on my box, system hangs after "Suspending console(s)" message.
> > >
> > > [  186.297753] Shrinking memory...  \b-\b\\b|\b/\b-\b\\b|\bdone (113064 pages freed)
> > > [  187.841914] Freed 452256 kbytes in 1.54 seconds (293.67 MB/s)
> > > [  187.847730] Suspending console(s)
> > >
> > > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/console.log
> > > http://www.stardust.webpages.pl/files/tbf/bitis-gabonica/2.6.22-rc3-mm1/mm-config
> >
> > Hmm, that might be a couple of things, actually.
> >
> > To see if the patches directly related to hibernation/suspend cause this, can
> > you please test 2.6.22-rc3 with the patch series at
> >
> > http://www.sisk.pl/kernel/hibernation_and_suspend/2.6.22-rc3/patches/
> >
> > applied?
>
> Ahem, I broke it. :-(
>
> Andrew, the following fix is needed on top of
> freezer-make-kernel-threads-nonfreezable-by-default.patch
>
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
>
> migration_thread should not be freezable, or it will break hibernation and
> suspend on SMP.
>

Problem fixed, suspend to disk works fine. Huge thanks!

Regards,
Michal

-- 
"Najbardziej brakowało mi twojego milczenia."
-- Andrzej Sapkowski "Coś więcej"

[-mm patch] kernel/power/disk.c: make code static

[Adrian Bunk]

On Wed, May 30, 2007 at 11:58:23PM -0700, Andrew Morton wrote:
>...
> Changes since 2.6.22-rc2-mm1:
>...
> +swsusp-remove-code-duplication-between-diskc-and-userc.patch
>...
>  freezer/swsusp updates
>...

This patch makes needlessly global code static.

Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

 kernel/power/disk.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-2.6.22-rc3-mm1/kernel/power/disk.c.old	2007-06-05 22:12:07.000000000 +0200
+++ linux-2.6.22-rc3-mm1/kernel/power/disk.c	2007-06-05 22:13:37.000000000 +0200
@@ -45,7 +45,7 @@
 
 static int hibernation_mode = HIBERNATION_SHUTDOWN;
 
-struct hibernation_ops *hibernation_ops;
+static struct hibernation_ops *hibernation_ops;
 
 /**
  * hibernation_set_ops - set the global hibernate operations
@@ -231,7 +231,7 @@
  *	to power off or reboot.
  */
 
-void power_down(void)
+static void power_down(void)
 {
 	switch (hibernation_mode) {
 	case HIBERNATION_TEST:

Re: [-mm patch] kernel/power/disk.c: make code static

[Rafael J. Wysocki]

On Tuesday, 5 June 2007 23:50, Adrian Bunk wrote:
> On Wed, May 30, 2007 at 11:58:23PM -0700, Andrew Morton wrote:
> >...
> > Changes since 2.6.22-rc2-mm1:
> >...
> > +swsusp-remove-code-duplication-between-diskc-and-userc.patch
> >...
> >  freezer/swsusp updates
> >...
> 
> This patch makes needlessly global code static.
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>

ACK

Rafael


> ---
> 
>  kernel/power/disk.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> --- linux-2.6.22-rc3-mm1/kernel/power/disk.c.old	2007-06-05 22:12:07.000000000 +0200
> +++ linux-2.6.22-rc3-mm1/kernel/power/disk.c	2007-06-05 22:13:37.000000000 +0200
> @@ -45,7 +45,7 @@
>  
>  static int hibernation_mode = HIBERNATION_SHUTDOWN;
>  
> -struct hibernation_ops *hibernation_ops;
> +static struct hibernation_ops *hibernation_ops;
>  
>  /**
>   * hibernation_set_ops - set the global hibernate operations
> @@ -231,7 +231,7 @@
>   *	to power off or reboot.
>   */
>  
> -void power_down(void)
> +static void power_down(void)
>  {
>  	switch (hibernation_mode) {
>  	case HIBERNATION_TEST:
> 
> 
> 

-- 
"Premature optimization is the root of all evil." - Donald Knuth