From: Borislav Petkov <bp@alien8.de> To: Junichi Nomura <j-nomura@ce.jp.nec.com> Cc: Dave Young <dyoung@redhat.com>, Chao Fan <fanc.fnst@cn.fujitsu.com>, Baoquan He <bhe@redhat.com>, Kairui Song <kasong@redhat.com>, "x86@kernel.org" <x86@kernel.org>, "kexec@lists.infradead.org" <kexec@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org> Subject: Re: [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel Date: Thu, 11 Apr 2019 14:58:22 +0200 [thread overview] Message-ID: <20190411125822.GE30080@zn.tnic> (raw) In-Reply-To: <C54C5A30-62D9-45C4-8036-88D255FD92A1@alien8.de> Something like this based on your v3. I still need to figure out a reliable way to check in kexec_get_rsdp_addr() whether we're a kexec-ed kernel but other than that, it should look something like this: --- diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 0ef4ad55b29b..039d91258171 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -8,6 +8,8 @@ #include <linux/efi.h> #include <asm/efi.h> +#define EFI_SETUP_DATA_INVALID -1ULL + /* * Longest parameter of 'acpi=' is 'copy_dsdt', plus an extra '\0' * for termination. @@ -44,17 +46,108 @@ static acpi_physical_address get_acpi_rsdp(void) return addr; } -/* Search EFI system tables for RSDP. */ -static acpi_physical_address efi_get_rsdp_addr(void) +static struct efi_setup_data *get_kexec_setup_data_addr(void) +{ + struct setup_data *data; + u64 pa_data; + + pa_data = boot_params->hdr.setup_data; + while (pa_data) { + data = (struct setup_data *) pa_data; + if (data->type == SETUP_EFI) + return (struct efi_setup_data *)(pa_data + sizeof(struct setup_data)); + + pa_data = data->next; + } + return NULL; +} + +#ifdef CONFIG_EFI +/* + * Search EFI system tables for RSDP. If both ACPI_20_TABLE_GUID and + * ACPI_TABLE_GUID are found, take the former, which has more features. + */ +static acpi_physical_address +__efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables, + bool efi_64) { acpi_physical_address rsdp_addr = 0; + int i; + + /* Get EFI tables from systab. */ + for (i = 0; i < nr_tables; i++) { + acpi_physical_address table; + efi_guid_t guid; + + if (efi_64) { + efi_config_table_64_t *tbl = (efi_config_table_64_t *) config_tables + i; + + guid = tbl->guid; + table = tbl->table; + + if (!IS_ENABLED(CONFIG_X86_64) && table >> 32) { + debug_putstr("Error getting RSDP address: EFI config table located above 4GB.\n"); + return 0; + } + } else { + efi_config_table_32_t *tbl = (efi_config_table_32_t *) config_tables + i; + + guid = tbl->guid; + table = tbl->table; + } + + if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) + rsdp_addr = table; + else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) + return table; + } + + return rsdp_addr; +} +#endif + +/* EFI/kexec support is 64-bit only. */ +static acpi_physical_address kexec_get_rsdp_addr(void) +{ + efi_system_table_64_t *systab; + struct efi_setup_data *esd; + struct efi_info *ei; + char *sig; + + if (!IS_ENABLED(CONFIG_X86_64)) + return 0; + + esd = get_kexec_setup_data_addr(); + if (!esd) + return EFI_SETUP_DATA_INVALID; + if (!esd->tables) { + debug_putstr("Wrong kexec SETUP_EFI data.\n"); + return 0; + } + + ei = &boot_params->efi_info; + sig = (char *)&ei->efi_loader_signature; + if (strncmp(sig, EFI64_LOADER_SIGNATURE, 4)) { + debug_putstr("Wrong kexec EFI loader signature.\n"); + return 0; + } + + /* Get systab from boot params. */ + systab = (efi_system_table_64_t *) (ei->efi_systab | ((__u64)ei->efi_systab_hi << 32)); + if (!systab) + error("EFI system table not found in kexec boot_params."); + + return __efi_get_rsdp_addr((unsigned long)esd->tables, systab->nr_tables, true); +} + +static acpi_physical_address efi_get_rsdp_addr(void) +{ #ifdef CONFIG_EFI - unsigned long systab, systab_tables, config_tables; + unsigned long systab, config_tables; unsigned int nr_tables; struct efi_info *ei; bool efi_64; - int size, i; char *sig; ei = &boot_params->efi_info; @@ -88,49 +181,20 @@ static acpi_physical_address efi_get_rsdp_addr(void) config_tables = stbl->tables; nr_tables = stbl->nr_tables; - size = sizeof(efi_config_table_64_t); } else { efi_system_table_32_t *stbl = (efi_system_table_32_t *)systab; config_tables = stbl->tables; nr_tables = stbl->nr_tables; - size = sizeof(efi_config_table_32_t); } if (!config_tables) error("EFI config tables not found."); - /* Get EFI tables from systab. */ - for (i = 0; i < nr_tables; i++) { - acpi_physical_address table; - efi_guid_t guid; - - config_tables += size; - - if (efi_64) { - efi_config_table_64_t *tbl = (efi_config_table_64_t *)config_tables; - - guid = tbl->guid; - table = tbl->table; - - if (!IS_ENABLED(CONFIG_X86_64) && table >> 32) { - debug_putstr("Error getting RSDP address: EFI config table located above 4GB.\n"); - return 0; - } - } else { - efi_config_table_32_t *tbl = (efi_config_table_32_t *)config_tables; - - guid = tbl->guid; - table = tbl->table; - } - - if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) - rsdp_addr = table; - else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) - return table; - } + return __efi_get_rsdp_addr(config_tables, nr_tables, efi_64); +#else + return 0; #endif - return rsdp_addr; } static u8 compute_checksum(u8 *buffer, u32 length) @@ -220,6 +284,12 @@ acpi_physical_address get_rsdp_addr(void) if (!pa) pa = boot_params->acpi_rsdp_addr; + if (!pa) + pa = kexec_get_rsdp_addr(); + + if (pa == EFI_SETUP_DATA_INVALID) + return 0; + if (!pa) pa = efi_get_rsdp_addr(); -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.
WARNING: multiple messages have this Message-ID (diff)
From: Borislav Petkov <bp@alien8.de> To: Junichi Nomura <j-nomura@ce.jp.nec.com> Cc: Chao Fan <fanc.fnst@cn.fujitsu.com>, Kairui Song <kasong@redhat.com>, Baoquan He <bhe@redhat.com>, "x86@kernel.org" <x86@kernel.org>, "kexec@lists.infradead.org" <kexec@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Dave Young <dyoung@redhat.com> Subject: Re: [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel Date: Thu, 11 Apr 2019 14:58:22 +0200 [thread overview] Message-ID: <20190411125822.GE30080@zn.tnic> (raw) In-Reply-To: <C54C5A30-62D9-45C4-8036-88D255FD92A1@alien8.de> Something like this based on your v3. I still need to figure out a reliable way to check in kexec_get_rsdp_addr() whether we're a kexec-ed kernel but other than that, it should look something like this: --- diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 0ef4ad55b29b..039d91258171 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -8,6 +8,8 @@ #include <linux/efi.h> #include <asm/efi.h> +#define EFI_SETUP_DATA_INVALID -1ULL + /* * Longest parameter of 'acpi=' is 'copy_dsdt', plus an extra '\0' * for termination. @@ -44,17 +46,108 @@ static acpi_physical_address get_acpi_rsdp(void) return addr; } -/* Search EFI system tables for RSDP. */ -static acpi_physical_address efi_get_rsdp_addr(void) +static struct efi_setup_data *get_kexec_setup_data_addr(void) +{ + struct setup_data *data; + u64 pa_data; + + pa_data = boot_params->hdr.setup_data; + while (pa_data) { + data = (struct setup_data *) pa_data; + if (data->type == SETUP_EFI) + return (struct efi_setup_data *)(pa_data + sizeof(struct setup_data)); + + pa_data = data->next; + } + return NULL; +} + +#ifdef CONFIG_EFI +/* + * Search EFI system tables for RSDP. If both ACPI_20_TABLE_GUID and + * ACPI_TABLE_GUID are found, take the former, which has more features. + */ +static acpi_physical_address +__efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables, + bool efi_64) { acpi_physical_address rsdp_addr = 0; + int i; + + /* Get EFI tables from systab. */ + for (i = 0; i < nr_tables; i++) { + acpi_physical_address table; + efi_guid_t guid; + + if (efi_64) { + efi_config_table_64_t *tbl = (efi_config_table_64_t *) config_tables + i; + + guid = tbl->guid; + table = tbl->table; + + if (!IS_ENABLED(CONFIG_X86_64) && table >> 32) { + debug_putstr("Error getting RSDP address: EFI config table located above 4GB.\n"); + return 0; + } + } else { + efi_config_table_32_t *tbl = (efi_config_table_32_t *) config_tables + i; + + guid = tbl->guid; + table = tbl->table; + } + + if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) + rsdp_addr = table; + else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) + return table; + } + + return rsdp_addr; +} +#endif + +/* EFI/kexec support is 64-bit only. */ +static acpi_physical_address kexec_get_rsdp_addr(void) +{ + efi_system_table_64_t *systab; + struct efi_setup_data *esd; + struct efi_info *ei; + char *sig; + + if (!IS_ENABLED(CONFIG_X86_64)) + return 0; + + esd = get_kexec_setup_data_addr(); + if (!esd) + return EFI_SETUP_DATA_INVALID; + if (!esd->tables) { + debug_putstr("Wrong kexec SETUP_EFI data.\n"); + return 0; + } + + ei = &boot_params->efi_info; + sig = (char *)&ei->efi_loader_signature; + if (strncmp(sig, EFI64_LOADER_SIGNATURE, 4)) { + debug_putstr("Wrong kexec EFI loader signature.\n"); + return 0; + } + + /* Get systab from boot params. */ + systab = (efi_system_table_64_t *) (ei->efi_systab | ((__u64)ei->efi_systab_hi << 32)); + if (!systab) + error("EFI system table not found in kexec boot_params."); + + return __efi_get_rsdp_addr((unsigned long)esd->tables, systab->nr_tables, true); +} + +static acpi_physical_address efi_get_rsdp_addr(void) +{ #ifdef CONFIG_EFI - unsigned long systab, systab_tables, config_tables; + unsigned long systab, config_tables; unsigned int nr_tables; struct efi_info *ei; bool efi_64; - int size, i; char *sig; ei = &boot_params->efi_info; @@ -88,49 +181,20 @@ static acpi_physical_address efi_get_rsdp_addr(void) config_tables = stbl->tables; nr_tables = stbl->nr_tables; - size = sizeof(efi_config_table_64_t); } else { efi_system_table_32_t *stbl = (efi_system_table_32_t *)systab; config_tables = stbl->tables; nr_tables = stbl->nr_tables; - size = sizeof(efi_config_table_32_t); } if (!config_tables) error("EFI config tables not found."); - /* Get EFI tables from systab. */ - for (i = 0; i < nr_tables; i++) { - acpi_physical_address table; - efi_guid_t guid; - - config_tables += size; - - if (efi_64) { - efi_config_table_64_t *tbl = (efi_config_table_64_t *)config_tables; - - guid = tbl->guid; - table = tbl->table; - - if (!IS_ENABLED(CONFIG_X86_64) && table >> 32) { - debug_putstr("Error getting RSDP address: EFI config table located above 4GB.\n"); - return 0; - } - } else { - efi_config_table_32_t *tbl = (efi_config_table_32_t *)config_tables; - - guid = tbl->guid; - table = tbl->table; - } - - if (!(efi_guidcmp(guid, ACPI_TABLE_GUID))) - rsdp_addr = table; - else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID))) - return table; - } + return __efi_get_rsdp_addr(config_tables, nr_tables, efi_64); +#else + return 0; #endif - return rsdp_addr; } static u8 compute_checksum(u8 *buffer, u32 length) @@ -220,6 +284,12 @@ acpi_physical_address get_rsdp_addr(void) if (!pa) pa = boot_params->acpi_rsdp_addr; + if (!pa) + pa = kexec_get_rsdp_addr(); + + if (pa == EFI_SETUP_DATA_INVALID) + return 0; + if (!pa) pa = efi_get_rsdp_addr(); -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply. _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2019-04-11 12:58 UTC|newest] Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-08 23:10 [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel Junichi Nomura 2019-04-08 23:10 ` Junichi Nomura 2019-04-10 17:14 ` Borislav Petkov 2019-04-10 17:14 ` Borislav Petkov 2019-04-10 23:34 ` Junichi Nomura 2019-04-10 23:34 ` Junichi Nomura 2019-04-11 8:09 ` Borislav Petkov 2019-04-11 8:09 ` Borislav Petkov 2019-04-11 8:16 ` Junichi Nomura 2019-04-11 8:16 ` Junichi Nomura 2019-04-11 8:37 ` Borislav Petkov 2019-04-11 8:37 ` Borislav Petkov 2019-04-11 9:13 ` Junichi Nomura 2019-04-11 9:13 ` Junichi Nomura 2019-04-11 9:21 ` Boris Petkov 2019-04-11 9:21 ` Boris Petkov 2019-04-11 9:32 ` Junichi Nomura 2019-04-11 9:32 ` Junichi Nomura 2019-04-11 9:40 ` Boris Petkov 2019-04-11 9:40 ` Boris Petkov 2019-04-11 12:58 ` Borislav Petkov [this message] 2019-04-11 12:58 ` Borislav Petkov 2019-04-12 2:54 ` Junichi Nomura 2019-04-12 2:54 ` Junichi Nomura 2019-04-12 8:49 ` Borislav Petkov 2019-04-12 8:49 ` Borislav Petkov 2019-04-12 13:35 ` Borislav Petkov 2019-04-12 13:35 ` Borislav Petkov 2019-04-15 7:01 ` Junichi Nomura 2019-04-15 7:01 ` Junichi Nomura 2019-04-15 9:07 ` Borislav Petkov 2019-04-15 9:07 ` Borislav Petkov 2019-04-15 10:25 ` Borislav Petkov 2019-04-15 10:25 ` Borislav Petkov 2019-04-15 23:00 ` Junichi Nomura 2019-04-15 23:00 ` Junichi Nomura 2019-04-15 23:14 ` Junichi Nomura 2019-04-15 23:14 ` Junichi Nomura 2019-04-16 9:45 ` Borislav Petkov 2019-04-16 9:45 ` Borislav Petkov 2019-04-16 23:09 ` kexec crash on OVMF i386 + x86_64 kernel (Re: [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel) Junichi Nomura 2019-04-16 23:09 ` Junichi Nomura 2019-04-17 5:14 ` Dave Young 2019-04-17 5:14 ` Dave Young 2019-04-17 17:57 ` Prakhya, Sai Praneeth 2019-04-17 17:57 ` Prakhya, Sai Praneeth 2019-04-16 9:40 ` [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel Borislav Petkov 2019-04-16 9:40 ` Borislav Petkov 2019-04-16 9:52 ` [PATCH] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernels Borislav Petkov 2019-04-16 9:52 ` Borislav Petkov 2019-04-16 10:02 ` Ingo Molnar 2019-04-16 10:02 ` Ingo Molnar 2019-04-16 10:31 ` Borislav Petkov 2019-04-16 10:31 ` Borislav Petkov 2019-04-16 11:41 ` Dave Young 2019-04-16 11:41 ` Dave Young 2019-04-16 13:22 ` Borislav Petkov 2019-04-16 13:22 ` Borislav Petkov 2019-04-17 1:38 ` Dave Young 2019-04-17 1:38 ` Dave Young 2019-04-17 4:57 ` Dave Young 2019-04-17 4:57 ` Dave Young 2019-04-17 6:00 ` Kairui Song 2019-04-17 6:00 ` Kairui Song 2019-04-17 7:08 ` Dave Young 2019-04-17 7:08 ` Dave Young 2019-04-17 8:22 ` Borislav Petkov 2019-04-17 8:22 ` Borislav Petkov 2019-04-18 1:24 ` Dave Young 2019-04-18 1:24 ` Dave Young 2019-04-19 8:34 ` [RFC PATCH] kexec, x86/boot: map systab region in identity mapping before accessing it Kairui Song 2019-04-19 8:34 ` Kairui Song 2019-04-19 8:58 ` Baoquan He 2019-04-19 8:58 ` Baoquan He 2019-04-19 9:39 ` Kairui Song 2019-04-19 9:39 ` Kairui Song 2019-04-16 22:44 ` [PATCH v4] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernel Junichi Nomura 2019-04-16 22:44 ` Junichi Nomura 2019-04-17 7:02 ` Dave Young 2019-04-17 7:02 ` Dave Young 2019-04-17 8:54 ` Borislav Petkov 2019-04-17 8:54 ` Borislav Petkov 2019-04-17 9:02 ` Borislav Petkov 2019-04-17 9:02 ` Borislav Petkov 2019-04-17 10:31 ` Chao Fan 2019-04-17 10:31 ` Chao Fan 2019-04-11 8:42 ` Baoquan He 2019-04-11 8:42 ` Baoquan He 2019-04-11 9:14 ` Junichi Nomura 2019-04-11 9:14 ` Junichi Nomura 2019-04-12 0:23 ` Baoquan He 2019-04-12 0:23 ` Baoquan He 2019-04-15 7:46 ` Dave Young 2019-04-15 7:46 ` Dave Young 2019-06-06 19:22 ` [tip:x86/boot] x86/boot: Use efi_setup_data for searching RSDP on kexec-ed kernels tip-bot for Junichi Nomura
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=20190411125822.GE30080@zn.tnic \ --to=bp@alien8.de \ --cc=bhe@redhat.com \ --cc=dyoung@redhat.com \ --cc=fanc.fnst@cn.fujitsu.com \ --cc=j-nomura@ce.jp.nec.com \ --cc=kasong@redhat.com \ --cc=kexec@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=x86@kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.