From: Evgeniy Baskov <baskov@ispras.ru>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: 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>,
"Limonciello, Mario" <mario.limonciello@amd.com>,
joeyli <jlee@suse.com>,
lvc-project@linuxtesting.org, x86@kernel.org,
linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH v4 13/26] x86/boot: Split trampoline and pt init code
Date: Sat, 11 Mar 2023 17:37:45 +0300 [thread overview]
Message-ID: <6af9c283edb024c26242120124936a03@ispras.ru> (raw)
In-Reply-To: <CAMj1kXGwaX8nGJdRM3==thO=KfXb3UwbF2jJhrqiZK-RcM+QLw@mail.gmail.com>
On 2023-03-10 17:56, Ard Biesheuvel wrote:
> On Thu, 15 Dec 2022 at 13:40, Evgeniy Baskov <baskov@ispras.ru> wrote:
>>
>> When allocating trampoline from libstub trampoline allocation is
>> performed separately, so it needs to be skipped.
>>
>> Split trampoline initialization and allocation code into two
>> functions to make them invokable separately.
>>
>> Tested-by: Mario Limonciello <mario.limonciello@amd.com>
>> Tested-by: Peter Jones <pjones@redhat.com>
>> Signed-off-by: Evgeniy Baskov <baskov@ispras.ru>
>> ---
>> arch/x86/boot/compressed/pgtable_64.c | 73
>> +++++++++++++++++----------
>> 1 file changed, 46 insertions(+), 27 deletions(-)
>>
>> diff --git a/arch/x86/boot/compressed/pgtable_64.c
>> b/arch/x86/boot/compressed/pgtable_64.c
>> index c7cf5a1059a8..1f7169248612 100644
>> --- a/arch/x86/boot/compressed/pgtable_64.c
>> +++ b/arch/x86/boot/compressed/pgtable_64.c
>> @@ -106,12 +106,8 @@ static unsigned long
>> find_trampoline_placement(void)
>> return bios_start - TRAMPOLINE_32BIT_SIZE;
>> }
>>
>> -struct paging_config paging_prepare(void *rmode)
>> +bool trampoline_pgtable_init(struct boot_params *boot_params)
>> {
>> - struct paging_config paging_config = {};
>> -
>> - /* Initialize boot_params. Required for
>> cmdline_find_option_bool(). */
>> - boot_params = rmode;
>>
>> /*
>> * Check if LA57 is desired and supported.
>> @@ -125,26 +121,10 @@ struct paging_config paging_prepare(void *rmode)
>> *
>> * That's substitute for boot_cpu_has() in early boot code.
>> */
>> - if (IS_ENABLED(CONFIG_X86_5LEVEL) &&
>> - !cmdline_find_option_bool("no5lvl") &&
>> - native_cpuid_eax(0) >= 7 &&
>> - (native_cpuid_ecx(7) & (1 << (X86_FEATURE_LA57
>> & 31)))) {
>> - paging_config.l5_required = 1;
>> - }
>> -
>> - paging_config.trampoline_start = find_trampoline_placement();
>> -
>> - trampoline_32bit = (unsigned long
>> *)paging_config.trampoline_start;
>> -
>> - /* Preserve trampoline memory */
>> - memcpy(trampoline_save, trampoline_32bit,
>> TRAMPOLINE_32BIT_SIZE);
>> -
>> - /* Clear trampoline memory first */
>> - memset(trampoline_32bit, 0, TRAMPOLINE_32BIT_SIZE);
>> -
>> - /* Copy trampoline code in place */
>> - memcpy(trampoline_32bit + TRAMPOLINE_32BIT_CODE_OFFSET /
>> sizeof(unsigned long),
>> - &trampoline_32bit_src,
>> TRAMPOLINE_32BIT_CODE_SIZE);
>> + bool l5_required = IS_ENABLED(CONFIG_X86_5LEVEL) &&
>> + !cmdline_find_option_bool("no5lvl") &&
>> + native_cpuid_eax(0) >= 7 &&
>> + (native_cpuid_ecx(7) & (1 <<
>> (X86_FEATURE_LA57 & 31)));
>>
>> /*
>> * The code below prepares page table in trampoline memory.
>> @@ -160,10 +140,10 @@ struct paging_config paging_prepare(void *rmode)
>> * We are not going to use the page table in trampoline memory
>> if we
>> * are already in the desired paging mode.
>> */
>> - if (paging_config.l5_required == !!(native_read_cr4() &
>> X86_CR4_LA57))
>> + if (l5_required == !!(native_read_cr4() & X86_CR4_LA57))
>> goto out;
>>
>> - if (paging_config.l5_required) {
>> + if (l5_required) {
>> /*
>> * For 4- to 5-level paging transition, set up current
>> CR3 as
>> * the first and the only entry in a new top-level
>> page table.
>> @@ -185,6 +165,45 @@ struct paging_config paging_prepare(void *rmode)
>> (void *)src, PAGE_SIZE);
>> }
>>
>> +out:
>> + return l5_required;
>> +}
>> +
>> +struct paging_config paging_prepare(void *rmode)
>> +{
>> + struct paging_config paging_config = {};
>> + bool early_trampoline_alloc = 0;
>
> false
>
>> +
>> + /* Initialize boot_params. Required for
>> cmdline_find_option_bool(). */
>> + boot_params = rmode;
>> +
>> + /*
>> + * We only need to find trampoline placement, if we have
>> + * not already done it from libstub.
>> + */
>> +
>> + paging_config.trampoline_start = find_trampoline_placement();
>> + trampoline_32bit = (unsigned long
>> *)paging_config.trampoline_start;
>> + early_trampoline_alloc = 0;
>> +
>
> false again
>
> And it never becomes true, nor is it used anywhere else. Can we get rid
> of it?
Yes, probably it is just a leftover of the approach I used
before. I'll remove that.
>
>> + /*
>> + * Preserve trampoline memory.
>> + * When trampoline is located in memory
>> + * owned by us, i.e. allocated in EFISTUB,
>> + * we don't care about previous contents
>> + * of this memory so copying can also be skipped.
>
> Can you please reflow comments so they takes up fewer lines?
>
Will fix.
>> + */
>> + memcpy(trampoline_save, trampoline_32bit,
>> TRAMPOLINE_32BIT_SIZE);
>> +
>> + /* Clear trampoline memory first */
>> + memset(trampoline_32bit, 0, TRAMPOLINE_32BIT_SIZE);
>> +
>> + /* Copy trampoline code in place */
>> + memcpy(trampoline_32bit + TRAMPOLINE_32BIT_CODE_OFFSET /
>> sizeof(unsigned long),
>> + &trampoline_32bit_src,
>> TRAMPOLINE_32BIT_CODE_SIZE);
>> +
>> + paging_config.l5_required =
>> trampoline_pgtable_init(boot_params);
>> +
>> out:
>> return paging_config;
>> }
>> --
>> 2.37.4
>>
next prev parent reply other threads:[~2023-03-11 14:37 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-15 12:37 [PATCH v4 00/26] x86_64: Improvements at compressed kernel stage Evgeniy Baskov
2022-12-15 12:37 ` [PATCH v4 01/26] x86/boot: Align vmlinuz sections on page size Evgeniy Baskov
2023-03-10 14:43 ` Ard Biesheuvel
2023-03-11 14:30 ` Evgeniy Baskov
2023-03-11 14:42 ` Ard Biesheuvel
2022-12-15 12:37 ` [PATCH v4 02/26] x86/build: Remove RWX sections and align on 4KB Evgeniy Baskov
2023-03-10 14:45 ` Ard Biesheuvel
2023-03-11 14:31 ` Evgeniy Baskov
2022-12-15 12:37 ` [PATCH v4 03/26] x86/boot: Set cr0 to known state in trampoline Evgeniy Baskov
2023-03-10 14:48 ` Ard Biesheuvel
2022-12-15 12:37 ` [PATCH v4 04/26] x86/boot: Increase boot page table size Evgeniy Baskov
2023-03-08 9:24 ` Ard Biesheuvel
2022-12-15 12:37 ` [PATCH v4 05/26] x86/boot: Support 4KB pages for identity mapping Evgeniy Baskov
2023-03-08 9:42 ` Ard Biesheuvel
2023-03-08 16:11 ` Evgeniy Baskov
2022-12-15 12:37 ` [PATCH v4 06/26] x86/boot: Setup memory protection for bzImage code Evgeniy Baskov
2023-03-08 10:47 ` Ard Biesheuvel
2023-03-08 16:15 ` Evgeniy Baskov
2022-12-15 12:37 ` [PATCH v4 07/26] x86/build: Check W^X of vmlinux during build Evgeniy Baskov
2023-03-08 9:34 ` Ard Biesheuvel
2023-03-08 16:05 ` Evgeniy Baskov
2022-12-15 12:37 ` [PATCH v4 08/26] x86/boot: Map memory explicitly Evgeniy Baskov
2023-03-08 9:38 ` Ard Biesheuvel
2023-03-08 10:28 ` Ard Biesheuvel
2023-03-08 16:09 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 09/26] x86/boot: Remove mapping from page fault handler Evgeniy Baskov
2023-03-10 14:49 ` Ard Biesheuvel
2022-12-15 12:38 ` [PATCH v4 10/26] efi/libstub: Move helper function to related file Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 11/26] x86/boot: Make console interface more abstract Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 12/26] x86/boot: Make kernel_add_identity_map() a pointer Evgeniy Baskov
2023-03-10 14:52 ` Ard Biesheuvel
2023-03-11 14:34 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 13/26] x86/boot: Split trampoline and pt init code Evgeniy Baskov
2023-03-10 14:56 ` Ard Biesheuvel
2023-03-11 14:37 ` Evgeniy Baskov [this message]
2022-12-15 12:38 ` [PATCH v4 14/26] x86/boot: Add EFI kernel extraction interface Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 15/26] efi/x86: Support extracting kernel from libstub Evgeniy Baskov
2023-03-09 16:00 ` Ard Biesheuvel
2023-03-09 17:05 ` Evgeniy Baskov
2023-03-09 16:49 ` Ard Biesheuvel
2023-03-09 17:10 ` Evgeniy Baskov
2023-03-09 17:11 ` Ard Biesheuvel
2023-03-10 15:08 ` Ard Biesheuvel
2022-12-15 12:38 ` [PATCH v4 16/26] x86/boot: Reduce lower limit of physical KASLR Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 17/26] x86/boot: Reduce size of the DOS stub Evgeniy Baskov
2023-03-10 14:59 ` Ard Biesheuvel
2023-03-11 14:49 ` Evgeniy Baskov
2023-03-11 17:27 ` Ard Biesheuvel
2023-03-12 12:10 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 18/26] tools/include: Add simplified version of pe.h Evgeniy Baskov
2023-03-10 15:01 ` Ard Biesheuvel
2022-12-15 12:38 ` [PATCH v4 19/26] x86/build: Cleanup tools/build.c Evgeniy Baskov
2023-03-09 15:57 ` Ard Biesheuvel
2023-03-09 16:25 ` Evgeniy Baskov
2023-03-09 16:50 ` Ard Biesheuvel
2023-03-09 17:22 ` Evgeniy Baskov
2023-03-09 17:37 ` Ard Biesheuvel
2022-12-15 12:38 ` [PATCH v4 20/26] x86/build: Make generated PE more spec compliant Evgeniy Baskov
2023-03-10 15:17 ` Ard Biesheuvel
2023-03-11 15:02 ` Evgeniy Baskov
2023-03-11 17:31 ` Ard Biesheuvel
2023-03-12 12:01 ` Evgeniy Baskov
2023-03-12 13:09 ` Ard Biesheuvel
2023-03-13 9:11 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 21/26] efi/x86: Explicitly set sections memory attributes Evgeniy Baskov
2023-03-10 15:20 ` Ard Biesheuvel
2023-03-11 15:09 ` Evgeniy Baskov
2023-03-11 17:39 ` Ard Biesheuvel
2023-03-12 12:10 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 22/26] efi/libstub: Add memory attribute protocol definitions Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 23/26] efi/libstub: Use memory attribute protocol Evgeniy Baskov
2023-03-10 16:13 ` Ard Biesheuvel
2023-03-11 15:14 ` Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 24/26] efi/libstub: make memory protection warnings include newlines Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 25/26] efi/x86: don't try to set page attributes on 0-sized regions Evgeniy Baskov
2022-12-15 12:38 ` [PATCH v4 26/26] efi/x86: don't set unsupported memory attributes Evgeniy Baskov
2022-12-15 19:21 ` [PATCH v4 00/26] x86_64: Improvements at compressed kernel stage Peter Jones
2022-12-19 14:08 ` Evgeniy Baskov
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=6af9c283edb024c26242120124936a03@ispras.ru \
--to=baskov@ispras.ru \
--cc=ardb@kernel.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=jlee@suse.com \
--cc=khoroshilov@ispras.ru \
--cc=linux-efi@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=lvc-project@linuxtesting.org \
--cc=mario.limonciello@amd.com \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjones@redhat.com \
--cc=tglx@linutronix.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).