Messages in this thread | | | Subject | Re: -tip tree resume fail, bisect to 5bd5a45(x86: Add NX protection for kernel data) | From | Peter Zijlstra <> | Date | Mon, 22 Nov 2010 17:35:58 +0100 |
| |
On Mon, 2010-11-22 at 17:29 +0100, castet.matthieu@free.fr wrote: > Hi, > > Quoting Peter Zijlstra <peterz@infradead.org>: > > > On Mon, 2010-11-22 at 15:23 +0800, Lin Ming wrote: > > > Hi, all > > > > > > Current -tip tree(92c883a) fail to resume after suspend to mem. > > > Bisect to commit 5bd5a45(x86: Add NX protection for kernel data). > > > > Drad, if only I'd looked at LKML before I did the bisection myself.. > > > > > commit 5bd5a452662bc37c54fb6828db1a3faf87e6511c > > > Author: Matthieu Castet <castet.matthieu@free.fr> > > > Date: Tue Nov 16 22:31:26 2010 +0100 > > > > > > x86: Add NX protection for kernel data > > > > > > > > > I did some debug and found the regression is caused by below line. > > > > > > - set_memory_nx(rodata_start, (end - rodata_start) >> PAGE_SHIFT); > > > + set_memory_nx(rodata_start, (kernel_end - rodata_start) >> > > PAGE_SHIFT); > > > > > > Confirmed, with that hunk reverted my machine works again.. > > > Ok, > I will submit a proper fix : > in acpi_save_state_mem/acpi_restore_state_mem make the trampoline X or NX.
That seems to be a S3 specific code path, that won't fix anything. Simply do:
echo 0 > /sys/devices/system/cpu/cpu1/online; echo 1 > /sys/devices/system/cpu/cpu1/online;
and your machine will explode..
| |