Asus L5D resume on battery power
Subsystems (4)
Hi,
For quite some time I've been trying to make my Asus L5D box (athlon64, nforce3, 64-bit kernel, SuSE 9.2) resume from suspend (S4, ie swsusp) on battery power. Evidently, the box always resumes successfully on AC power, but there are problems with resuming on battery power.
I've tried all of the recent -mm kernels and it turns out that the box resumes successfully for 2.6.11-rc3-mm2, but for either 2.6.11-rc3-mm1 or 2.6.11-rc4-mm1 it (most often) reboots as soon as the image has been restored (ie before executing the last pr_debug() in pm_suspend_disk()). Hence, it seems that there's something in 2.6.11-rc3-mm2 which makes the box resume sucessfully and is not present in the other kernels. I'm not absolutely convinced that it is related to ACPI, but I suspect so. I'd like to find out what exactly it is so if you can give me a hint, please do.
BTW, for each of the above kernels, if the resume on battery power is successful (it sometimes happens for 2.6.11-rc3-mm1 or 2.6.11-rc4-mm1 too, but quite rarely, so to speak), the box cannot be switched back to AC power after resume, because it usually hangs solid as soon as the power supply is connected to it.
Greets,
Rafael
Signature · 10 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland" ------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi!
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
It sounds to me like we run at 2GHz from batteries at resume time, and that causes bad things (tm),
[-- snip --]
It seems that we write to the BIOS while moving the image, at least on my box, which is quite not correct, IMO.
...
Quoted 11 lines
At the same time, from powernow-k8, I got this:
powernow-k8: Found 1 AMD Athlon 64 / Opteron processors (version 1.00.09e)
powernow-k8: found PSB header at0xffff8100000fbb10where
ffff8100000fbb10is the (virtual) address containing the PSB header (ie a part of the BIOS). Hence, the PSB gets overwritten during resume (as well as some other BIOS stuff, it seems).IMO this may lead to unexpected results, like the mysterious reboots during resume.
Well, I always thought that ROM-BIOS is expected to be... well... read-only? Can you really write to your BIOS? [I know about Flash-BIOSen, but they are certainly not writable by "normal" write.] Plus we should overwrite it with same values...
Anyway, IMO bios should be marked as reserved (and we should not be touching reserved pages). Can you verify that your BIOS is properly marked reserved? [Ccing l-k, this might be interesting.]
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 2 lines · Pavel Machek
Hi!
[-- snip --]
Quoted 2 lines
Quoted 2 lines
It seems that we write to the BIOS while moving the image, at least on my box, which is quite not correct, IMO.
[-- snip --]
Quoted 4 lines
Quoted 3 lines
IMO this may lead to unexpected results, like the mysterious reboots during resume.
Quoted 8 lines
Well, I always thought that ROM-BIOS is expected to be... well... read-only? Can you really write to your BIOS? [I know about Flash-BIOSen, but they are certainly not writable by "normal" write.] Plus we should overwrite it with same values...
Anyway, IMO bios should be marked as reserved (and we should not be touching reserved pages). Can you verify that your BIOS is properly marked reserved? [Ccing l-k, this might be interesting.]
It is, but that's even more interesting. Namely, the BIOS-e820 memory map looks as follows:
BIOS-provided physical RAM map:
BIOS-e820: 0000000000000000 - 000000000009fc00 (usable)
BIOS-e820: 000000000009fc00 - 00000000000a0000 (reserved)
BIOS-e820: 00000000000e0000 - 0000000000100000 (reserved)
BIOS-e820: 0000000000100000 - 000000001ff40000 (usable)
BIOS-e820: 000000001ff40000 - 000000001ff50000 (ACPI data)
BIOS-e820: 000000001ff50000 - 0000000020000000 (ACPI NVS)
BIOS-e820: 00000000fec00000 - 00000000fec01000 (reserved)
BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved)
and the pages in the first two reserved areas are properly marked as reserved. Moreover, there is an apparent hole between a0000 and e0000 which also is marked as reserved. However, we treat all of these pages as saveable (a page is treated as non-saveable if it is marked as reserved _and_ satisfies specific condition which is met by only one page on my system). Consequently, during resume we try to overwrite all of these pages and we not only try to write to (theoretically) read-only areas, but also we try to write to where there's nothing. :-)
Still, there are almost 3500 reserved pages on my system and I'm not sure that we don't need to save at least some of them. Anyway, I'm attaching the full list of pages that are marked as reserved and treated as saveable, so they get overwritten during resume. Please have a look (these are virtual x86-64 addresses, but the mapping is straightforward).
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi!
Quoted 38 lines
Quoted 2 lines
Quoted 2 lines
It seems that we write to the BIOS while moving the image, at least on my box, which is quite not correct, IMO.
[-- snip --]
Quoted 4 lines
Quoted 3 lines
IMO this may lead to unexpected results, like the mysterious reboots during resume.
Quoted 8 lines
Well, I always thought that ROM-BIOS is expected to be... well... read-only? Can you really write to your BIOS? [I know about Flash-BIOSen, but they are certainly not writable by "normal" write.] Plus we should overwrite it with same values...
Anyway, IMO bios should be marked as reserved (and we should not be touching reserved pages). Can you verify that your BIOS is properly marked reserved? [Ccing l-k, this might be interesting.]
It is, but that's even more interesting. Namely, the BIOS-e820 memory map looks as follows:
BIOS-provided physical RAM map:
BIOS-e820: 0000000000000000 -000000000009fc00(usable)
BIOS-e820:000000000009fc00-00000000000a0000(reserved)
BIOS-e820:00000000000e0000- 0000000000100000 (reserved)
BIOS-e820: 0000000000100000 -000000001ff40000(usable)
BIOS-e820:000000001ff40000-000000001ff50000(ACPI data)
BIOS-e820:000000001ff50000- 0000000020000000 (ACPI NVS)
BIOS-e820:00000000fec00000-00000000fec01000(reserved)
BIOS-e820:00000000fee00000-00000000fee01000(reserved)and the pages in the first two reserved areas are properly marked as reserved. Moreover, there is an apparent hole between a0000 and e0000 which also is marked as reserved. However, we treat all of these pages as saveable (a page is treated as non-saveable if it is marked as reserved _and_ satisfies specific condition which is met by only one page on my system). Consequently, during resume we try to overwrite all of these pages and we not only try to write to (theoretically) read-only areas, but also we try to write to where there's nothing. :-)
Quoted 5 lines
Still, there are almost 3500 reserved pages on my system and I'm not sure that we don't need to save at least some of them. Anyway, I'm attaching the full list of pages that are marked as reserved and treated as saveable, so they get overwritten during resume. Please have a look (these are virtual x86-64 addresses, but the mapping is straightforward).
[looking at code]
IIRC kernel code/data is marked as PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 46 lines · Pavel Machek
Hi!
Quoted 38 lines
Quoted 2 lines
Quoted 2 lines
It seems that we write to the BIOS while moving the image, at least on my box, which is quite not correct, IMO.
[-- snip --]
Quoted 4 lines
Quoted 3 lines
IMO this may lead to unexpected results, like the mysterious reboots during resume.
Quoted 8 lines
Well, I always thought that ROM-BIOS is expected to be... well... read-only? Can you really write to your BIOS? [I know about Flash-BIOSen, but they are certainly not writable by "normal" write.] Plus we should overwrite it with same values...
Anyway, IMO bios should be marked as reserved (and we should not be touching reserved pages). Can you verify that your BIOS is properly marked reserved? [Ccing l-k, this might be interesting.]
It is, but that's even more interesting. Namely, the BIOS-e820 memory map looks as follows:
BIOS-provided physical RAM map:
BIOS-e820: 0000000000000000 -000000000009fc00(usable)
BIOS-e820:000000000009fc00-00000000000a0000(reserved)
BIOS-e820:00000000000e0000- 0000000000100000 (reserved)
BIOS-e820: 0000000000100000 -000000001ff40000(usable)
BIOS-e820:000000001ff40000-000000001ff50000(ACPI data)
BIOS-e820:000000001ff50000- 0000000020000000 (ACPI NVS)
BIOS-e820:00000000fec00000-00000000fec01000(reserved)
BIOS-e820:00000000fee00000-00000000fee01000(reserved)and the pages in the first two reserved areas are properly marked as reserved. Moreover, there is an apparent hole between a0000 and e0000 which also is marked as reserved. However, we treat all of these pages as saveable (a page is treated as non-saveable if it is marked as reserved _and_ satisfies specific condition which is met by only one page on my system). Consequently, during resume we try to overwrite all of these pages and we not only try to write to (theoretically) read-only areas, but also we try to write to where there's nothing. :-)
Quoted 5 lines
Still, there are almost 3500 reserved pages on my system and I'm not sure that we don't need to save at least some of them. Anyway, I'm attaching the full list of pages that are marked as reserved and treated as saveable, so they get overwritten during resume. Please have a look (these are virtual x86-64 addresses, but the mapping is straightforward).
Quoted 5 lines
[looking at code]
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...
Perhaps we need another page flag, like PG_readonly, and mark the pages reserved by the e820 as PG_reserved | PG_readonly (the same for the areas that are not returned by e820 at all). Would that be acceptable?
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi!
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?
This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
You could get subtle and reuse some other pageflag. I do not think PG_reserved can have PG_locked... So using for example PG_locked for this purpose should be okay.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 10 lines · Pavel Machek
Hi!
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?
Quoted 7 lines
This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
You could get subtle and reuse some other pageflag. I do not think
PG_reservedcan havePG_locked... So using for examplePG_lockedfor this purpose should be okay.
The following patch does this. It is only for x86-64 without CONFIG_DISCONTIGMEM, but it has no effect in other cases.
arch/x86_64/mm/init.c +8 -5
@@ -438,11 +438,14 @@ totalram_pages +=free_all_bootmem ();for (tmp =0 ; tmp < end_pfn; tmp++) -/* -* Only count reserved RAM pages -*/ -if (page_is_ram (tmp) &&PageReserved (pfn_to_page (tmp))) - reservedpages++; +if (!page_is_ram (tmp)) +SetPageLocked (pfn_to_page (tmp)); +else +/* +* Count reserved RAM pages +*/ +if (PageReserved (pfn_to_page (tmp))) + reservedpages++;#endif after_bootmem =1 ;
kernel/power/swsusp.c +9 -3
@@ -531,9 +531,15 @@BUG_ON (PageReserved (page) &&PageNosave (page));if (PageNosave (page))return 0 ; -if (PageReserved (page) &&pfn_is_nosave (pfn)) { -pr_debug ("[nosave pfn 0x%lx]" , pfn); -return 0 ; +if (PageReserved (page)) { +if (pfn_is_nosave (pfn)) { +pr_debug ("[nosave pfn 0x%lx]\n" , pfn); +return 0 ; + } +if (PageLocked (page)) { +pr_debug ("[locked pfn 0x%lx]\n" , pfn); +return 0 ; + } }if (PageNosaveFree (page))return 0 ;
I thought it would be more complicated. :-)
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi.
Quoted 17 lines · Rafael J. Wysocki
Hi,
Quoted 14 lines · Pavel Machek
Hi!
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
Quoted 6 lines
Quoted 3 lines
You could get subtle and reuse some other pageflag. I do not think
PG_reservedcan havePG_locked... So using for examplePG_lockedfor this purpose should be okay.The following patch does this. It is only for x86-64 without
CONFIG_DISCONTIGMEM, but it has no effect in other cases.
Oops! That's what you get for replying to earlier messages before you read later ones! The patch I posted has been in use for quite a while, so it might be helpful to compare anyway.
Regards,
Nigel
Signature · 6 lines
Nigel Cunningham Software Engineer, Canberra, Australia http://www.cyclades.com Bus: +61 (2) 6291 9554; Hme: +61 (2) 6292 8028; Mob: +61 (417) 100 574 Maintainer of Suspend2 Kernel Patches http://softwaresuspend.berlios.de
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
In reply to Rafael J. WysockiHi!
Quoted 12 lines
Quoted 12 lines
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
Quoted 6 lines
Quoted 3 lines
You could get subtle and reuse some other pageflag. I do not think
PG_reservedcan havePG_locked... So using for examplePG_lockedfor this purpose should be okay.The following patch does this. It is only for x86-64 without
CONFIG_DISCONTIGMEM, but it has no effect in other cases.
Actually, take a look at Nigel's patch. He simply uses PageNosave instead of PageLocked -- that is cleaner. He also found a few places where reserved page becomes un-reserved, and you probably need to fix those, too.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 18 lines · Pavel Machek
Hi!
Quoted 16 lines
Quoted 15 lines
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
You could get subtle and reuse some other pageflag. I do not think
PG_reservedcan havePG_locked... So using for examplePG_lockedfor this purpose should be okay.
Quoted 5 lines
Quoted 2 lines
The following patch does this. It is only for x86-64 without
CONFIG_DISCONTIGMEM, but it has no effect in other cases.Actually, take a look at Nigel's patch. He simply uses PageNosave instead of PageLocked -- that is cleaner.
Yes. I thought about using PG_nosave in the begining, but there's a
BUG_ON(PageReserved(page) && PageNosave(page));
in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
Quoted 2 lines
He also found a few places where reserved page becomes un-reserved, and you probably need to fix those, too.
Yes, I think I'll just port the Nigel's patch to x86-64. BTW, it's striking that we found similar solutions independently (I didn't know the Nigel's patch before :-)).
Unfortunately, it turns out that the patch does not fix my problem with random reboots during resume on battery power, but I really think that we need to mark non-RAM areas with PG_nosave, at least for sanity reasons (eg to be sure that we do not break things by dumping stuff to where we should not write to).
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi!
Quoted 9 lines
Quoted 2 lines
Actually, take a look at Nigel's patch. He simply uses PageNosave instead of PageLocked -- that is cleaner.
Yes. I thought about using
PG_nosavein the begining, but there's a
BUG_ON(PageReserved(page) && PageNosave(page));in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
No, we can just kill it. It was "if something unexpected happens, bail out soon".
Quoted 10 lines
Quoted 2 lines
He also found a few places where reserved page becomes un-reserved, and you probably need to fix those, too.
Yes, I think I'll just port the Nigel's patch to x86-64. BTW, it's striking that we found similar solutions independently (I didn't know the Nigel's patch before :-)).
Unfortunately, it turns out that the patch does not fix my problem with random reboots during resume on battery power, but I really think that we need to mark
:-( too bad.
Quoted 2 lines
non-RAM areas with
PG_nosave, at least for sanity reasons (eg to be sure that we do not break things by dumping stuff to where we should not write to).
I'm not sure if it is not better to save & restore non-RAM areas, but it probably just does not matter.
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi.
Quoted 5 lines · Pavel Machek
Quoted 2 lines
non-RAM areas with
PG_nosave, at least for sanity reasons (eg to be sure that we do not break things by dumping stuff to where we should not write to).I'm not sure if it is not better to save & restore non-RAM areas, but it probably just does not matter.
IIRC, it does matter. I think there were situations where you got something nasty (MCE/oops/freeze) if you tried reading memory that doesn't exist. If you push me I'll put the effort into looking up suspend2 archives to find the discussion :>
Regards,
Nigel
Signature · 6 lines
Nigel Cunningham Software Engineer, Canberra, Australia http://www.cyclades.com Bus: +61 (2) 6291 9554; Hme: +61 (2) 6292 8028; Mob: +61 (417) 100 574 Maintainer of Suspend2 Kernel Patches http://softwaresuspend.berlios.de
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 8 lines · Nigel Cunningham
Hi.
Quoted 5 lines · Pavel Machek
Quoted 2 lines
non-RAM areas with
PG_nosave, at least for sanity reasons (eg to be sure that we do not break things by dumping stuff to where we should not write to).I'm not sure if it is not better to save & restore non-RAM areas, but it probably just does not matter.
For the address ranges that are reported by the BIOS as reserved, it probably doesn't matter indeed, but for the address ranges that are not reported at all, it's potentially dangerous. Unfortunately they all are generally treated in the same way, so why should we do it differently?
Quoted 4 lines
IIRC, it does matter. I think there were situations where you got something nasty (MCE/oops/freeze) if you tried reading memory that doesn't exist. If you push me I'll put the effort into looking up suspend2 archives to find the discussion :>
If you're so kind, that would be great!
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
In reply to Pavel MachekQuoted 7 lines · Pavel Machek
Hi!
Quoted 5 lines
Quoted 2 lines
Actually, take a look at Nigel's patch. He simply uses PageNosave instead of PageLocked -- that is cleaner.
Yes. I thought about using
PG_nosavein the begining, but there's a
Quoted 7 lines
Quoted 4 lines
BUG_ON(PageReserved(page) && PageNosave(page));in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
No, we can just kill it. It was "if something unexpected happens, bail out soon".
OK
The following is what I'm comfortable with. I didn't took the Nigel's patch literally, because we do one thing differently (ie nosave pfns) and it contained some changes that I thought were unnecessary. The i386 part is untested.
Greets,
Rafael
arch/i386/mm/init.c +17 -6
@@ -272,12 +272,15 @@ void __init one_highpage_init(struct pag {if (page_is_ram (pfn) && !(bad_ppro &&page_kills_ppro (pfn))) {ClearPageReserved (page); +ClearPageNosave (page);set_bit (PG_highmem, &page->flags);set_page_count (page,1 );__free_page (page); totalhigh_pages++; - }else + }else {SetPageReserved (page); +SetPageNosave (page); + } }#ifndef CONFIG_DISCONTIGMEM
@@ -602,11 +605,17 @@ void __init mem_init(void) reservedpages =0 ;for (tmp =0 ; tmp < max_low_pfn; tmp++) -/* -* Only count reserved RAM pages -*/ -if (page_is_ram (tmp) &&PageReserved (pfn_to_page (tmp))) - reservedpages++; +if (!page_is_ram (tmp)) +/* +* Non-RAM pages are always nosave +*/ +SetPageNosave (pfn_to_page (tmp)); +else +/* +* Count reserved RAM pages +*/ +if (PageReserved (pfn_to_page (tmp))) + reservedpages++;set_highmem_pages_init (bad_ppro);
@@ -705,6 +714,7 @@ void free_initmem(void) addr = (unsigned long )(&__init_begin);for (; addr < (unsigned long )(&__init_end); addr +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (addr)); +ClearPageNosave (virt_to_page (addr));set_page_count (virt_to_page (addr),1 );memset ((void *)addr,0xcc ,PAGE_SIZE );free_page (addr);
@@ -720,6 +730,7 @@ void free_initrd_mem(unsigned long startprintk (KERN_INFO "Freeing initrd memory: %ldk freed\n" , (end - start) >>10 );for (; start < end; start +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (start)); +ClearPageNosave (virt_to_page (start));set_page_count (virt_to_page (start),1 );free_page (start); totalram_pages++;
arch/x86_64/mm/init.c +13 -5
@@ -438,11 +438,17 @@ void __init mem_init(void) totalram_pages +=free_all_bootmem ();for (tmp =0 ; tmp < end_pfn; tmp++) -/* -* Only count reserved RAM pages -*/ -if (page_is_ram (tmp) &&PageReserved (pfn_to_page (tmp))) - reservedpages++; +if (!page_is_ram (tmp)) +/* +* Non-RAM pages are always nosave +*/ +SetPageNosave (pfn_to_page (tmp)); +else +/* +* Count reserved RAM pages +*/ +if (PageReserved (pfn_to_page (tmp))) + reservedpages++;#endif after_bootmem =1 ;
@@ -488,6 +494,7 @@ void free_initmem(void) addr = (unsigned long )(&__init_begin);for (; addr < (unsigned long )(&__init_end); addr +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (addr)); +ClearPageNosave (virt_to_page (addr));set_page_count (virt_to_page (addr),1 );memset ((void *)(addr & ~(PAGE_SIZE -1 )),0xcc ,PAGE_SIZE );free_page (addr);
@@ -505,6 +512,7 @@ void free_initrd_mem(unsigned long startprintk ("Freeing initrd memory: %ldk freed\n" , (end - start) >>10 );for (; start < end; start +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (start)); +ClearPageNosave (virt_to_page (start));set_page_count (virt_to_page (start),1 );free_page (start); totalram_pages++;
kernel/power/swsusp.c +1 -1
@@ -532,9 +532,9 @@ static int saveable(struct zone * zone,return 0 ; page =pfn_to_page (pfn); -BUG_ON (PageReserved (page) &&PageNosave (page));if (PageNosave (page))return 0 ; +if (PageReserved (page) &&pfn_is_nosave (pfn)) {pr_debug ("[nosave pfn 0x%lx]" , pfn);return 0 ;
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi!
Quoted 10 lines
Quoted 9 lines
Quoted 6 lines
Yes. I thought about using
PG_nosavein the begining, but there's a
BUG_ON(PageReserved(page) && PageNosave(page));in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
No, we can just kill it. It was "if something unexpected happens, bail out soon".
Quoted 6 lines
OK
The following is what I'm comfortable with. I didn't took the Nigel's patch literally, because we do one thing differently (ie nosave pfns) and it contained some changes that I thought were unnecessary. The i386 part is untested.
I'd add
kernel/power/swsusp.c static int saveable(struct zone * zone, · line 535
Quoted 2 lines
kernel/power/swsusp.c +0
-1page =pfn_to_page (pfn); -BUG_ON (PageReserved (page) &&PageNosave (page));
a comment here explaining what PageReserved && PageNosave means.
kernel/power/swsusp.c static int saveable(struct zone * zone, · line 540
Quoted 6 lines
kernel/power/swsusp.c +1
-0if (PageNosave (page))return 0 ; +if (PageReserved (page) &&pfn_is_nosave (pfn)) {pr_debug ("[nosave pfn 0x%lx]" , pfn);return 0 ;
AFAICT it only fixes "potential" bug, so it can probably wait. Once non-contiguous and initramfs patches are in, this can go...
Pavel
Signature · 2 lines
People were complaining that M$ turns users into beta-testers... ...jr ghea gurz vagb qrirybcref, naq gurl frrz gb yvxr vg gung jnl!
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
Quoted 18 lines · Pavel Machek
Hi!
Quoted 10 lines
Quoted 9 lines
Quoted 6 lines
Yes. I thought about using
PG_nosavein the begining, but there's a
BUG_ON(PageReserved(page) && PageNosave(page));in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
No, we can just kill it. It was "if something unexpected happens, bail out soon".
Quoted 6 lines
OK
The following is what I'm comfortable with. I didn't took the Nigel's patch literally, because we do one thing differently (ie nosave pfns) and it contained some changes that I thought were unnecessary. The i386 part is untested.
Quoted 6 lines
I'd add
kernel/power/swsusp.c static int saveable(struct zone * zone, · line 535
Quoted 2 lines
kernel/power/swsusp.c +0
-1page =pfn_to_page (pfn); -BUG_ON (PageReserved (page) &&PageNosave (page));a comment here explaining what PageReserved && PageNosave means.
OK, I will add the comment.
Quoted 9 lines
kernel/power/swsusp.c static int saveable(struct zone * zone, · line 540
Quoted 6 lines
kernel/power/swsusp.c +1
-0if (PageNosave (page))return 0 ; +if (PageReserved (page) &&pfn_is_nosave (pfn)) {pr_debug ("[nosave pfn 0x%lx]" , pfn);return 0 ;AFAICT it only fixes "potential" bug, so it can probably wait. Once non-contiguous and initramfs patches are in, this can go...
OK
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
In reply to Rafael J. WysockiHi.
Quoted 7 lines · Rafael J. Wysocki
Yes. I thought about using
PG_nosavein the begining, but there's a
BUG_ON(PageReserved(page) && PageNosave(page));in swsusp.c:saveable() that I just didn't want to trigger. It seems to me, though, that we don't need it any more, do we?
Quoted 6 lines
Quoted 2 lines
He also found a few places where reserved page becomes un-reserved, and you probably need to fix those, too.
Yes, I think I'll just port the Nigel's patch to x86-64. BTW, it's striking that we found similar solutions independently (I didn't know the Nigel's patch before :-)).
I should clarify credit. I didn't work on that code. I don't recall now whether it was Michael Frank or Bernard Blackham that came up with this version. (This was about a year ago IIRC).
Quoted 4 lines
Unfortunately, it turns out that the patch does not fix my problem with random reboots during resume on battery power, but I really think that we need to mark non-RAM areas with
PG_nosave, at least for sanity reasons (eg to be sure that we do not break things by dumping stuff to where we should not write to).
Yes. I believed that that's what this patch does. Since I didn't write it myself, I'm a little fuzzy on that issue. I'll bring Bernard in, perhaps he can clarify?..
Nigel
Signature · 6 lines
Nigel Cunningham Software Engineer, Canberra, Australia http://www.cyclades.com Bus: +61 (2) 6291 9554; Hme: +61 (2) 6292 8028; Mob: +61 (417) 100 574 Maintainer of Suspend2 Kernel Patches http://softwaresuspend.berlios.de
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Quoted 8 lines · Nigel Cunningham
Quoted 3 lines · Rafael J. Wysocki
Yes, I think I'll just port the Nigel's patch to x86-64. BTW, it's striking that we found similar solutions independently (I didn't know the Nigel's patch before :-)).
I should clarify credit. I didn't work on that code. I don't recall now whether it was Michael Frank or Bernard Blackham that came up with this version. (This was about a year ago IIRC).
Definitely not me, sorry :)
Bernard.
Signature · 1 line
Bernard Blackham <bernard at blackham dot com dot au>
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
In reply to Pavel MachekHi.
Quoted 10 lines · Pavel Machek
Hi!
Quoted 7 lines
Quoted 3 lines
IIRC kernel code/data is marked as
PageReserved(), that's why we need to save that :(. Not sure what to do with data e820 marked as reserved...Perhaps we need another page flag, like
PG_readonly, and mark the pages reserved by the e820 asPG_reserved|PG_readonly(the same for the areas that are not returned by e820 at all). Would that be acceptable?
Quoted 7 lines
This flags are little in the short supply, but being able to tell kernel code from memory hole seems like "must have", so yes, that looks ok.
You could get subtle and reuse some other pageflag. I do not think
PG_reservedcan havePG_locked... So using for examplePG_lockedfor this purpose should be okay.
Will something like this patch help?
Regards,
Nigel
arch/i386/mm/init.c +28 -8
@@ -27,6 +27,7 @@#include <linux/slab.h> #include <linux/proc_fs.h> #include <linux/efi.h> +#include <linux/suspend.h> #include <asm/processor.h> #include <asm/system.h>
@@ -272,12 +273,15 @@ void __init one_highpage_init(struct pag {if (page_is_ram (pfn) && !(bad_ppro &&page_kills_ppro (pfn))) {ClearPageReserved (page); +ClearPageNosave (page);set_bit (PG_highmem, &page->flags);set_page_count (page,1 );__free_page (page); totalhigh_pages++; - }else + }else {SetPageReserved (page); +SetPageNosave (page); + } }#ifndef CONFIG_DISCONTIGMEM
@@ -355,7 +359,7 @@ static void __init pagetable_init (void)#endif } -#if defined(CONFIG_PM_DISK ) || defined(CONFIG_SOFTWARE_SUSPEND ) +#ifdef CONFIG_PM /* * Swap suspend & friends need this for resume because things like the intel-agp * driver might have split up a kernel 4MB mapping.
@@ -571,6 +575,7 @@ void __init mem_init(void)int codesize, reservedpages, datasize, initsize;int tmp;int bad_ppro; +void * addr;#ifndef CONFIG_DISCONTIGMEM if (!mem_map)
@@ -601,12 +606,25 @@ void __init mem_init(void) totalram_pages +=__free_all_bootmem (); reservedpages =0 ; -for (tmp =0 ; tmp < max_low_pfn; tmp++) -/* -* Only count reserved RAM pages -*/ -if (page_is_ram (tmp) &&PageReserved (pfn_to_page (tmp))) - reservedpages++; + addr =__va (0 ); +for (tmp =0 ; tmp < max_low_pfn; tmp++, addr +=PAGE_SIZE ) { +if (page_is_ram (tmp)) { +/* +* Only count reserved RAM pages +*/ +if (PageReserved (mem_map+tmp)) + reservedpages++; +/* +* Mark nosave pages +*/ +if (addr >= (void *)&__nosave_begin && addr < (void *)&__nosave_end) +SetPageNosave (mem_map+tmp); + }else +/* +* Non-RAM pages are always nosave +*/ +SetPageNosave (mem_map+tmp); + }set_highmem_pages_init (bad_ppro);
@@ -705,6 +723,7 @@ void free_initmem(void) addr = (unsigned long )(&__init_begin);for (; addr < (unsigned long )(&__init_end); addr +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (addr)); +ClearPageNosave (virt_to_page (addr));set_page_count (virt_to_page (addr),1 );memset ((void *)addr,0xcc ,PAGE_SIZE );free_page (addr);
@@ -720,6 +739,7 @@ void free_initrd_mem(unsigned long startprintk (KERN_INFO "Freeing initrd memory: %ldk freed\n" , (end - start) >>10 );for (; start < end; start +=PAGE_SIZE ) {ClearPageReserved (virt_to_page (start)); +ClearPageNosave (virt_to_page (start));set_page_count (virt_to_page (start),1 );free_page (start); totalram_pages++;
mm/bootmem.c +4 -0
@@ -280,12 +280,14 @@ static unsigned long __init free_all_boo count +=BITS_PER_LONG ;__ClearPageReserved (page); +ClearPageNosave (page); order =ffs (BITS_PER_LONG ) -1 ;set_page_refs (page, order);for (j =1 ; j <BITS_PER_LONG ; j++) {if (j +16 <BITS_PER_LONG )prefetchw (page + j +16 );__ClearPageReserved (page + j); +ClearPageNosave (page + j); }__free_pages (page, order); i +=BITS_PER_LONG ;
@@ -296,6 +298,7 @@ static unsigned long __init free_all_booif (v & m) { count++;__ClearPageReserved (page); +ClearPageNosave (page);set_page_refs (page,0 );__free_page (page); }
@@ -316,6 +319,7 @@ static unsigned long __init free_all_boofor (i =0 ; i < ((bdata->node_low_pfn-(bdata->node_boot_start >>PAGE_SHIFT ))/8 +PAGE_SIZE -1 )/PAGE_SIZE ; i++,page++) { count++;__ClearPageReserved (page); +ClearPageNosave (page);set_page_count (page,1 );__free_page (page); }
Signature · 5 lines
Nigel Cunningham Software Engineer Cyclades Corporation http://cyclades.com
Re: BIOS overwritten during resume (was: Re: Asus L5D resume on battery power)
Hi,
On Friday, 4 of March 2005 15:21, Nigel Cunningham wrote:
[-- snip --]
Quoted 3 lines
Will something like this patch help?
[-- snip --]
I think that the changes below are unnecessary. free_all_bootmem() is actually called _before_ the loop in mem_init() in which PG_nosave is set for the first time, so there's no need to clear it earlier.
Quoted 27 lines
diff -ruNp
208-e820-table-support-old/mm/bootmem.c208-e820-table-support-new/mm/bootmem.cmm/bootmem.c +3
-0@@ -280,12 +280,14 @@ static unsigned long __init free_all_boo count +=BITS_PER_LONG ;__ClearPageReserved (page); +ClearPageNosave (page); order =ffs (BITS_PER_LONG ) -1 ;set_page_refs (page, order);for (j =1 ; j <BITS_PER_LONG ; j++) {if (j +16 <BITS_PER_LONG )prefetchw (page + j +16 );__ClearPageReserved (page + j); +ClearPageNosave (page + j); }__free_pages (page, order); i +=BITS_PER_LONG ;@@ -296,6 +298,7 @@ static unsigned long __init free_all_booif (v & m) { count++;__ClearPageReserved (page); +ClearPageNosave (page);set_page_refs (page,0 );__free_page (page); }
mm/bootmem.c static unsigned long __init free_all_boo · line 325
Quoted 7 lines
mm/bootmem.c +1
-0@@ -316,6 +319,7 @@ static unsigned long __init free_all_boofor (i =0 ; i < ((bdata->node_low_pfn-(bdata->node_boot_start >>PAGE_SHIFT ))/8 +PAGE_SIZE -1 )/PAGE_SIZE ; i++,page++) { count++;__ClearPageReserved (page); +ClearPageNosave (page);set_page_count (page,1 );__free_page (page); }
Greets,
Rafael
Signature · 3 lines
- Would you tell me, please, which way I ought to go from here? - That depends a good deal on where you want to get to. -- Lewis Carroll "Alice's Adventures in Wonderland"