MIPS: TXx9: Fix boot crash in free_initmem()
PATCH 1/1 MIPS: TXx9: Fix boot crash in free_initmem()
On rbtx4927:
BUG: Bad page state in process swapper pfn:00001
page:804b7820 refcount:0 mapcount:-128 mapping:00000000 index:0x1
flags: 0x0()
raw: 00000000 00000100 00000200 00000000 00000001 00000000 ffffff7f 00000000
page dumped because: nonzero mapcount
Modules linked in:
CPU: 0 PID: 1 Comm: swapper Not tainted 5.2.0-rc1-rbtx4927-00468-g3c05ea3d4077b756 #141
Stack : 00000000 10008400 8040dc4c 87c1b974 8044af63 8040dc4c 00000001 804a3490
00000001 81000000 0030f231 80148558 00000003 10008400 87c1dd80 3d0f9a2c
00000000 00000000 804b0000 00000000 00000007 00000000 00000081 00000000
62722d31 00000080 804b0000 39347874 00000000 804b7820 8040ce18 81000010
00000001 00000007 00000001 81000000 00000018 8021de24 00000000 804a0000
...
Call Trace:
[<8010adec>] show_stack+0x74/0x104
[<801a5e44>] bad_page+0x130/0x138
[<801a654c>] free_pcppages_bulk+0x17c/0x3b0
[<801a789c>] free_unref_page+0x40/0x68
[<801120f4>] free_init_pages+0xec/0x104
[<803bdde8>] free_initmem+0x10/0x58
[<803bdb8c>] kernel_init+0x20/0x100
[<801057c8>] ret_from_kernel_thread+0x14/0x1cAs of commit b93ddc4f9156205e ("mips: Reserve memory for the kernel image resources"), bootmem_init() no longer reserves the memory below the kernel, while prom_free_prom_memory() still frees it.
Fix this by reverting commit b6263ff2d6e58cc2 ("MIPS: TXx9: Implement prom_free_prom_memory").
---
Looks like arch/mips/dec/prom/memory.c needs a similar but more complicated fix, due to declance handling?
--- arch/mips/txx9/generic/setup.c | 6 ------ 1 file changed, 6 deletions(-)
arch/mips/txx9/generic/setup.c +0 -6
@@ -33,7 +33,6 @@#include <asm/time.h> #include <asm/reboot.h> #include <asm/r4kcache.h> -#include <asm/sections.h> #include <asm/setup.h> #include <asm/txx9/generic.h> #include <asm/txx9/pci.h>
@@ -343,11 +342,6 @@ void __init prom_init(void)void __init prom_free_prom_memory (void ) { -unsigned long saddr =PAGE_SIZE ; -unsigned long eaddr =__pa_symbol (&_text); - -if (saddr < eaddr) -free_init_pages ("prom memory" , saddr, eaddr); }const char *get_system_type (void )
Signature · 1 line
2.17.1
Quoted 2 lines · Geert Uytterhoeven
Looks like
arch/mips/dec/prom/memory.cneeds a similar but more complicated fix, due to declance handling?
Thanks for the heads-up! I think the declance hack should go away. It
should have gone long ago, but ISTR there used to be a problem with making such a large contiguous physical memory allocation in the modular case. Maybe it's not anymore these days. I'll look into it when I get a chance to poke at hardware, which I have no access to at the moment.
Maciej
Quoted 1 line · Geert Uytterhoeven
On rbtx4927:
...
Quoted 10 lines
As of commit
b93ddc4f9156205e("mips: Reserve memory for the kernel image resources"),bootmem_init()no longer reserves the memory below the kernel, whileprom_free_prom_memory()still frees it.Fix this by reverting commit
b6263ff2d6e58cc2("MIPS: TXx9: Implementprom_free_prom_memory").Suggested-by Serge Semin <[email protected]>Fixes b93ddc4f9156205e ("mips: Reserve memory for the kernel image resources")Signed-off-by Geert Uytterhoeven <[email protected]>
Thank you for fixing this. It looks OK for me.
---
Atsushi Nemoto
Paul Burton
AppliedHello,
Quoted 29 lines · Geert Uytterhoeven
On rbtx4927:
BUG: Bad page state in process swapper pfn:00001 page:804b7820 refcount:0 mapcount:-128 mapping:00000000 index:0x1 flags: 0x0() raw: 00000000 00000100 00000200 00000000 00000001 00000000 ffffff7f 00000000 page dumped because: nonzero mapcount Modules linked in: CPU: 0 PID: 1 Comm: swapper Not tainted 5.2.0-rc1-rbtx4927-00468-g3c05ea3d4077b756 #141Stack : 00000000 10008400
8040dc4c87c1b9748044af638040dc4c00000001804a349000000001 810000000030f23180148558 00000003 1000840087c1dd803d0f9a2c00000000 00000000804b000000000000 00000007 00000000 00000081 0000000062722d3100000080804b000039347874 00000000804b78208040ce1881000010 00000001 00000007 00000001 81000000 000000188021de2400000000804a0000
...Call Trace: [<8010adec>] show_stack+0x74/0x104 [<801a5e44>] bad_page+0x130/0x138 [<801a654c>] free_pcppages_bulk+0x17c/0x3b0 [<801a789c>] free_unref_page+0x40/0x68 [<801120f4>] free_init_pages+0xec/0x104 [<803bdde8>] free_initmem+0x10/0x58 [<803bdb8c>] kernel_init+0x20/0x100 [<801057c8>] ret_from_kernel_thread+0x14/0x1cAs of commit
b93ddc4f9156205e("mips: Reserve memory for the kernel image resources"),bootmem_init()no longer reserves the memory below the kernel, whileprom_free_prom_memory()still frees it.
Quoted 7 lines
Fix this by reverting commit
b6263ff2d6e58cc2("MIPS: TXx9: Implementprom_free_prom_memory").Suggested-by Serge Semin <[email protected]>Fixes b93ddc4f9156205e ("mips: Reserve memory for the kernel image resources")Signed-off-by Geert Uytterhoeven <[email protected]>Reviewed-by Atsushi Nemoto <[email protected]>
Applied to mips-fixes.
Thanks,
Paul
[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]