lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] hibernate: make sure pfn_is_nosave handles lowcore pages

Browse Source 
pfn_is_nosave doesn't return the correct value for the second lowcore
page if lowcore protection is enabled. Make sure it always returns
the correct value.

While at it simplify the whole thing.
NSS special handling is done by the tprot check like it already works
for DCSS as well. So remove the extra code for NSS.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Heiko Carstens
2009-09-22 22:58:50 +02:00
committed by Martin Schwidefsky
parent 3fd26a7793
commit 2573a57530
2 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/include/asm/lowcore.h
View File

@ -195,6 +195,8 @@ union save_area {
#define LC_ORDER 1 #define LC_ORDER 1
#endif #endif
#define LC_PAGES (1UL << LC_ORDER)
struct _lowcore struct _lowcore
{ {
#ifndef __s390x__ #ifndef __s390x__

24
arch/s390/kernel/suspend.c
View File

@ -6,36 +6,26 @@
* Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com> * Author(s): Hans-Joachim Picht <hans@linux.vnet.ibm.com>
*/ */
#include <linux/suspend.h>
#include <linux/reboot.h>
#include <linux/pfn.h> #include <linux/pfn.h>
#include <linux/mm.h>
#include <asm/sections.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/ipl.h>
/* /*
* References to section boundaries * References to section boundaries
*/ */
extern const void __nosave_begin, __nosave_end; extern const void __nosave_begin, __nosave_end;
/*
* check if given pfn is in the 'nosave' or in the read only NSS section
*/
int pfn_is_nosave(unsigned long pfn) int pfn_is_nosave(unsigned long pfn)
{ {
unsigned long nosave_begin_pfn = __pa(&__nosave_begin) >> PAGE_SHIFT; unsigned long nosave_begin_pfn = PFN_DOWN(__pa(&__nosave_begin));
unsigned long nosave_end_pfn = PAGE_ALIGN(__pa(&__nosave_end)) unsigned long nosave_end_pfn = PFN_DOWN(__pa(&__nosave_end));
>> PAGE_SHIFT;
unsigned long eshared_pfn = PFN_DOWN(__pa(&_eshared)) - 1;
unsigned long stext_pfn = PFN_DOWN(__pa(&_stext));
/* Always save lowcore pages (LC protection might be enabled). */
if (pfn <= LC_PAGES)
return 0;
if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn) if (pfn >= nosave_begin_pfn && pfn < nosave_end_pfn)
return 1; return 1;
if (pfn >= stext_pfn && pfn <= eshared_pfn) { /* Skip memory holes and read-only pages (NSS, DCSS, ...). */
if (ipl_info.type == IPL_TYPE_NSS) if (tprot(PFN_PHYS(pfn)))
return 1;
} else if ((tprot(pfn * PAGE_SIZE) && pfn > 0))
return 1; return 1;
return 0; return 0;
} }