Skip to contentSkip to conversation

x86/mm/64: free the gap between BSS_MAIN and BSS_DECRYPTED

PATCH Superseded Hamza Mahfooz 2 participants 3 messages Jul 20

Subsystems (2)

v4 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 x86/mm/64: free the gap between BSS_MAIN and BSS_DECRYPTED

This region is unused and takes up, up to 2 MiB of memory if AMD_MEM_ENCRYPT is enabled. So, free it in mem_encrypt_free_decrypted_mem().

---
 arch/x86/include/asm/mem_encrypt.h | 3 ++-
 arch/x86/kernel/vmlinux.lds.S      | 2 ++
 arch/x86/mm/mem_encrypt_amd.c      | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
arch/x86/include/asm/mem_encrypt.h +2 -1
index ea6494628cb0..c9722be2808f 100644
@@ -112,7 +112,8 @@ void add_encrypt_protection_map(void);
 #define __sme_pa(x)		(__pa(x) | sme_me_mask)
 #define __sme_pa_nodebug(x)	(__pa_nodebug(x) | sme_me_mask)
 
-extern char __start_bss_decrypted[], __end_bss_decrypted[], __start_bss_decrypted_unused[];
+extern char __start_bss_decrypted_gap[], __start_bss_decrypted[],
+	__end_bss_decrypted[], __start_bss_decrypted_unused[];
 
 #endif	/* __ASSEMBLER__ */
 
arch/x86/kernel/vmlinux.lds.S +2 -0
index 4711a35e706c..179578a08da1 100644
@@ -88,6 +88,8 @@ const_cpu_current_top_of_stack = cpu_current_top_of_stack;
  * decrypted to avoid exposing more than we wish.
  */
 #define BSS_DECRYPTED						\
+	. = ALIGN(PAGE_SIZE);					\
+	__start_bss_decrypted_gap = .;				\
 	. = ALIGN(PMD_SIZE);					\
 	__start_bss_decrypted = .;				\
 	__pi___start_bss_decrypted = .;				\
arch/x86/mm/mem_encrypt_amd.c +6 -0
index 2f8c32173972..8d518571ae5c 100644
@@ -566,4 +566,10 @@ void __init mem_encrypt_free_decrypted_mem(void)
 	}
 
 	free_init_pages("unused decrypted", vaddr, vaddr_end);
+
+	vaddr = PFN_ALIGN(__start_bss_decrypted_gap);
+	vaddr_end = PFN_ALIGN(__start_bss_decrypted);
+
+	free_kernel_image_pages("unused kernel image (bss_decrypted gap)",
+				(void *)vaddr, (void *)vaddr_end);
 }
Signature · 1 line
2.55.0
#1 lore raw
Quoted 3 lines · Hamza Mahfooz

This region is unused and takes up, up to 2 MiB of memory if AMD_MEM_ENCRYPT is enabled. So, free it in mem_encrypt_free_decrypted_mem().

For something like this, I'd really appreciate if contributors bring _some_ kind of mention of testing to the changelog.

A great addition to this would be a blurb that mentioned an increase in MemFree on boot, or a note about the delta in dmesg on startup that shows the patch working.

Quoted 18 lines
arch/x86/kernel/vmlinux.lds.S +2 -0
index 4711a35e706c..179578a08da1 100644
@@ -88,6 +88,8 @@ const_cpu_current_top_of_stack = cpu_current_top_of_stack;
  * decrypted to avoid exposing more than we wish.
  */
 #define BSS_DECRYPTED						\
+	. = ALIGN(PAGE_SIZE);					\
+	__start_bss_decrypted_gap = .;				\
 	. = ALIGN(PMD_SIZE);					\
 	__start_bss_decrypted = .;				\
 	__pi___start_bss_decrypted = .;				\
arch/x86/mm/mem_encrypt_amd.c +0 -0
index 2f8c32173972..8d518571ae5c 100644

arch/x86/mm/mem_encrypt_amd.c void __init mem_encrypt_free_decrypted_mem(void) · line 575

Quoted 10 lines
arch/x86/mm/mem_encrypt_amd.c +6 -0
@@ -566,4 +566,10 @@ void __init mem_encrypt_free_decrypted_mem(void)
 	}
 
 	free_init_pages("unused decrypted", vaddr, vaddr_end);
+
+	vaddr = PFN_ALIGN(__start_bss_decrypted_gap);
+	vaddr_end = PFN_ALIGN(__start_bss_decrypted);
+
+	free_kernel_image_pages("unused kernel image (bss_decrypted gap)",
+				(void *)vaddr, (void *)vaddr_end);
 }

What purpose do the two new PFN_ALIGN()s serve?

#2 lore raw
Quoted 11 lines · Dave Hansen
Quoted 3 lines · Hamza Mahfooz

This region is unused and takes up, up to 2 MiB of memory if AMD_MEM_ENCRYPT is enabled. So, free it in mem_encrypt_free_decrypted_mem().

For something like this, I'd really appreciate if contributors bring _some_ kind of mention of testing to the changelog.

A great addition to this would be a blurb that mentioned an increase in MemFree on boot, or a note about the delta in dmesg on startup that shows the patch working.

Sure, I did test this on a CoCo VM FWIW and was able to verify that the code actually ran and that MemFree was lower on boot.

Quoted 21 lines
Quoted 21 lines
arch/x86/kernel/vmlinux.lds.S +2 -0
index 4711a35e706c..179578a08da1 100644
@@ -88,6 +88,8 @@ const_cpu_current_top_of_stack = cpu_current_top_of_stack;
  * decrypted to avoid exposing more than we wish.
  */
 #define BSS_DECRYPTED						\
+	. = ALIGN(PAGE_SIZE);					\
+	__start_bss_decrypted_gap = .;				\
 	. = ALIGN(PMD_SIZE);					\
 	__start_bss_decrypted = .;				\
 	__pi___start_bss_decrypted = .;				\
arch/x86/mm/mem_encrypt_amd.c +0 -0
index 2f8c32173972..8d518571ae5c 100644
@@ -566,4 +566,10 @@ void __init mem_encrypt_free_decrypted_mem(void)
 	}
 
Quoted 10 lines

arch/x86/mm/mem_encrypt_amd.c void __init mem_encrypt_free_decrypted_mem(void) · line 575

Quoted 8 lines
arch/x86/mm/mem_encrypt_amd.c +6 -0
 	free_init_pages("unused decrypted", vaddr, vaddr_end);
+
+	vaddr = PFN_ALIGN(__start_bss_decrypted_gap);
+	vaddr_end = PFN_ALIGN(__start_bss_decrypted);
+
+	free_kernel_image_pages("unused kernel image (bss_decrypted gap)",
+				(void *)vaddr, (void *)vaddr_end);
 }

What purpose do the two new PFN_ALIGN()s serve?

On closer examination they do seem redundant. I will retest without them and respin if that is working fine.