[PATCH v8 14/16] ARM: LPAE: mark memory banks with start > ULONG_MAX as highmem

[Nicolas Pitre]

On Mon, 7 Nov 2011, Catalin Marinas wrote:

> From: Will Deacon <will.deacon at arm.com>
> 
> Memory banks living outside of the 32-bit physical address
> space do not have a 1:1 pa <-> va mapping and therefore the
> __va macro may wrap.
> 
> This patch ensures that such banks are marked as highmem so
> that the Kernel doesn't try to split them up when it sees that
> the wrapped virtual address overlaps the vmalloc space.
> 
> Signed-off-by: Will Deacon <will.deacon at arm.com>
> Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>

Acked-by: Nicolas Pitre <nico at linaro.org>


> ---
>  arch/arm/mm/mmu.c |   16 +++++++++++++++-
>  1 files changed, 15 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 1935311..b836d6b 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -799,6 +799,9 @@ void __init sanity_check_meminfo(void)
>  		struct membank *bank = &meminfo.bank[j];
>  		*bank = meminfo.bank[i];
>  
> +		if (bank->start > ULONG_MAX)
> +			highmem = 1;
> +
>  #ifdef CONFIG_HIGHMEM
>  		if (__va(bank->start) >= vmalloc_min ||
>  		    __va(bank->start) < (void *)PAGE_OFFSET)
> @@ -810,7 +813,7 @@ void __init sanity_check_meminfo(void)
>  		 * Split those memory banks which are partially overlapping
>  		 * the vmalloc area greatly simplifying things later.
>  		 */
> -		if (__va(bank->start) < vmalloc_min &&
> +		if (!highmem && __va(bank->start) < vmalloc_min &&
>  		    bank->size > vmalloc_min - __va(bank->start)) {
>  			if (meminfo.nr_banks >= NR_BANKS) {
>  				printk(KERN_CRIT "NR_BANKS too low, "
> @@ -831,6 +834,17 @@ void __init sanity_check_meminfo(void)
>  		bank->highmem = highmem;
>  
>  		/*
> +		 * Highmem banks not allowed with !CONFIG_HIGHMEM.
> +		 */
> +		if (highmem) {
> +			printk(KERN_NOTICE "Ignoring RAM at %.8llx-%.8llx "
> +			       "(!CONFIG_HIGHMEM).\n",
> +			       (unsigned long long)bank->start,
> +			       (unsigned long long)bank->start + bank->size - 1);
> +			continue;
> +		}
> +
> +		/*
>  		 * Check whether this memory bank would entirely overlap
>  		 * the vmalloc area.
>  		 */
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>