x86/boot: Don't return encryption mask from __startup_64()
PATCH v8 1/1 x86/boot: Don't return encryption mask from __startup_64()
From: Khalid Ali <[email protected]>
Avoid returning encryption mask to callers of __startup_64().
The encryption mask is available to callers and canbe accessed sme_get_me_mask() in C code and sme_me_mask symbol in assembly code.
This change aligns the way the mask is retrieved in secondary_startup_64_no_verify().
No functionality change intended, only consistency improvement, so the code becomes cleaner.
On intel processors sme_me_mask is zero. So, it is safe to add mask only if CONFIG_AMD_MEM_ENCRYPT.
---
Changes in v8:
* Improve commit message for clarity.
Changes in v7:
* Improve commit message for better clarity.
* Add Huang, Kai Ack tag.
* Fix parameter aligment.
* Fix patch style issues.
arch/x86/boot/startup/map_kernel.c | 17 ++++++----------- arch/x86/include/asm/setup.h | 2 +- arch/x86/kernel/head_64.S | 14 ++++++++------ 3 files changed, 15 insertions(+), 18 deletions(-)
arch/x86/boot/startup/map_kernel.c +6 -11
@@ -30,9 +30,9 @@ static inline bool check_la57_support(void)return true; } -static unsigned long __head sme_postprocess_startup (struct boot_params *bp, -pmdval_t *pmd, -unsigned long p2v_offset) +static void __head sme_postprocess_startup(struct boot_params *bp, +pmdval_t *pmd, +unsigned long p2v_offset) {unsigned long paddr, paddr_end;int i;
@@ -68,11 +68,6 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp, } } -/* -* Return the SME encryption mask (if SME is active) to be used as a -* modifier for the initial pgdir entry programmed into CR3. -*/ -return sme_get_me_mask (); }/*
@@ -84,8 +79,8 @@ static unsigned long __head sme_postprocess_startup(struct boot_params *bp,* the 1:1 mapping of memory. Kernel virtual addresses can be determined by * subtracting p2v_offset from the RIP-relative address. */ -unsigned long __head __startup_64 (unsigned long p2v_offset, -struct boot_params *bp) +void __head __startup_64(unsigned long p2v_offset, +struct boot_params *bp) {pmd_t (*early_pgts)[PTRS_PER_PMD ] =rip_rel_ptr (early_dynamic_pgts);unsigned long physaddr = (unsigned long )rip_rel_ptr (_text);
@@ -213,5 +208,5 @@ unsigned long __head __startup_64(unsigned long p2v_offset,for (; i <PTRS_PER_PMD ; i++) pmd[i] &= ~_PAGE_PRESENT; -return sme_postprocess_startup (bp, pmd, p2v_offset); +sme_postprocess_startup (bp, pmd, p2v_offset); }
arch/x86/include/asm/setup.h +1 -1
@@ -50,7 +50,7 @@ extern unsigned long acpi_realmode_flags;extern void reserve_standard_io_resources (void );extern void i386_reserve_resources (void ); -extern unsigned long __startup_64 (unsigned long p2v_offset,struct boot_params *bp); +extern void __startup_64 (unsigned long p2v_offset,struct boot_params *bp);extern void startup_64_setup_gdt_idt (void );extern void startup_64_load_idt (void *vc_handler);extern void early_setup_idt (void );
arch/x86/kernel/head_64.S +8 -6
@@ -106,18 +106,20 @@ SYM_CODE_START_NOALIGN(startup_64) /* * Perform pagetable fixups. Additionally, if SME is active, encrypt - * the kernel and retrieve the modifier (SME encryption mask if SME - * is active) to be added to the initial pgdir entry that will be - * programmed into CR3. - */ + * the kernel. + */ movq %r15, %rsi call __startup_64 /* Form the CR3 value being sure to include the CR3 modifier */ - leaq early_top_pgt(%rip), %rcx - addq %rcx, %rax + leaq early_top_pgt(%rip), %rax #ifdef CONFIG_AMD_MEM_ENCRYPT + /* Retrieve the modifier (SME encryption mask if SME + * is active) to be added to the initial pgdir entry that will be + * programmed into CR3. + */ + addq sme_me_mask(%rip), %rax mov %rax, %rdi /*
Signature · 1 line
2.49.0
Quoted 5 lines · Khalid Ali
From: Khalid Ali <[email protected]>
Avoid returning encryption mask to callers of
__startup_64().The encryption mask is available to callers and canbe accessed
^ can be
Quoted 11 lines
sme_get_me_mask()in C code andsme_me_masksymbol in assembly code.This change aligns the way the mask is retrieved in
secondary_startup_64_no_verify().No functionality change intended, only consistency improvement, so the code becomes cleaner.
On intel processors
sme_me_maskis zero. So, it is safe to add mask only ifCONFIG_AMD_MEM_ENCRYPT.
Quoted 6 lines
Signed-off-by Khalid Ali <[email protected]>Acked-by Kai Huang <[email protected]>---
Changes in v8:
* Improve commit message for clarity.
Apparently not jut commit message change, since ...
arch/x86/kernel/head_64.S SYM_CODE_START_NOALIGN(startup_64) · line 110
Quoted 8 lines
arch/x86/kernel/head_64.S +2
-4/* * Perform pagetable fixups. Additionally, if SME is active, encrypt - * the kernel and retrieve the modifier (SME encryption mask if SME - * is active) to be added to the initial pgdir entry that will be - * programmed into CR3. - */ + * the kernel. + */
... the indent of this comment is broken. Your v7 was fine.
And ...
arch/x86/kernel/head_64.S SYM_CODE_START_NOALIGN(startup_64) · line 121
Quoted 13 lines
arch/x86/kernel/head_64.S +5
-2movq %r15, %rsi call __startup_64 /* Form the CR3 value being sure to include the CR3 modifier */ - leaq early_top_pgt(%rip), %rcx - addq %rcx, %rax + leaq early_top_pgt(%rip), %rax #ifdef CONFIG_AMD_MEM_ENCRYPT + /* Retrieve the modifier (SME encryption mask if SME + * is active) to be added to the initial pgdir entry that will be + * programmed into CR3. + */
... this comment style is broken too. Again, your v7 was fine:
+ /*
+ * Retrieve the modifier (SME encryption mask if SME
+ * is active) to be added to the initial pgdir entry that will be
+ * programmed into CR3.
+ */
I am not sure how you ended up with those random broken changes, because they are quite unusual to me.
Could you please remove my Acked-by?