Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 26 Apr 2023 13:42:00 +0300
From:   "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>
To:     Ard Biesheuvel <ardb@kernel.org>
Cc:     linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
        Evgeniy Baskov <baskov@ispras.ru>,
        Borislav Petkov <bp@alien8.de>,
        Andy Lutomirski <luto@kernel.org>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        Ingo Molnar <mingo@redhat.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Alexey Khoroshilov <khoroshilov@ispras.ru>,
        Peter Jones <pjones@redhat.com>,
        Gerd Hoffmann <kraxel@redhat.com>,
        Dave Young <dyoung@redhat.com>,
        Mario Limonciello <mario.limonciello@amd.com>,
        Kees Cook <keescook@chromium.org>,
        Tom Lendacky <thomas.lendacky@amd.com>,
        Linus Torvalds <torvalds@linux-foundation.org>
Subject: Re: [PATCH 4/6] x86: efistub: Perform 4/5 level paging switch from
 the stub
Message-ID: <20230426104200.drmuewhwmhh3xljh@box.shutemov.name>
References: <20230424165726.2245548-1-ardb@kernel.org>
 <20230424165726.2245548-5-ardb@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20230424165726.2245548-5-ardb@kernel.org>
Precedence: bulk

On Mon, Apr 24, 2023 at 06:57:24PM +0200, Ard Biesheuvel wrote:
> In preparation for updating the EFI stub boot flow to avoid the bare
> metal decompressor code altogether, implement the support code for
> switching between 4 and 5 levels of paging before jumping to the kernel
> proper.

I must admit it is neat. I like it a lot.

Any chance we can share the code with the traditional decompressor?
There's not much that EFI specific here. It should be possible to isolate
it from the rest, no?


> @@ -792,6 +925,14 @@ asmlinkage unsigned long efi_main(efi_handle_t handle,
>  				(get_efi_config_table(ACPI_20_TABLE_GUID) ?:
>  				 get_efi_config_table(ACPI_TABLE_GUID));
>  
> +#ifdef CONFIG_X86_64
> +	status = efi_setup_5level_paging();
> +	if (status != EFI_SUCCESS) {
> +		efi_err("efi_setup_5level_paging() failed!\n");
> +		goto fail;
> +	}
> +#endif
> +
>  	/*
>  	 * If the kernel isn't already loaded at a suitable address,
>  	 * relocate it.
> @@ -910,6 +1051,10 @@ asmlinkage unsigned long efi_main(efi_handle_t handle,
>  		goto fail;
>  	}
>  
> +#ifdef CONFIG_X86_64
> +	efi_5level_switch();
> +#endif
> +
>  	return bzimage_addr;
>  fail:
>  	efi_err("efi_main() failed!\n");

Maybe use IS_ENABLED() + dummy efi_setup_5level_paging()/efi_5level_switch()
instead of #ifdefs?

-- 
  Kiryl Shutsemau / Kirill A. Shutemov