Revision a6335fa11e08fc386740557b2a4c1b7ff34bc499 authored by Alexander Sverdlin on 02 July 2015, 15:16:01 UTC, committed by Ralf Baechle on 09 July 2015, 09:02:59 UTC
Commit f9a7febd leads to a fact that mapstart and therefore a page bitmap for bootmem allocator immediately follows initrd_end. This doesn't always work well on Octeon, where there are holes in PFN ranges (refer to 5b3b1688 and 4MB-aligned PFN allocation). Depending on the inird location it could happen, that mapstart would be in an area not allocated by plat_mem_setup() in arch/mips/cavium-octeon/setup.c, but in the alignment hole between initrd and the next PFN area. Later on this memory will be unconditionally made available to buddy allocator at the end of free_all_bootmem_core() (mm/bootmem.c). All of this results in Linux using the memory not designated for Linux in Octeon's plat_mem_setup(), which in turn means corruption of the memory used by another OS/baremetal code on the same SoC. It doesn't look to me as a problem of Octeon platform code, but rather as an inability of f9a7febd to deal correctly with the fragmented memory-mappings. Proposed fix moves the check for initrd address to the same calculation-loop in bootmem_init() (arch/mips/kernel/setup.c), which also accounts for kernel code location. This should result in mapstart located starting from the first PFN area after kernel code AND initrd. Signed-off-by: Alexander Sverdlin <alexander.sverdlin@nokia.com> Cc: linux-mips@linux-mips.org Cc: David Daney <david.daney@cavium.com> Cc: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Cc: Huacai Chen <chenhc@lemote.com> Cc: Andreas Herrmann <andreas.herrmann@caviumnetworks.com> Cc: Joe Perches <joe@perches.com> Cc: Steven J. Hill <Steven.Hill@imgtec.com> Cc: Yusuf Khan <yusuf.khan@nokia.com> Cc: Michael Kreuzer <michael.kreuzer@nokia.com> Cc: Aaro Koskinen <aaro.koskinen@iki.fi> Patchwork: https://patchwork.linux-mips.org/patch/10594/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
1 parent 7928eb0
File | Mode | Size |
---|---|---|
ccids | ||
Kconfig | -rw-r--r-- | 1.6 KB |
Makefile | -rw-r--r-- | 842 bytes |
ackvec.c | -rw-r--r-- | 12.4 KB |
ackvec.h | -rw-r--r-- | 4.7 KB |
ccid.c | -rw-r--r-- | 5.3 KB |
ccid.h | -rw-r--r-- | 8.7 KB |
dccp.h | -rw-r--r-- | 16.0 KB |
diag.c | -rw-r--r-- | 2.3 KB |
feat.c | -rw-r--r-- | 47.2 KB |
feat.h | -rw-r--r-- | 4.6 KB |
input.c | -rw-r--r-- | 21.6 KB |
ipv4.c | -rw-r--r-- | 28.6 KB |
ipv6.c | -rw-r--r-- | 29.6 KB |
ipv6.h | -rw-r--r-- | 754 bytes |
minisocks.c | -rw-r--r-- | 7.1 KB |
options.c | -rw-r--r-- | 16.5 KB |
output.c | -rw-r--r-- | 20.2 KB |
probe.c | -rw-r--r-- | 4.8 KB |
proto.c | -rw-r--r-- | 29.7 KB |
qpolicy.c | -rw-r--r-- | 3.4 KB |
sysctl.c | -rw-r--r-- | 2.8 KB |
timer.c | -rw-r--r-- | 7.1 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...