| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20111212171740.GA26407@phenom.dumpdata.com>
Date: Mon, 12 Dec 2011 12:17:40 -0500
From: Konrad Rzeszutek Wilk <konrad.wilk@...cle.com>
To: Yinghai Lu <yinghai.lu@...cle.com>
Cc: Konrad Rzeszutek Wilk <konrad@...nok.org>,
Peter Jones <pjones@...hat.com>,
Konrad Rzeszutek Wilk <konrad@...nel.org>,
Ingo Molnar <mingo@...e.hu>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: Re: [PATCH -v3] ibft: Fix finding IBFT ACPI table on UEFI
On Thu, Dec 08, 2011 at 01:17:41PM -0800, Yinghai Lu wrote:
>
> Found one system with UEFI/iBFT, kernel does not detect the iBFT during
> iscsi_ibft module loading.
>
> Root cause: on x86 (UEFI), we are calling of find_ibft_region() much earlier
> - specifically in setup_arch() before ACPI is enabled.
I get this when compiling with make allmodconfig:
BUILD arch/x86/boot/bzImage
Setup is 16636 bytes (padded to 16896 bytes).
System is 4680 kB
CRC 88f70464
Kernel: arch/x86/boot/bzImage is ready (#2)
ERROR: "acpi_table_parse" [drivers/firmware/iscsi_ibft.ko] undefined!
make[3]: *** [__modpost] Error 1
make[2]: *** [modules] Error 2
on 64-bit Fedora Core 16.
>
> Try to split acpi checking code out and call that later
>
> At that time ACPI iBFT already get permanent mapped with ioremap.
> So isa_virt_to_bus() will get wrong phys from right virt address.
> We could just skip that phys address printing.
>
> For legacy one, print the found address early.
>
> -v2: update comments and description according to Konrad.
> -v3: fix problem about module use case that is found by Konrad.
>
> Signed-off-by: Yinghai Lu <yinghai@...nel.org>
>
> ---
> drivers/firmware/iscsi_ibft.c | 43 +++++++++++++++++++++++++++++++++++--
> drivers/firmware/iscsi_ibft_find.c | 26 +---------------------
> 2 files changed, 43 insertions(+), 26 deletions(-)
>
> Index: linux-2.6/drivers/firmware/iscsi_ibft.c
> ===================================================================
> --- linux-2.6.orig/drivers/firmware/iscsi_ibft.c
> +++ linux-2.6/drivers/firmware/iscsi_ibft.c
> @@ -746,6 +746,38 @@ static void __exit ibft_exit(void)
> ibft_cleanup();
> }
>
> +#ifdef CONFIG_ACPI
> +static const struct {
> + char *sign;
> +} ibft_signs[] = {
> + /*
> + * One spec says "IBFT", the other says "iBFT". We have to check
> + * for both.
> + */
> + { ACPI_SIG_IBFT },
> + { "iBFT" },
> +};
> +
> +static int __init acpi_find_ibft(struct acpi_table_header *header)
> +{
> + ibft_addr = (struct acpi_table_ibft *)header;
> +
> + return 0;
> +}
> +
> +static void __init acpi_find_ibft_region(void)
> +{
> + int i;
> +
> + for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++)
> + acpi_table_parse(ibft_signs[i].sign, acpi_find_ibft);
> +}
> +#else
> +static void __init acpi_find_ibft_region(void)
> +{
> +}
> +#endif
> +
> /*
> * ibft_init() - creates sysfs tree entries for the iBFT data.
> */
> @@ -753,9 +785,16 @@ static int __init ibft_init(void)
> {
> int rc = 0;
>
> + /*
> + As on UEFI systems the setup_arch()/find_ibft_region()
> + is called before ACPI tables are parsed and it only does
> + legacy finding.
> + */
> + if (!ibft_addr)
> + acpi_find_ibft_region();
> +
> if (ibft_addr) {
> - printk(KERN_INFO "iBFT detected at 0x%llx.\n",
> - (u64)isa_virt_to_bus(ibft_addr));
> + pr_info("iBFT detected.\n");
>
> rc = ibft_check_device();
> if (rc)
> Index: linux-2.6/drivers/firmware/iscsi_ibft_find.c
> ===================================================================
> --- linux-2.6.orig/drivers/firmware/iscsi_ibft_find.c
> +++ linux-2.6/drivers/firmware/iscsi_ibft_find.c
> @@ -45,13 +45,6 @@ EXPORT_SYMBOL_GPL(ibft_addr);
> static const struct {
> char *sign;
> } ibft_signs[] = {
> -#ifdef CONFIG_ACPI
> - /*
> - * One spec says "IBFT", the other says "iBFT". We have to check
> - * for both.
> - */
> - { ACPI_SIG_IBFT },
> -#endif
> { "iBFT" },
> { "BIFT" }, /* Broadcom iSCSI Offload */
> };
> @@ -62,14 +55,6 @@ static const struct {
> #define VGA_MEM 0xA0000 /* VGA buffer */
> #define VGA_SIZE 0x20000 /* 128kB */
>
> -#ifdef CONFIG_ACPI
> -static int __init acpi_find_ibft(struct acpi_table_header *header)
> -{
> - ibft_addr = (struct acpi_table_ibft *)header;
> - return 0;
> -}
> -#endif /* CONFIG_ACPI */
> -
> static int __init find_ibft_in_mem(void)
> {
> unsigned long pos;
> @@ -94,6 +79,7 @@ static int __init find_ibft_in_mem(void)
> * the table cannot be valid. */
> if (pos + len <= (IBFT_END-1)) {
> ibft_addr = (struct acpi_table_ibft *)virt;
> + pr_info("iBFT found at 0x%lx.\n", pos);
> goto done;
> }
> }
> @@ -108,20 +94,12 @@ done:
> */
> unsigned long __init find_ibft_region(unsigned long *sizep)
> {
> -#ifdef CONFIG_ACPI
> - int i;
> -#endif
> ibft_addr = NULL;
>
> -#ifdef CONFIG_ACPI
> - for (i = 0; i < ARRAY_SIZE(ibft_signs) && !ibft_addr; i++)
> - acpi_table_parse(ibft_signs[i].sign, acpi_find_ibft);
> -#endif /* CONFIG_ACPI */
> -
> /* iBFT 1.03 section 1.4.3.1 mandates that UEFI machines will
> * only use ACPI for this */
>
> - if (!ibft_addr && !efi_enabled)
> + if (!efi_enabled)
> find_ibft_in_mem();
>
> if (ibft_addr) {
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists