* [PATCH 1/2] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled
@ 2019-01-09 6:43 Kairui Song
2019-01-09 6:56 ` Kairui Song
0 siblings, 1 reply; 3+ messages in thread
From: Kairui Song @ 2019-01-09 6:43 UTC (permalink / raw)
To: linux-kernel; +Cc: tglx, mingo, bp, hpa, x86, dyoung, akpm, Kairui Song
Currenly with "efi=noruntime" in kernel command line, calling
kexec_file_load will raise below problem:
[ 97.967067] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
[ 97.967894] #PF error: [normal kernel read fault]
...
[ 97.980456] Call Trace:
[ 97.980724] efi_runtime_map_copy+0x28/0x30
[ 97.981267] bzImage64_load+0x688/0x872
[ 97.981794] arch_kexec_kernel_image_load+0x6d/0x70
[ 97.982441] kimage_file_alloc_init+0x13e/0x220
[ 97.983035] __x64_sys_kexec_file_load+0x144/0x290
[ 97.983586] do_syscall_64+0x55/0x1a0
[ 97.983962] entry_SYSCALL_64_after_hwframe+0x44/0xa9
When efi runtime is not enabled, efi memmap is not mapped, so just skip
EFI info setup.
Suggested-by: Dave Young <dyoung@redhat.com>
Signed-off-by: Kairui Song <kasong@redhat.com>
---
arch/x86/kernel/kexec-bzimage64.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
index 0d5efa34f359..53917a3ebf94 100644
--- a/arch/x86/kernel/kexec-bzimage64.c
+++ b/arch/x86/kernel/kexec-bzimage64.c
@@ -167,6 +167,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
struct efi_info *current_ei = &boot_params.efi_info;
struct efi_info *ei = ¶ms->efi_info;
+ if (!efi_enabled(EFI_RUNTIME_SERVICES))
+ return 0;
+
if (!current_ei->efi_memmap_size)
return 0;
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled
2019-01-09 6:43 [PATCH 1/2] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled Kairui Song
@ 2019-01-09 6:56 ` Kairui Song
0 siblings, 0 replies; 3+ messages in thread
From: Kairui Song @ 2019-01-09 6:56 UTC (permalink / raw)
To: linux-kernel
Cc: tglx, mingo, bp, hpa, x86, Dave Young, akpm, kexec, Baoquan He
CCing more people
On Wed, Jan 9, 2019 at 2:45 PM Kairui Song <kasong@redhat.com> wrote:
>
> Currenly with "efi=noruntime" in kernel command line, calling
> kexec_file_load will raise below problem:
>
> [ 97.967067] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
> [ 97.967894] #PF error: [normal kernel read fault]
> ...
> [ 97.980456] Call Trace:
> [ 97.980724] efi_runtime_map_copy+0x28/0x30
> [ 97.981267] bzImage64_load+0x688/0x872
> [ 97.981794] arch_kexec_kernel_image_load+0x6d/0x70
> [ 97.982441] kimage_file_alloc_init+0x13e/0x220
> [ 97.983035] __x64_sys_kexec_file_load+0x144/0x290
> [ 97.983586] do_syscall_64+0x55/0x1a0
> [ 97.983962] entry_SYSCALL_64_after_hwframe+0x44/0xa9
>
> When efi runtime is not enabled, efi memmap is not mapped, so just skip
> EFI info setup.
>
> Suggested-by: Dave Young <dyoung@redhat.com>
> Signed-off-by: Kairui Song <kasong@redhat.com>
> ---
> arch/x86/kernel/kexec-bzimage64.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
> index 0d5efa34f359..53917a3ebf94 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -167,6 +167,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
> struct efi_info *current_ei = &boot_params.efi_info;
> struct efi_info *ei = ¶ms->efi_info;
>
> + if (!efi_enabled(EFI_RUNTIME_SERVICES))
> + return 0;
> +
> if (!current_ei->efi_memmap_size)
> return 0;
>
> --
> 2.20.1
>
--
Best Regards,
Kairui Song
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled
@ 2019-01-09 6:56 ` Kairui Song
0 siblings, 0 replies; 3+ messages in thread
From: Kairui Song @ 2019-01-09 6:56 UTC (permalink / raw)
To: linux-kernel
Cc: Baoquan He, x86, kexec, mingo, bp, hpa, tglx, Dave Young, akpm
CCing more people
On Wed, Jan 9, 2019 at 2:45 PM Kairui Song <kasong@redhat.com> wrote:
>
> Currenly with "efi=noruntime" in kernel command line, calling
> kexec_file_load will raise below problem:
>
> [ 97.967067] BUG: unable to handle kernel NULL pointer dereference at 0000000000000000
> [ 97.967894] #PF error: [normal kernel read fault]
> ...
> [ 97.980456] Call Trace:
> [ 97.980724] efi_runtime_map_copy+0x28/0x30
> [ 97.981267] bzImage64_load+0x688/0x872
> [ 97.981794] arch_kexec_kernel_image_load+0x6d/0x70
> [ 97.982441] kimage_file_alloc_init+0x13e/0x220
> [ 97.983035] __x64_sys_kexec_file_load+0x144/0x290
> [ 97.983586] do_syscall_64+0x55/0x1a0
> [ 97.983962] entry_SYSCALL_64_after_hwframe+0x44/0xa9
>
> When efi runtime is not enabled, efi memmap is not mapped, so just skip
> EFI info setup.
>
> Suggested-by: Dave Young <dyoung@redhat.com>
> Signed-off-by: Kairui Song <kasong@redhat.com>
> ---
> arch/x86/kernel/kexec-bzimage64.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c
> index 0d5efa34f359..53917a3ebf94 100644
> --- a/arch/x86/kernel/kexec-bzimage64.c
> +++ b/arch/x86/kernel/kexec-bzimage64.c
> @@ -167,6 +167,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
> struct efi_info *current_ei = &boot_params.efi_info;
> struct efi_info *ei = ¶ms->efi_info;
>
> + if (!efi_enabled(EFI_RUNTIME_SERVICES))
> + return 0;
> +
> if (!current_ei->efi_memmap_size)
> return 0;
>
> --
> 2.20.1
>
--
Best Regards,
Kairui Song
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-09 6:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 6:43 [PATCH 1/2] x86, kexec_file_load: Don't setup EFI info if EFI runtime is not enabled Kairui Song
2019-01-09 6:56 ` Kairui Song
2019-01-09 6:56 ` Kairui Song
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.