diff options
| author | Andrea Arcangeli | 2019-06-25 16:17:27 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2019-07-15 06:55:58 +0200 |
| commit | 03800e0526ee25ed7c843ca1e57b69ac2a5af642 (patch) | |
| tree | 84ae3ecd08d32fcb55c7b63b01d7a61d7d074c21 /arch/powerpc/mm | |
| parent | KVM: PPC: Book3S HV: Save and restore guest visible PSSCR bits on pseries (diff) | |
| download | kernel-qcow2-linux-03800e0526ee25ed7c843ca1e57b69ac2a5af642.tar.gz kernel-qcow2-linux-03800e0526ee25ed7c843ca1e57b69ac2a5af642.tar.xz kernel-qcow2-linux-03800e0526ee25ed7c843ca1e57b69ac2a5af642.zip | |
powerpc: fix off by one in max_zone_pfn initialization for ZONE_DMA
25078dc1f74be16b858e914f52cc8f4d03c2271a first introduced an off by
one error in the ZONE_DMA initialization of PPC_BOOK3E_64=y and since
9739ab7eda459f0669ec9807e0d9be5020bab88c the off by one applies to
PPC32=y too. This simply corrects the off by one and should resolve
crashes like below:
[ 65.179101] page 0x7fff outside node 0 zone DMA [ 0x0 - 0x7fff ]
Unfortunately in various MM places "max" means a non inclusive end of
range. free_area_init_nodes max_zone_pfn parameter is one case and
MAX_ORDER is another one (unrelated) that comes by memory.
Reported-by: Zorro Lang <zlang@redhat.com>
Fixes: 25078dc1f74b ("powerpc: use mm zones more sensibly")
Fixes: 9739ab7eda45 ("powerpc: enable a 30-bit ZONE_DMA for 32-bit pmac")
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20190625141727.2883-1-aarcange@redhat.com
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 6d5f0fc76666..b6beb86e5300 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c @@ -249,7 +249,7 @@ void __init paging_init(void) #ifdef CONFIG_ZONE_DMA max_zone_pfns[ZONE_DMA] = min(max_low_pfn, - ((1UL << ARCH_ZONE_DMA_BITS) - 1) >> PAGE_SHIFT); + 1UL << (ARCH_ZONE_DMA_BITS - PAGE_SHIFT)); #endif max_zone_pfns[ZONE_NORMAL] = max_low_pfn; #ifdef CONFIG_HIGHMEM |