Re: [PATCH] x86: Hibernate: Fix breakage on x86_32 withCONFIG_NUMA set (was: Re: CONFIG_NUMA breaks hibernation on x86-32with PAE)

[Ingo Molnar]

* Rafael J. Wysocki <rjw@xxxxxxx> wrote:

> From: Rafael J. Wysocki <rjw@xxxxxxx>
> Subject: x86: Hibernate: Fix breakage on x86_32 with CONFIG_NUMA set
> 
> The NUMA code on x86_32 creates special memory mapping that allows
> each node's pgdat to be located in this node's memory.  For this
> purpose it allocates a memory area at the end of each node's memory
> and maps this area so that it is accessible with virtual addresses
> belonging to low memory.  As a result, if there is high memory,
> these NUMA-allocated areas are physically located in high memory,
> although they are mapped to low memory addresses.
> 
> Our hibernation code does not take that into account and for this
> reason hibernation fails on all x86_32 systems with CONFIG_NUMA=y and
> with high memory present.  Fix this by adding a special mapping for
> the NUMA-allocated memory areas to the temporary page tables created
> during the last phase of resume.
> 
> Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx>
> Cc: Pavel Machek <pavel@xxxxxxx>
> Cc: Andi Kleen <andi@xxxxxxxxxxxxxx>
> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
> ---
>  arch/x86/include/asm/mmzone_32.h |    4 ++++
>  arch/x86/mm/numa_32.c            |   35 +++++++++++++++++++++++++++++++++++
>  arch/x86/power/hibernate_32.c    |    4 ++++
>  3 files changed, 43 insertions(+)

Applied to tip/x86/numa, thanks Rafael for the detective work!

	Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/