From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f176.google.com (mail-pd0-f176.google.com [209.85.192.176]) by kanga.kvack.org (Postfix) with ESMTP id 982266B0035 for ; Mon, 15 Sep 2014 01:11:22 -0400 (EDT) Received: by mail-pd0-f176.google.com with SMTP id y13so5440292pdi.7 for ; Sun, 14 Sep 2014 22:11:22 -0700 (PDT) Received: from cnbjrel02.sonyericsson.com (cnbjrel02.sonyericsson.com. [219.141.167.166]) by mx.google.com with ESMTPS id qo10si20633258pac.133.2014.09.14.22.11.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 14 Sep 2014 22:11:21 -0700 (PDT) From: "Wang, Yalin" Date: Mon, 15 Sep 2014 13:11:14 +0800 Subject: [RFC] arm:extend the reserved mrmory for initrd to be page aligned Message-ID: <35FD53F367049845BC99AC72306C23D103D6DB4915FC@CNBJMBX05.corpusers.net> Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: owner-linux-mm@kvack.org List-ID: To: 'Will Deacon' , "'linux@arm.linux.org.uk'" , "'linux-kernel@vger.kernel.org'" , "'linux-arm-kernel@lists.infradead.org'" , "'linux-mm@kvack.org'" , "linux-arm-msm@vger.kernel.org" this patch extend the start and end address of initrd to be page aligned, so that we can free all memory including the un-page aligned head or tail page of initrd, if the start or end address of initrd are not page aligned, the page can't be freed by free_initrd_mem() function. Signed-off-by: Yalin Wang --- arch/arm/mm/init.c | 20 ++++++++++++++------ arch/arm64/mm/init.c | 37 +++++++++++++++++++++++++++++++++---- 2 files changed, 47 insertions(+), 10 deletions(-) diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c index 659c75d..6c1db07 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c @@ -288,7 +288,12 @@ void __init arm_memblock_init(const struct machine_des= c *mdesc) phys_initrd_start =3D __virt_to_phys(initrd_start); phys_initrd_size =3D initrd_end - initrd_start; } - initrd_start =3D initrd_end =3D 0; + + /* make sure the start and end address are page aligned */ + phys_initrd_size =3D round_up(phys_initrd_start + phys_initrd_size, PAGE_= SIZE); + phys_initrd_start =3D round_down(phys_initrd_start, PAGE_SIZE); + phys_initrd_size -=3D phys_initrd_start; + if (phys_initrd_size && !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) { pr_err("INITRD: 0x%08llx+0x%08lx is not a memory region - disabling init= rd\n", @@ -301,13 +306,11 @@ void __init arm_memblock_init(const struct machine_de= sc *mdesc) (u64)phys_initrd_start, phys_initrd_size); phys_initrd_start =3D phys_initrd_size =3D 0; } - if (phys_initrd_size) { + if (phys_initrd_size) memblock_reserve(phys_initrd_start, phys_initrd_size); + else + initrd_start =3D initrd_end =3D 0; =20 - /* Now convert initrd to virtual addresses */ - initrd_start =3D __phys_to_virt(phys_initrd_start); - initrd_end =3D initrd_start + phys_initrd_size; - } #endif =20 arm_mm_memblock_reserve(); @@ -636,6 +639,11 @@ static int keep_initrd; void free_initrd_mem(unsigned long start, unsigned long end) { if (!keep_initrd) { + if (start =3D=3D initrd_start) + start =3D round_down(start, PAGE_SIZE); + if (end =3D=3D initrd_end) + end =3D round_up(end, PAGE_SIZE); + poison_init_mem((void *)start, PAGE_ALIGN(end) - start); free_reserved_area((void *)start, (void *)end, -1, "initrd"); } diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index 5472c24..9dfd9a6 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -138,15 +138,38 @@ static void arm64_memory_present(void) void __init arm64_memblock_init(void) { phys_addr_t dma_phys_limit =3D 0; - + phys_addr_t phys_initrd_start; + phys_addr_t phys_initrd_size; /* * Register the kernel text, kernel data, initrd, and initial * pagetables with memblock. */ memblock_reserve(__pa(_text), _end - _text); #ifdef CONFIG_BLK_DEV_INITRD - if (initrd_start) - memblock_reserve(__virt_to_phys(initrd_start), initrd_end - initrd_start= ); + if (initrd_start) { + phys_initrd_start =3D __virt_to_phys(initrd_start); + phys_initrd_size =3D initrd_end - initrd_start; + /* make sure the start and end address are page aligned */ + phys_initrd_size =3D round_up(phys_initrd_start + phys_initrd_size, PAGE= _SIZE); + phys_initrd_start =3D round_down(phys_initrd_start, PAGE_SIZE); + phys_initrd_size -=3D phys_initrd_start; + if (phys_initrd_size && + !memblock_is_region_memory(phys_initrd_start, phys_initrd_size)) { + pr_err("INITRD: %pa+%pa is not a memory region - disabling initrd\n", + &phys_initrd_start, &phys_initrd_size); + phys_initrd_start =3D phys_initrd_size =3D 0; + } + if (phys_initrd_size && + memblock_is_region_reserved(phys_initrd_start, phys_initrd_size)) { + pr_err("INITRD: %pa+%pa overlaps in-use memory region - disabling initr= d\n", + &phys_initrd_start, &phys_initrd_size); + phys_initrd_start =3D phys_initrd_size =3D 0; + } + if (phys_initrd_size) + memblock_reserve(phys_initrd_start, phys_initrd_size); + else + initrd_start =3D initrd_end =3D 0; + } #endif =20 if (!efi_enabled(EFI_MEMMAP)) @@ -334,8 +357,14 @@ static int keep_initrd; =20 void free_initrd_mem(unsigned long start, unsigned long end) { - if (!keep_initrd) + if (!keep_initrd) { + if (start =3D=3D initrd_start) + start =3D round_down(start, PAGE_SIZE); + if (end =3D=3D initrd_end) + end =3D round_up(end, PAGE_SIZE); + free_reserved_area((void *)start, (void *)end, 0, "initrd"); + } } =20 static int __init keepinitrd_setup(char *__unused) --=20 2.1.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org