From: "Wang, Yalin" <Yalin.Wang@sonymobile.com>
To: "'Will Deacon'" <will.deacon@arm.com>,
"'linux-kernel@vger.kernel.org'" <linux-kernel@vger.kernel.org>,
"'linux-arm-kernel@lists.infradead.org'"
<linux-arm-kernel@lists.infradead.org>,
"'linux-mm@kvack.org'" <linux-mm@kvack.org>,
"'linux-arm-msm@vger.kernel.org'" <linux-arm-msm@vger.kernel.org>,
"'Russell King - ARM Linux'" <linux@arm.linux.org.uk>,
"'Uwe Kleine-König'" <u.kleine-koenig@pengutronix.de>,
"'Catalin Marinas'" <Catalin.Marinas@arm.com>
Cc: DL-WW-ContributionOfficers-Linux
<DL-WW-ContributionOfficers-Linux@sonymobile.com>
Subject: [PATCH resend] arm:extend the reserved memory for initrd to be page aligned
Date: Fri, 19 Sep 2014 15:09:47 +0800 [thread overview]
Message-ID: <35FD53F367049845BC99AC72306C23D103D6DB49161F@CNBJMBX05.corpusers.net> (raw)
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 <yalin.wang@sonymobile.com>
---
arch/arm/mm/init.c | 5 +++++
arch/arm64/mm/init.c | 8 +++++++-
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 659c75d..9221645 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -636,6 +636,11 @@ static int keep_initrd;
void free_initrd_mem(unsigned long start, unsigned long end)
{
if (!keep_initrd) {
+ if (start == initrd_start)
+ start = round_down(start, PAGE_SIZE);
+ if (end == initrd_end)
+ end = 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..c5512f6 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -334,8 +334,14 @@ static int keep_initrd;
void free_initrd_mem(unsigned long start, unsigned long end)
{
- if (!keep_initrd)
+ if (!keep_initrd) {
+ if (start == initrd_start)
+ start = round_down(start, PAGE_SIZE);
+ if (end == initrd_end)
+ end = round_up(end, PAGE_SIZE);
+
free_reserved_area((void *)start, (void *)end, 0, "initrd");
+ }
}
static int __init keepinitrd_setup(char *__unused)
--
2.1.0
next reply other threads:[~2014-09-19 7:09 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-19 7:09 Wang, Yalin [this message]
2014-09-19 10:00 ` [PATCH resend] arm:extend the reserved memory for initrd to be page aligned Catalin Marinas
2014-09-25 14:31 ` Russell King - ARM Linux
2014-09-25 15:44 ` Catalin Marinas
2014-09-26 2:40 ` Wang, Yalin
2014-09-29 19:21 ` Valdis.Kletnieks
2014-09-30 7:02 ` Uwe Kleine-König
2014-09-30 9:24 ` Valdis.Kletnieks
2014-09-30 9:59 ` Russell King - ARM Linux
2014-09-28 1:50 ` Wang, Yalin
2014-09-26 1:56 ` Wang, Yalin
2014-10-08 11:54 ` Geert Uytterhoeven
2014-10-09 7:25 ` Wang, Yalin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=35FD53F367049845BC99AC72306C23D103D6DB49161F@CNBJMBX05.corpusers.net \
--to=yalin.wang@sonymobile.com \
--cc=Catalin.Marinas@arm.com \
--cc=DL-WW-ContributionOfficers-Linux@sonymobile.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@arm.linux.org.uk \
--cc=u.kleine-koenig@pengutronix.de \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).