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: Fri, 12 Apr 2019 10:49:56 +0200 [thread overview]
Message-ID: <20190412084956.GC19808@zn.tnic> (raw)
In-Reply-To: <20190412025416.GA11070@jeru.linux.bs1.fc.nec.co.jp>
On Fri, Apr 12, 2019 at 02:54:17AM +0000, Junichi Nomura wrote:
> Without #ifdef CONFIG_X86_64, I got compiler warnings on 32bit build
> about casting u64 to pointer.
Yah, stupid ifdeffery.
> We need #ifdef CONFIG_EFI to avoid build failure about undefined
> __efi_get_rsdp_addr().
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index c3020e2d8f67..4b1d4a0a4269 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -46,7 +46,6 @@ static acpi_physical_address get_acpi_rsdp(void)
return addr;
}
-#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.
@@ -56,6 +55,8 @@ __efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables,
bool efi_64)
{
acpi_physical_address rsdp_addr = 0;
+
+#ifdef CONFIG_EFI
int i;
/* Get EFI tables from systab. */
@@ -85,10 +86,9 @@ __efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables,
else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID)))
return table;
}
-
+#endif
return rsdp_addr;
}
-#endif
/* EFI/kexec support is 64-bit only. */
#ifdef CONFIG_X86_64
---
> I think that should be the other way around:
No, it shouldn't.
kexec_get_rsdp_addr() must do:
if (!kexec_kernel)
return 0:
esd = (struct efi_setup_data *)get_kexec_setup_data_addr();
if (!esd)
return EFI_SETUP_DATA_INVALID;
...
Now I need to go figure out whether there's a reliable way to know in
the kexec kernel that it *is* a kexec kernel.
--
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
WARNING: multiple messages have this Message-ID (diff)
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: Fri, 12 Apr 2019 10:49:56 +0200 [thread overview]
Message-ID: <20190412084956.GC19808@zn.tnic> (raw)
In-Reply-To: <20190412025416.GA11070@jeru.linux.bs1.fc.nec.co.jp>
On Fri, Apr 12, 2019 at 02:54:17AM +0000, Junichi Nomura wrote:
> Without #ifdef CONFIG_X86_64, I got compiler warnings on 32bit build
> about casting u64 to pointer.
Yah, stupid ifdeffery.
> We need #ifdef CONFIG_EFI to avoid build failure about undefined
> __efi_get_rsdp_addr().
diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c
index c3020e2d8f67..4b1d4a0a4269 100644
--- a/arch/x86/boot/compressed/acpi.c
+++ b/arch/x86/boot/compressed/acpi.c
@@ -46,7 +46,6 @@ static acpi_physical_address get_acpi_rsdp(void)
return addr;
}
-#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.
@@ -56,6 +55,8 @@ __efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables,
bool efi_64)
{
acpi_physical_address rsdp_addr = 0;
+
+#ifdef CONFIG_EFI
int i;
/* Get EFI tables from systab. */
@@ -85,10 +86,9 @@ __efi_get_rsdp_addr(unsigned long config_tables, unsigned int nr_tables,
else if (!(efi_guidcmp(guid, ACPI_20_TABLE_GUID)))
return table;
}
-
+#endif
return rsdp_addr;
}
-#endif
/* EFI/kexec support is 64-bit only. */
#ifdef CONFIG_X86_64
---
> I think that should be the other way around:
No, it shouldn't.
kexec_get_rsdp_addr() must do:
if (!kexec_kernel)
return 0:
esd = (struct efi_setup_data *)get_kexec_setup_data_addr();
if (!esd)
return EFI_SETUP_DATA_INVALID;
...
Now I need to go figure out whether there's a reliable way to know in
the kexec kernel that it *is* a kexec kernel.
--
Regards/Gruss,
Boris.
Good mailing practices for 400: avoid top-posting and trim the reply.
next prev parent reply other threads:[~2019-04-12 8:50 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
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 [this message]
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=20190412084956.GC19808@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: link
Be 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.