Linux-ARM-Kernel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: chenzhou10@huawei.com (Chen Zhou)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: kdump: fix out of memory issue in __alloc_bootmem_low
Date: Sun, 20 May 2018 20:20:39 +0800	[thread overview]
Message-ID: <1526818839-8497-1-git-send-email-chenzhou10@huawei.com> (raw)

From: Mao Wenan <maowenan@huawei.com>

On arm64 kdump capture kernel, ACPI runtime code and data are outside
of usable memory range and __alloc_bootmem_low may alloc memory below
4G. If we use "crashkernel=Y[@X]" and the start address is above 4G,
there will be out of memory.

In this patch, we get max_zone_dma_phys by memblock_start_of_DRAM
and __pa_symbol(_end).

Signed-off-by: Chen Zhou <chenzhou10@huawei.com>
---
 arch/arm64/mm/init.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 1b18b47..df4d212 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -223,7 +223,8 @@ static void __init reserve_elfcorehdr(void)
  */
 static phys_addr_t __init max_zone_dma_phys(void)
 {
-	phys_addr_t offset = memblock_start_of_DRAM() & GENMASK_ULL(63, 32);
+	phys_addr_t offset = max(memblock_start_of_DRAM(), __pa_symbol(_end)) &
+		GENMASK_ULL(63, 32);
 	return min(offset + (1ULL << 32), memblock_end_of_DRAM());
 }
 
-- 
1.8.3

             reply	other threads:[~2018-05-20 12:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-20 12:20 Chen Zhou [this message]
2018-05-21 11:45 ` [PATCH] arm64: kdump: fix out of memory issue in __alloc_bootmem_low Robin Murphy

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=1526818839-8497-1-git-send-email-chenzhou10@huawei.com \
    --to=chenzhou10@huawei.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox