Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200415221520.2692512-1-nivedita@alum.mit.edu> <20200415221520.2692512-5-nivedita@alum.mit.edu>
In-Reply-To: <20200415221520.2692512-5-nivedita@alum.mit.edu>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Thu, 16 Apr 2020 09:51:49 +0200
Message-ID: <CAMj1kXERKP2x6=wgdgyRtr5Rh-116bwwvVy4zgHAH=Hy9QsOew@mail.gmail.com>
Subject: Re: [PATCH 4/5] efi: Kill __efistub_global
To:     Arvind Sankar <nivedita@alum.mit.edu>
Cc:     linux-efi <linux-efi@vger.kernel.org>,
        Linux ARM <linux-arm-kernel@lists.infradead.org>,
        X86 ML <x86@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, 16 Apr 2020 at 00:15, Arvind Sankar <nivedita@alum.mit.edu> wrote:
>
> Now that both arm and x86 are using the linker script to place the EFI
> stub's global variables in the correct section, remove __efistub_global.
>
> Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>

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

> ---
>  drivers/firmware/efi/libstub/arm-stub.c        |  4 ++--
>  drivers/firmware/efi/libstub/efi-stub-helper.c | 15 +++++++--------
>  drivers/firmware/efi/libstub/efistub.h         |  2 --
>  drivers/firmware/efi/libstub/gop.c             |  2 +-
>  drivers/firmware/efi/libstub/x86-stub.c        |  2 +-
>  5 files changed, 11 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
> index 99a5cde7c2d8..bf42d6c742a8 100644
> --- a/drivers/firmware/efi/libstub/arm-stub.c
> +++ b/drivers/firmware/efi/libstub/arm-stub.c
> @@ -36,9 +36,9 @@
>  #endif
>
>  static u64 virtmap_base = EFI_RT_VIRTUAL_BASE;
> -static bool __efistub_global flat_va_mapping;
> +static bool flat_va_mapping;
>
> -static efi_system_table_t *__efistub_global sys_table;
> +static efi_system_table_t *sys_table;
>
>  __pure efi_system_table_t *efi_system_table(void)
>  {
> diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
> index c6092b6038cf..14e56a64f208 100644
> --- a/drivers/firmware/efi/libstub/efi-stub-helper.c
> +++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
> @@ -12,14 +12,13 @@
>
>  #include "efistub.h"
>
> -static bool __efistub_global efi_nochunk;
> -static bool __efistub_global efi_nokaslr;
> -static bool __efistub_global efi_noinitrd;
> -static bool __efistub_global efi_quiet;
> -static bool __efistub_global efi_novamap;
> -static bool __efistub_global efi_nosoftreserve;
> -static bool __efistub_global efi_disable_pci_dma =
> -                                       IS_ENABLED(CONFIG_EFI_DISABLE_PCI_DMA);
> +static bool efi_nochunk;
> +static bool efi_nokaslr;
> +static bool efi_noinitrd;
> +static bool efi_quiet;
> +static bool efi_novamap;
> +static bool efi_nosoftreserve;
> +static bool efi_disable_pci_dma = IS_ENABLED(CONFIG_EFI_DISABLE_PCI_DMA);
>
>  bool __pure nochunk(void)
>  {
> diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
> index 49651e20bb9f..f96c56596034 100644
> --- a/drivers/firmware/efi/libstub/efistub.h
> +++ b/drivers/firmware/efi/libstub/efistub.h
> @@ -25,8 +25,6 @@
>  #define EFI_ALLOC_ALIGN                EFI_PAGE_SIZE
>  #endif
>
> -#define __efistub_global
> -
>  extern bool __pure nochunk(void);
>  extern bool __pure nokaslr(void);
>  extern bool __pure noinitrd(void);
> diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
> index fa05a0b0adfd..216327d0b034 100644
> --- a/drivers/firmware/efi/libstub/gop.c
> +++ b/drivers/firmware/efi/libstub/gop.c
> @@ -32,7 +32,7 @@ static struct {
>                         u8 depth;
>                 } res;
>         };
> -} cmdline __efistub_global = { .option = EFI_CMDLINE_NONE };
> +} cmdline = { .option = EFI_CMDLINE_NONE };
>
>  static bool parse_modenum(char *option, char **next)
>  {
> diff --git a/drivers/firmware/efi/libstub/x86-stub.c b/drivers/firmware/efi/libstub/x86-stub.c
> index 7583e908852f..aedac3af4b5c 100644
> --- a/drivers/firmware/efi/libstub/x86-stub.c
> +++ b/drivers/firmware/efi/libstub/x86-stub.c
> @@ -20,7 +20,7 @@
>  /* Maximum physical address for 64-bit kernel with 4-level paging */
>  #define MAXMEM_X86_64_4LEVEL (1ull << 46)
>
> -static efi_system_table_t *sys_table __efistub_global;
> +static efi_system_table_t *sys_table;
>  extern const bool efi_is64;
>  extern u32 image_offset;
>
> --
> 2.24.1
>