Re: [PATCH] mm, kasan: don't poison boot memory
From: George Kennedy <hidden>
Date: 2021-02-23 21:48:50
Also in:
linux-mm, lkml
Possibly related (same subject, not in this thread)
- 2021-02-23 · Re: [PATCH] mm, kasan: don't poison boot memory · George Kennedy <hidden>
- 2021-02-23 · Re: [PATCH] mm, kasan: don't poison boot memory · Mike Rapoport <hidden>
- 2021-02-23 · Re: [PATCH] mm, kasan: don't poison boot memory · George Kennedy <hidden>
- 2021-02-23 · Re: [PATCH] mm, kasan: don't poison boot memory · Mike Rapoport <hidden>
- 2021-02-23 · Re: [PATCH] mm, kasan: don't poison boot memory · Mike Rapoport <hidden>
On 2/23/2021 4:32 PM, Mike Rapoport wrote:
quoted hunk ↗ jump to hunk
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 7bdc0239a943..c118dd54a747 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c@@ -1551,6 +1551,7 @@ void __init acpi_boot_table_init(void) if (acpi_disabled) return; +#if 0 /* * Initialize the ACPI boot-time table parser. */@@ -1558,6 +1559,7 @@ void __init acpi_boot_table_init(void) disable_acpi(); return; } +#endif acpi_table_parse(ACPI_SIG_BOOT, acpi_parse_sbf);diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d883176ef2ce..c8a07a7b9577 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c@@ -1032,6 +1032,14 @@ void __init setup_arch(char **cmdline_p) */ find_smp_config(); + /* + * Initialize the ACPI boot-time table parser. + */ + if (acpi_table_init()) { + disable_acpi(); + return; + } + reserve_ibft_region(); early_alloc_pgt_buf();diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c index 64bb94523281..1be7481d5c69 100644 --- a/drivers/firmware/iscsi_ibft_find.c +++ b/drivers/firmware/iscsi_ibft_find.c@@ -80,6 +80,27 @@ static int __init find_ibft_in_mem(void) done: return len; } + +static void __init acpi_find_ibft_region(unsigned long *sizep) +{ + int i; + struct acpi_table_header *table = NULL; + acpi_status status; + + if (acpi_disabled) + return; + + for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++) { + status = acpi_get_table(ibft_signs[i].sign, 0, &table); + if (ACPI_SUCCESS(status)) { + ibft_addr = (struct acpi_table_ibft *)table; + *sizep = PAGE_ALIGN(ibft_addr->header.length); + acpi_put_table(table); + break; + } + } +} + /* * Routine used to find the iSCSI Boot Format Table. The logical * kernel address is set in the ibft_addr global variable.@@ -91,14 +112,16 @@ unsigned long __init find_ibft_region(unsigned long *sizep) /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will * only use ACPI for this */ - if (!efi_enabled(EFI_BOOT)) + if (!efi_enabled(EFI_BOOT)) { find_ibft_in_mem(); - - if (ibft_addr) { *sizep = PAGE_ALIGN(ibft_addr->header.length); - return (u64)virt_to_phys(ibft_addr); + } else { + acpi_find_ibft_region(sizep); } + if (ibft_addr) + return (u64)virt_to_phys(ibft_addr); + *sizep = 0; return 0; }
Mike, Still no luck. [ 30.193723] iscsi: registered transport (iser) [ 30.195970] iBFT detected. [ 30.196571] BUG: unable to handle page fault for address: ffffffffff240004 [ 30.196824] #PF: supervisor read access in kernel mode [ 30.196824] #PF: error_code(0x0000) - not-present page [ 30.196824] PGD 24e34067 P4D 24e34067 PUD 24e36067 PMD 27a0e067 PTE 0 [ 30.196824] Oops: 0000 [#1] SMP KASAN PTI [ 30.196824] CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.11.0-f9593a0 #10 [ 30.196824] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 0.0.0 02/06/2015 [ 30.196824] RIP: 0010:ibft_init+0x13d/0xc33 [ 30.196824] Code: c1 40 84 ce 75 11 83 e0 07 38 c2 0f 9e c1 84 d2 0f 95 c0 84 c1 74 0a be 04 00 00 00 e8 77 f2 5f ef 49 8d 7f 08 b8 ff ff 37 00 <4d> 63 6f 04 48 89 fa 48 c1 e0 2a 48 c1 ea 03 8a 04 02 48 89 fa 83 [ 30.196824] RSP: 0000:ffff888100fafc30 EFLAGS: 00010246 [ 30.196824] RAX: 000000000037ffff RBX: ffffffff937c6fc0 RCX: ffffffff815fcf01 [ 30.196824] RDX: dffffc0000000000 RSI: 0000000000000001 RDI: ffffffffff240008 [ 30.196824] RBP: ffff888100fafcf8 R08: ffffed10201f5f12 R09: ffffed10201f5f12 [ 30.196824] R10: ffff888100faf88f R11: ffffed10201f5f11 R12: dffffc0000000000 [ 30.196824] R13: ffff888100fafdc0 R14: ffff888100fafcd0 R15: ffffffffff240000 [ 30.196824] FS: 0000000000000000(0000) GS:ffff88810ad80000(0000) knlGS:0000000000000000 [ 30.196824] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 30.196824] CR2: ffffffffff240004 CR3: 0000000024e30000 CR4: 00000000000006e0 [ 30.196824] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 30.196824] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 30.196824] Call Trace: [ 30.196824] ? write_comp_data+0x2f/0x90 [ 30.196824] ? __sanitizer_cov_trace_pc+0x21/0x50 [ 30.196824] ? ibft_check_initiator_for+0x159/0x159 [ 30.196824] ? dmi_setup+0x46c/0x46c [ 30.196824] ? write_comp_data+0x2f/0x90 [ 30.196824] ? ibft_check_initiator_for+0x159/0x159 [ 30.196824] do_one_initcall+0xc4/0x3e0 [ 30.196824] ? perf_trace_initcall_level+0x3e0/0x3e0 [ 30.196824] ? asm_sysvec_error_interrupt+0x10/0x20 [ 30.196824] ? do_one_initcall+0x18c/0x3e0 [ 30.196824] kernel_init_freeable+0x596/0x652 [ 30.196824] ? console_on_rootfs+0x7d/0x7d [ 30.196824] ? __sanitizer_cov_trace_pc+0x21/0x50 [ 30.196824] ? rest_init+0xf0/0xf0 [ 30.196824] kernel_init+0x16/0x1d0 [ 30.196824] ? rest_init+0xf0/0xf0 [ 30.196824] ret_from_fork+0x22/0x30 [ 30.196824] Modules linked in: [ 30.196824] Dumping ftrace buffer: [ 30.196824] (ftrace buffer empty) [ 30.196824] CR2: ffffffffff240004 [ 30.196824] ---[ end trace 293eae51adac1398 ]--- [ 30.196824] RIP: 0010:ibft_init+0x13d/0xc33 [ 30.196824] Code: c1 40 84 ce 75 11 83 e0 07 38 c2 0f 9e c1 84 d2 0f 95 c0 84 c1 74 0a be 04 00 00 00 e8 77 f2 5f ef 49 8d 7f 08 b8 ff ff 37 00 <4d> 63 6f 04 48 89 fa 48 c1 e0 2a 48 c1 ea 03 8a 04 02 48 89 fa 83 [ 30.196824] RSP: 0000:ffff888100fafc30 EFLAGS: 00010246 [ 30.196824] RAX: 000000000037ffff RBX: ffffffff937c6fc0 RCX: ffffffff815fcf01 [ 30.196824] RDX: dffffc0000000000 RSI: 0000000000000001 RDI: ffffffffff240008 [ 30.196824] RBP: ffff888100fafcf8 R08: ffffed10201f5f12 R09: ffffed10201f5f12 [ 30.196824] R10: ffff888100faf88f R11: ffffed10201f5f11 R12: dffffc0000000000 [ 30.196824] R13: ffff888100fafdc0 R14: ffff888100fafcd0 R15: ffffffffff240000 [ 30.196824] FS: 0000000000000000(0000) GS:ffff88810ad80000(0000) knlGS:0000000000000000 [ 30.196824] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 30.196824] CR2: ffffffffff240004 CR3: 0000000024e30000 CR4: 00000000000006e0 [ 30.196824] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 30.196824] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 [ 30.196824] Kernel panic - not syncing: Fatal exception [ 30.196824] Dumping ftrace buffer: [ 30.196824] (ftrace buffer empty) [ 30.196824] Kernel Offset: disabled [ 30.196824] Rebooting in 1 seconds.. George _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel