From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jinyang He <hejinyang@loongson.cn>,
Jiaxun Yang <jiaxun.yang@flygoat.com>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Sasha Levin <sashal@kernel.org>,
linux-mips@vger.kernel.org
Subject: [PATCH AUTOSEL 5.7 08/24] MIPS: Fix unable to reserve memory for Crash kernel
Date: Wed, 19 Aug 2020 20:01:39 -0400 [thread overview]
Message-ID: <20200820000155.215089-8-sashal@kernel.org> (raw)
In-Reply-To: <20200820000155.215089-1-sashal@kernel.org>
From: Jinyang He <hejinyang@loongson.cn>
[ Upstream commit b1ce9716f3b5ed3b49badf1f003b9e34b7ead0f9 ]
Use 0 as the align parameter in memblock_find_in_range() is
incorrect when we reserve memory for Crash kernel.
The environment as follows:
[ 0.000000] MIPS: machine is loongson,loongson64c-4core-rs780e
...
[ 1.951016] crashkernel=64M@128M
The warning as follows:
[ 0.000000] Invalid memory region reserved for crash kernel
And the iomem as follows:
00200000-0effffff : System RAM
04000000-0484009f : Kernel code
048400a0-04ad7fff : Kernel data
04b40000-05c4c6bf : Kernel bss
1a000000-1bffffff : pci@1a000000
...
The align parameter may be finally used by round_down() or round_up().
Like the following call tree:
mips-next: mm/memblock.c
memblock_find_in_range
└── memblock_find_in_range_node
├── __memblock_find_range_bottom_up
│ └── round_up
└── __memblock_find_range_top_down
└── round_down
\#define round_up(x, y) ((((x)-1) | __round_mask(x, y))+1)
\#define round_down(x, y) ((x) & ~__round_mask(x, y))
\#define __round_mask(x, y) ((__typeof__(x))((y)-1))
The round_down(or round_up)'s second parameter must be a power of 2.
If the second parameter is 0, it both will return 0.
Use 1 as the parameter to fix the bug and the iomem as follows:
00200000-0effffff : System RAM
04000000-0484009f : Kernel code
048400a0-04ad7fff : Kernel data
04b40000-05c4c6bf : Kernel bss
08000000-0bffffff : Crash kernel
1a000000-1bffffff : pci@1a000000
...
Signed-off-by: Jinyang He <hejinyang@loongson.cn>
Reviewed-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
arch/mips/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 573509e0f2d4e..3ace115740dd1 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -497,7 +497,7 @@ static void __init mips_parse_crashkernel(void)
if (ret != 0 || crash_size <= 0)
return;
- if (!memblock_find_in_range(crash_base, crash_base + crash_size, crash_size, 0)) {
+ if (!memblock_find_in_range(crash_base, crash_base + crash_size, crash_size, 1)) {
pr_warn("Invalid memory region reserved for crash kernel\n");
return;
}
--
2.25.1
next prev parent reply other threads:[~2020-08-20 0:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-20 0:01 [PATCH AUTOSEL 5.7 01/24] scsi: ufs: Add DELAY_BEFORE_LPM quirk for Micron devices Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 02/24] scsi: target: tcmu: Fix crash in tcmu_flush_dcache_range on ARM Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 03/24] media: budget-core: Improve exception handling in budget_register() Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 04/24] f2fs: fix to check page dirty status before writeback Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 05/24] rtc: goldfish: Enable interrupt in set_alarm() when necessary Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 06/24] media: vpss: clean up resources in init Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 07/24] Input: psmouse - add a newline when printing 'proto' by sysfs Sasha Levin
2020-08-20 0:01 ` Sasha Levin [this message]
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 09/24] m68knommu: fix overwriting of bits in ColdFire V3 cache control Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 10/24] svcrdma: Fix another Receive buffer leak Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 11/24] xfs: fix inode quota reservation checks Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 12/24] drm/ttm: fix offset in VMAs with a pg_offs in ttm_bo_vm_access Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 13/24] riscv: Fixup static_obj() fail Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 14/24] jffs2: fix UAF problem Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 15/24] ceph: fix use-after-free for fsc->mdsc Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 16/24] swiotlb-xen: use vmalloc_to_page on vmalloc virt addresses Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 17/24] cpufreq: intel_pstate: Fix cpuinfo_max_freq when MSR_TURBO_RATIO_LIMIT is 0 Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 18/24] scsi: libfc: Free skb in fc_disc_gpn_id_resp() for valid cases Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 19/24] virtio_ring: Avoid loop when vq is broken in virtqueue_poll Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 20/24] media: camss: fix memory leaks on error handling paths in probe Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 21/24] tools/testing/selftests/cgroup/cgroup_util.c: cg_read_strcmp: fix null pointer dereference Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 22/24] xfs: Fix UBSAN null-ptr-deref in xfs_sysfs_init Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 23/24] alpha: fix annotation of io{read,write}{16,32}be() Sasha Levin
2020-08-20 0:01 ` [PATCH AUTOSEL 5.7 24/24] fs/signalfd.c: fix inconsistent return codes for signalfd4 Sasha Levin
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=20200820000155.215089-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=hejinyang@loongson.cn \
--cc=jiaxun.yang@flygoat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tsbogend@alpha.franken.de \
/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
Powered by JetHome