Date: Tue, 28 Jan 2014 14:08:39 -0800
From: Andrew Morton <akpm@linux-foundation.org>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
        Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
        "'Russell King - ARM Linux'" <linux@arm.linux.org.uk>,
        Kevin Hilman <khilman@linaro.org>, Olof Johansson <olof@lixom.net>,
        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
        Dave Hansen <dave.hansen@intel.com>,
        Santosh Shilimkar <santosh.shilimkar@ti.com>,
        linux-kernel@vger.kernel.org, Kevin Hilman <khilman@linaro.org>,
        Olof Johansson <olof@lixom.net>,
        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: Re: [PATCH] memblock: Add limit checking to memblock_virt_alloc
Message-Id: <20140128140839.733d94150b99aaf7ac08bf96@linux-foundation.org>
In-Reply-To: <1390946665-2967-1-git-send-email-yinghai@kernel.org>
References: <1390946665-2967-1-git-send-email-yinghai@kernel.org>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org

On Tue, 28 Jan 2014 14:04:25 -0800 Yinghai Lu <yinghai@kernel.org> wrote:

> In original bootmem wrapper for memblock, we have limit checking.
> 
> Add it to memblock_virt_alloc, to address arm and x86 booting crash.
> 
> ...
>
> --- linux-2.6.orig/mm/memblock.c
> +++ linux-2.6/mm/memblock.c
> @@ -1077,6 +1077,9 @@ static void * __init memblock_virt_alloc
>  	if (!align)
>  		align = SMP_CACHE_BYTES;
>  
> +	if (max_addr > memblock.current_limit)
> +		max_addr = memblock.current_limit;
> +
>  again:
>  	alloc = memblock_find_in_range_node(size, align, min_addr, max_addr,
>  					    nid);

Thanks.

Kevin, Olof and Konrad (at least) have been hitting this.  It would be
great to get some tested-by's, please?

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