From: ard.biesheuvel@linaro.org (Ard Biesheuvel)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: ignore memory outside of the linear range
Date: Sat, 15 Aug 2015 14:13:44 +0200 [thread overview]
Message-ID: <1439640824-30498-1-git-send-email-ard.biesheuvel@linaro.org> (raw)
We need to ensure that we don't try to map system RAM ranges whose
offset relative to the start of the kernel image exceeds the size of
the linear range. This may happen even on systems that don't have
huge amounts of RAM if it is laid out very sparsely.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
This is the minimal fix for addressing the issue we discussed. I dropped
the other changes for now, let's revisit those when (if) my patches for
decoupling the kernel mapping from the linear mapping are back under
discussion.
I will leave it up to the maintainers whether this constitutes a bugfix or
not, but since this has never worked from the beginning afaict, I don't
think it belongs in stable per se.
arch/arm64/mm/init.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index ad87ce826cce..c65e57d4c3e7 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -158,6 +158,19 @@ early_param("mem", early_mem);
void __init arm64_memblock_init(void)
{
+ /*
+ * Remove the memory that we will not be able to cover
+ * with the linear mapping.
+ */
+ const s64 linear_region_size = -(s64)PAGE_OFFSET;
+
+ if (memstart_addr + linear_region_size < memblock_end_of_DRAM()) {
+ pr_warn("Ignoring memory outside of linear range (0x%012llx - 0x%012llx)\n",
+ memstart_addr + linear_region_size,
+ (u64)memblock_end_of_DRAM() - 1);
+ memblock_remove(memstart_addr + linear_region_size, ULLONG_MAX);
+ }
+
memblock_enforce_memory_limit(memory_limit);
/*
--
1.9.1
next reply other threads:[~2015-08-15 12:13 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-15 12:13 Ard Biesheuvel [this message]
2015-08-17 9:43 ` [PATCH] arm64: ignore memory outside of the linear range Will Deacon
2015-08-17 10:35 ` Ard Biesheuvel
2015-08-17 10:53 ` Will Deacon
2015-08-17 10:55 ` Ard Biesheuvel
2015-08-17 11:11 ` Will Deacon
2015-08-17 10:40 ` Catalin Marinas
2015-08-17 10:44 ` Ard Biesheuvel
2015-08-17 11:04 ` Catalin Marinas
2015-08-17 11:06 ` Ard Biesheuvel
2015-08-17 12:07 ` Catalin Marinas
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=1439640824-30498-1-git-send-email-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
/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).