diff mbox series

[v2,2/5] efi: provide empty efi_enter_virtual_mode implementation

Message ID 6514652d3a32d3ed33d6eb5c91d0af63bf0d1a0c.1596544734.git.andreyknvl@google.com
State New
Headers show
Series kasan: support stack instrumentation for tag-based mode | expand

Commit Message

Andrey Konovalov Aug. 4, 2020, 12:41 p.m. UTC
When CONFIG_EFI is not enabled, we might get an undefined reference
to efi_enter_virtual_mode() error, if this efi_enabled() call isn't
inlined into start_kernel(). This happens in particular, if start_kernel()
is annodated with __no_sanitize_address.

Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
---
 include/linux/efi.h | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Ard Biesheuvel Aug. 4, 2020, 12:45 p.m. UTC | #1
On Tue, 4 Aug 2020 at 14:41, Andrey Konovalov <andreyknvl@google.com> wrote:
>
> When CONFIG_EFI is not enabled, we might get an undefined reference
> to efi_enter_virtual_mode() error, if this efi_enabled() call isn't
> inlined into start_kernel(). This happens in particular, if start_kernel()
> is annodated with __no_sanitize_address.
>
> Reported-by: kernel test robot <lkp@intel.com>
> Signed-off-by: Andrey Konovalov <andreyknvl@google.com>

Acked-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  include/linux/efi.h | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/include/linux/efi.h b/include/linux/efi.h
> index 05c47f857383..73db1ae04cef 100644
> --- a/include/linux/efi.h
> +++ b/include/linux/efi.h
> @@ -606,7 +606,11 @@ extern void *efi_get_pal_addr (void);
>  extern void efi_map_pal_code (void);
>  extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
>  extern void efi_gettimeofday (struct timespec64 *ts);
> +#ifdef CONFIG_EFI
>  extern void efi_enter_virtual_mode (void);     /* switch EFI to virtual mode, if possible */
> +#else
> +static inline void efi_enter_virtual_mode (void) {}
> +#endif
>  #ifdef CONFIG_X86
>  extern efi_status_t efi_query_variable_store(u32 attributes,
>                                              unsigned long size,
> --
> 2.28.0.163.g6104cc2f0b6-goog
>
diff mbox series

Patch

diff --git a/include/linux/efi.h b/include/linux/efi.h
index 05c47f857383..73db1ae04cef 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -606,7 +606,11 @@  extern void *efi_get_pal_addr (void);
 extern void efi_map_pal_code (void);
 extern void efi_memmap_walk (efi_freemem_callback_t callback, void *arg);
 extern void efi_gettimeofday (struct timespec64 *ts);
+#ifdef CONFIG_EFI
 extern void efi_enter_virtual_mode (void);	/* switch EFI to virtual mode, if possible */
+#else
+static inline void efi_enter_virtual_mode (void) {}
+#endif
 #ifdef CONFIG_X86
 extern efi_status_t efi_query_variable_store(u32 attributes,
 					     unsigned long size,