From: opendmb@gmail.com (Doug Berger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: memblock limit must be pmd-aligned
Date: Mon, 26 Jun 2017 10:23:15 -0700 [thread overview]
Message-ID: <20170626172315.26369-1-opendmb@gmail.com> (raw)
There is a path through the adjust_lowmem_bounds() routine where if all
memory regions start and end on pmd-aligned addresses the memblock_limit
will be set to arm_lowmem_limit.
However, since arm_lowmem_limit can be affected by the vmalloc early
parameter, the value of arm_lowmem_limit may not be pmd-aligned. This
commit corrects this oversight such that memblock_limit is always rounded
down to pmd-alignment.
The pmd containing arm_lowmem_limit is cleared by prepare_page_table()
and without this commit it is possible for early_alloc() to allocate
unmapped memory in that range when mapping the lowmem.
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
arch/arm/mm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 31af3cb59a60..2ae4f9c9d757 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1226,7 +1226,7 @@ void __init adjust_lowmem_bounds(void)
if (memblock_limit)
memblock_limit = round_down(memblock_limit, PMD_SIZE);
if (!memblock_limit)
- memblock_limit = arm_lowmem_limit;
+ memblock_limit = round_down(arm_lowmem_limit, PMD_SIZE);
if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {
if (memblock_end_of_DRAM() > arm_lowmem_limit) {
--
2.13.0
WARNING: multiple messages have this Message-ID (diff)
From: Doug Berger <opendmb@gmail.com>
To: linux@armlinux.org.uk
Cc: labbott@redhat.com, ard.biesheuvel@linaro.org,
nicolas.pitre@linaro.org, tixy@linaro.org, f.fainelli@gmail.com,
keescook@chromium.org, marc.zyngier@arm.com,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Doug Berger <opendmb@gmail.com>
Subject: [PATCH] ARM: memblock limit must be pmd-aligned
Date: Mon, 26 Jun 2017 10:23:15 -0700 [thread overview]
Message-ID: <20170626172315.26369-1-opendmb@gmail.com> (raw)
There is a path through the adjust_lowmem_bounds() routine where if all
memory regions start and end on pmd-aligned addresses the memblock_limit
will be set to arm_lowmem_limit.
However, since arm_lowmem_limit can be affected by the vmalloc early
parameter, the value of arm_lowmem_limit may not be pmd-aligned. This
commit corrects this oversight such that memblock_limit is always rounded
down to pmd-alignment.
The pmd containing arm_lowmem_limit is cleared by prepare_page_table()
and without this commit it is possible for early_alloc() to allocate
unmapped memory in that range when mapping the lowmem.
Signed-off-by: Doug Berger <opendmb@gmail.com>
---
arch/arm/mm/mmu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 31af3cb59a60..2ae4f9c9d757 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1226,7 +1226,7 @@ void __init adjust_lowmem_bounds(void)
if (memblock_limit)
memblock_limit = round_down(memblock_limit, PMD_SIZE);
if (!memblock_limit)
- memblock_limit = arm_lowmem_limit;
+ memblock_limit = round_down(arm_lowmem_limit, PMD_SIZE);
if (!IS_ENABLED(CONFIG_HIGHMEM) || cache_is_vipt_aliasing()) {
if (memblock_end_of_DRAM() > arm_lowmem_limit) {
--
2.13.0
next reply other threads:[~2017-06-26 17:23 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 17:23 Doug Berger [this message]
2017-06-26 17:23 ` [PATCH] ARM: memblock limit must be pmd-aligned Doug Berger
2017-06-26 23:43 ` Laura Abbott
2017-06-26 23:43 ` Laura Abbott
2017-06-27 0:50 ` Doug Berger
2017-06-27 0:50 ` Doug Berger
2017-06-27 10:59 ` Mark Rutland
2017-06-27 10:59 ` Mark Rutland
2017-06-27 16:57 ` Doug Berger
2017-06-27 16:57 ` Doug Berger
2017-06-27 17:03 ` Russell King - ARM Linux
2017-06-27 17:03 ` Russell King - ARM Linux
2017-06-27 17:14 ` Mark Rutland
2017-06-27 17:14 ` Mark Rutland
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=20170626172315.26369-1-opendmb@gmail.com \
--to=opendmb@gmail.com \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.