[PATCH][Fix] Hibernation: Do not try to mark invalid PFNs as nosave

[PATCH][Fix] Hibernation: Do not try to mark invalid PFNs as nosave

[Rafael J. Wysocki]

[Please consider as 2.6.23 material.]
---
From: Rafael J. Wysocki <rjw@sisk.pl>

On some systems some PFNs reported by the early initialization code as 'nosave'
may be invalid.  If we try to set the corresponding bits in the hibernation
bitmap, BUG_ON() in memory_bm_find_bit() will be triggered and the system
won't be able to boot  (cf. https://bugzilla.novell.com/show_bug.cgi?id=296242).

Prevent this from happening by verifying if the 'nosave' PFNs are valid in
mark_nosave_pages().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 kernel/power/snapshot.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Index: linux-2.6/kernel/power/snapshot.c
===================================================================
--- linux-2.6.orig/kernel/power/snapshot.c
+++ linux-2.6/kernel/power/snapshot.c
@@ -709,7 +709,8 @@ static void mark_nosave_pages(struct mem
 				region->end_pfn << PAGE_SHIFT);
 
 		for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
-			memory_bm_set_bit(bm, pfn);
+			if (pfn_valid(pfn))
+				memory_bm_set_bit(bm, pfn);
 	}
 }
 

Re: [PATCH][Fix] Hibernation: Do not try to mark invalid PFNs as nosave

[Pavel Machek]

Hi!

> [Please consider as 2.6.23 material.]
> ---
> From: Rafael J. Wysocki <rjw@sisk.pl>
> 
> On some systems some PFNs reported by the early initialization code as 'nosave'
> may be invalid.  If we try to set the corresponding bits in the hibernation
> bitmap, BUG_ON() in memory_bm_find_bit() will be triggered and the system
> won't be able to boot  (cf. https://bugzilla.novell.com/show_bug.cgi?id=296242).
> 
> Prevent this from happening by verifying if the 'nosave' PFNs are valid in
> mark_nosave_pages().
> 
> Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>

ACK.

> @@ -709,7 +709,8 @@ static void mark_nosave_pages(struct mem
>  				region->end_pfn << PAGE_SHIFT);
>  
>  		for (pfn = region->start_pfn; pfn < region->end_pfn; pfn++)
> -			memory_bm_set_bit(bm, pfn);
> +			if (pfn_valid(pfn))
> +				memory_bm_set_bit(bm, pfn);
>  	}
>  }
>  

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html