Re: [PATCH] NX protection for kernel data : fix 32 bits S3 suspend

[castet.matthieu@free.fr]

[-- Attachment #1: Type: text/plain, Size: 1310 bytes --]

Selon "H. Peter Anvin" <hpa@zytor.com>:

> On 02/01/2011 10:26 PM, Ingo Molnar wrote:
> >
> > So why not call set_memory_x() in your patch? Mind trying that?
> >
> > Thanks,
> >
> > 	Ingo
>
> So I just tried that... it doesn't work.  The resulting pages still end
> up NX:
>
> ---[ Kernel Mapping ]---
> 0xc0000000-0xc00a0000         640K     RW             GLB NX pte
>
> This implies that the NX protection is applied after these allocations
> happen, which is probably why the ugly hack in static_protections() to
> set the PCI BIOS +x is there as well.
You could remove PCI BIOS +x hack in static protection, and the x mapping will
be set by set_memory_x().

The problem is that acpi_reserve_wakeup_memory is called too early, before we
build the page table with kernel_physical_mapping_init.

Doing the setting in a arch_initcall make it work.

>
> I talked to Suresh about the whole static_protections() bit, and as far
> as he recalls it is because the entire set_memory_*() interface is
> misdesigned to work on all aliases of a page, despite the fact that
> protections are per mapping, not per physical page.
The only stuff I understood of static_protections is the comment on top of it :
mapping of bios/kernel region should be on it otherwise, some callers can mess
the protection flags.


Matthieu

[-- Attachment #2: diff --]
[-- Type: application/octet-stream, Size: 705 bytes --]

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 69fd72a..1fde6ec 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -15,6 +15,7 @@
 
 #ifdef CONFIG_X86_32
 #include <asm/pgtable.h>
+#include <asm/cacheflush.h>
 #endif
 
 #include "realmode/wakeup.h"
@@ -149,6 +150,15 @@ void __init acpi_reserve_wakeup_memory(void)
 	memblock_x86_reserve_range(mem, mem + WAKEUP_SIZE, "ACPI WAKEUP");
 }
 
+#ifdef CONFIG_X86_32
+int __init acpi_configure_wakeup_memory(void)
+{
+	set_memory_x(acpi_realmode, (WAKEUP_SIZE) >> PAGE_SHIFT);
+	return 0;
+}
+arch_initcall(acpi_configure_wakeup_memory);
+#endif
+
 
 static int __init acpi_sleep_setup(char *str)
 {