* [PATCH 0/2] x86/sev-es: Remove dead code
@ 2020-10-05 15:12 Arvind Sankar
2020-10-05 15:12 ` [PATCH 1/2] x86/boot: Remove unused finalize_identity_maps() Arvind Sankar
2020-10-05 15:12 ` [PATCH 2/2] x86/head/64: Remove unused GET_CR2_INTO() macro Arvind Sankar
0 siblings, 2 replies; 5+ messages in thread
From: Arvind Sankar @ 2020-10-05 15:12 UTC (permalink / raw)
To: x86, Joerg Roedel; +Cc: linux-kernel
Delete some unused macros and an unused function.
One question:
4b47cdbda6f1 ("x86/head/64: Move early exception dispatch to C code")
uses native_read_cr2(), while the asm code it replaces may use paravirt
to read cr2. Is this intentional or should it be using read_cr2()?
Arvind Sankar (2):
x86/boot: Remove unused finalize_identity_maps()
x86/head/64: Remove unused GET_CR2_INTO() macro
arch/x86/boot/compressed/ident_map_64.c | 10 ----------
arch/x86/include/asm/paravirt.h | 11 -----------
arch/x86/kernel/asm-offsets.c | 1 -
arch/x86/kernel/head_64.S | 9 ---------
4 files changed, 31 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 1/2] x86/boot: Remove unused finalize_identity_maps() 2020-10-05 15:12 [PATCH 0/2] x86/sev-es: Remove dead code Arvind Sankar @ 2020-10-05 15:12 ` Arvind Sankar 2020-11-18 17:18 ` [tip: x86/cleanups] " tip-bot2 for Arvind Sankar 2020-10-05 15:12 ` [PATCH 2/2] x86/head/64: Remove unused GET_CR2_INTO() macro Arvind Sankar 1 sibling, 1 reply; 5+ messages in thread From: Arvind Sankar @ 2020-10-05 15:12 UTC (permalink / raw) To: x86, Joerg Roedel; +Cc: linux-kernel Commit [in tip/master] 8570978ea030 ("x86/boot/compressed/64: Don't pre-map memory in KASLR code") removed all the references to finalize_identity_maps(), but neglected to delete the actual function. Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> --- arch/x86/boot/compressed/ident_map_64.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c index 063a60edcf99..be97bf868638 100644 --- a/arch/x86/boot/compressed/ident_map_64.c +++ b/arch/x86/boot/compressed/ident_map_64.c @@ -156,16 +156,6 @@ void initialize_identity_maps(void) write_cr3(top_level_pgt); } -/* - * This switches the page tables to the new level4 that has been built - * via calls to add_identity_map() above. If booted via startup_32(), - * this is effectively a no-op. - */ -void finalize_identity_maps(void) -{ - write_cr3(top_level_pgt); -} - static pte_t *split_large_pmd(struct x86_mapping_info *info, pmd_t *pmdp, unsigned long __address) { -- 2.26.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [tip: x86/cleanups] x86/boot: Remove unused finalize_identity_maps() 2020-10-05 15:12 ` [PATCH 1/2] x86/boot: Remove unused finalize_identity_maps() Arvind Sankar @ 2020-11-18 17:18 ` tip-bot2 for Arvind Sankar 0 siblings, 0 replies; 5+ messages in thread From: tip-bot2 for Arvind Sankar @ 2020-11-18 17:18 UTC (permalink / raw) To: linux-tip-commits; +Cc: Arvind Sankar, Borislav Petkov, x86, linux-kernel The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 0ac317e89791b76055ef11b952625ef77a1d2eba Gitweb: https://git.kernel.org/tip/0ac317e89791b76055ef11b952625ef77a1d2eba Author: Arvind Sankar <nivedita@alum.mit.edu> AuthorDate: Mon, 05 Oct 2020 11:12:07 -04:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Wed, 18 Nov 2020 16:04:23 +01:00 x86/boot: Remove unused finalize_identity_maps() Commit 8570978ea030 ("x86/boot/compressed/64: Don't pre-map memory in KASLR code") removed all the references to finalize_identity_maps(), but neglected to delete the actual function. Remove it. Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20201005151208.2212886-2-nivedita@alum.mit.edu --- arch/x86/boot/compressed/ident_map_64.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/x86/boot/compressed/ident_map_64.c b/arch/x86/boot/compressed/ident_map_64.c index a5e5db6..6bf2022 100644 --- a/arch/x86/boot/compressed/ident_map_64.c +++ b/arch/x86/boot/compressed/ident_map_64.c @@ -167,16 +167,6 @@ void initialize_identity_maps(void *rmode) write_cr3(top_level_pgt); } -/* - * This switches the page tables to the new level4 that has been built - * via calls to add_identity_map() above. If booted via startup_32(), - * this is effectively a no-op. - */ -void finalize_identity_maps(void) -{ - write_cr3(top_level_pgt); -} - static pte_t *split_large_pmd(struct x86_mapping_info *info, pmd_t *pmdp, unsigned long __address) { ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] x86/head/64: Remove unused GET_CR2_INTO() macro 2020-10-05 15:12 [PATCH 0/2] x86/sev-es: Remove dead code Arvind Sankar 2020-10-05 15:12 ` [PATCH 1/2] x86/boot: Remove unused finalize_identity_maps() Arvind Sankar @ 2020-10-05 15:12 ` Arvind Sankar 2020-11-18 17:18 ` [tip: x86/cleanups] " tip-bot2 for Arvind Sankar 1 sibling, 1 reply; 5+ messages in thread From: Arvind Sankar @ 2020-10-05 15:12 UTC (permalink / raw) To: x86, Joerg Roedel; +Cc: linux-kernel Commit [in tip/master] 4b47cdbda6f1 ("x86/head/64: Move early exception dispatch to C code") removed the usage of GET_CR2_INTO(). Drop the definition as well, and related definitions in paravirt.h and asm-offsets.h Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> --- arch/x86/include/asm/paravirt.h | 11 ----------- arch/x86/kernel/asm-offsets.c | 1 - arch/x86/kernel/head_64.S | 9 --------- 3 files changed, 21 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index d25cc6830e89..f8dce11d2bc1 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -812,17 +812,6 @@ extern void default_banner(void); #endif /* CONFIG_PARAVIRT_XXL */ #endif /* CONFIG_X86_64 */ -#ifdef CONFIG_PARAVIRT_XXL - -#define GET_CR2_INTO_AX \ - PARA_SITE(PARA_PATCH(PV_MMU_read_cr2), \ - ANNOTATE_RETPOLINE_SAFE; \ - call PARA_INDIRECT(pv_ops+PV_MMU_read_cr2); \ - ) - -#endif /* CONFIG_PARAVIRT_XXL */ - - #endif /* __ASSEMBLY__ */ #else /* CONFIG_PARAVIRT */ # define default_banner x86_init_noop diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index 3ca07ad552ae..74d9b937cf7b 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -69,7 +69,6 @@ static void __used common(void) OFFSET(PV_IRQ_irq_disable, paravirt_patch_template, irq.irq_disable); OFFSET(PV_IRQ_irq_enable, paravirt_patch_template, irq.irq_enable); OFFSET(PV_CPU_iret, paravirt_patch_template, cpu.iret); - OFFSET(PV_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2); #endif #ifdef CONFIG_XEN diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 7eb2a1c87969..2215d4cff38b 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -26,15 +26,6 @@ #include <asm/nospec-branch.h> #include <asm/fixmap.h> -#ifdef CONFIG_PARAVIRT_XXL -#include <asm/asm-offsets.h> -#include <asm/paravirt.h> -#define GET_CR2_INTO(reg) GET_CR2_INTO_AX ; _ASM_MOV %_ASM_AX, reg -#else -#define INTERRUPT_RETURN iretq -#define GET_CR2_INTO(reg) _ASM_MOV %cr2, reg -#endif - /* * We are not able to switch in one step to the final KERNEL ADDRESS SPACE * because we need identity-mapped pages. -- 2.26.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [tip: x86/cleanups] x86/head/64: Remove unused GET_CR2_INTO() macro 2020-10-05 15:12 ` [PATCH 2/2] x86/head/64: Remove unused GET_CR2_INTO() macro Arvind Sankar @ 2020-11-18 17:18 ` tip-bot2 for Arvind Sankar 0 siblings, 0 replies; 5+ messages in thread From: tip-bot2 for Arvind Sankar @ 2020-11-18 17:18 UTC (permalink / raw) To: linux-tip-commits; +Cc: Arvind Sankar, Borislav Petkov, x86, linux-kernel The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 31d8546033053b98de00846ede8088bdbe38651d Gitweb: https://git.kernel.org/tip/31d8546033053b98de00846ede8088bdbe38651d Author: Arvind Sankar <nivedita@alum.mit.edu> AuthorDate: Mon, 05 Oct 2020 11:12:08 -04:00 Committer: Borislav Petkov <bp@suse.de> CommitterDate: Wed, 18 Nov 2020 18:09:38 +01:00 x86/head/64: Remove unused GET_CR2_INTO() macro Commit 4b47cdbda6f1 ("x86/head/64: Move early exception dispatch to C code") removed the usage of GET_CR2_INTO(). Drop the definition as well, and related definitions in paravirt.h and asm-offsets.h Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20201005151208.2212886-3-nivedita@alum.mit.edu --- arch/x86/include/asm/paravirt.h | 11 ----------- arch/x86/kernel/asm-offsets.c | 1 - arch/x86/kernel/head_64.S | 9 --------- 3 files changed, 21 deletions(-) diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index d25cc68..f8dce11 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h @@ -812,17 +812,6 @@ extern void default_banner(void); #endif /* CONFIG_PARAVIRT_XXL */ #endif /* CONFIG_X86_64 */ -#ifdef CONFIG_PARAVIRT_XXL - -#define GET_CR2_INTO_AX \ - PARA_SITE(PARA_PATCH(PV_MMU_read_cr2), \ - ANNOTATE_RETPOLINE_SAFE; \ - call PARA_INDIRECT(pv_ops+PV_MMU_read_cr2); \ - ) - -#endif /* CONFIG_PARAVIRT_XXL */ - - #endif /* __ASSEMBLY__ */ #else /* CONFIG_PARAVIRT */ # define default_banner x86_init_noop diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c index 70b7154..60b9f42 100644 --- a/arch/x86/kernel/asm-offsets.c +++ b/arch/x86/kernel/asm-offsets.c @@ -66,7 +66,6 @@ static void __used common(void) OFFSET(PV_IRQ_irq_disable, paravirt_patch_template, irq.irq_disable); OFFSET(PV_IRQ_irq_enable, paravirt_patch_template, irq.irq_enable); OFFSET(PV_CPU_iret, paravirt_patch_template, cpu.iret); - OFFSET(PV_MMU_read_cr2, paravirt_patch_template, mmu.read_cr2); #endif #ifdef CONFIG_XEN diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index 7eb2a1c..2215d4c 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S @@ -26,15 +26,6 @@ #include <asm/nospec-branch.h> #include <asm/fixmap.h> -#ifdef CONFIG_PARAVIRT_XXL -#include <asm/asm-offsets.h> -#include <asm/paravirt.h> -#define GET_CR2_INTO(reg) GET_CR2_INTO_AX ; _ASM_MOV %_ASM_AX, reg -#else -#define INTERRUPT_RETURN iretq -#define GET_CR2_INTO(reg) _ASM_MOV %cr2, reg -#endif - /* * We are not able to switch in one step to the final KERNEL ADDRESS SPACE * because we need identity-mapped pages. ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-18 17:18 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-10-05 15:12 [PATCH 0/2] x86/sev-es: Remove dead code Arvind Sankar 2020-10-05 15:12 ` [PATCH 1/2] x86/boot: Remove unused finalize_identity_maps() Arvind Sankar 2020-11-18 17:18 ` [tip: x86/cleanups] " tip-bot2 for Arvind Sankar 2020-10-05 15:12 ` [PATCH 2/2] x86/head/64: Remove unused GET_CR2_INTO() macro Arvind Sankar 2020-11-18 17:18 ` [tip: x86/cleanups] " tip-bot2 for Arvind Sankar
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.