x86/vdso: Move VDSO image init to vdso2c generated code
Subsystems (3)
PATCH 1/1 x86/vdso: Move VDSO image init to vdso2c generated code
Generate an init function for each VDSO image, replacing init_vdso() and sysenter_setup().
Signed-off-by Brian Gerst <[email protected]>
--- arch/x86/entry/vdso/vdso2c.h | 6 ++++++ arch/x86/entry/vdso/vdso32-setup.c | 9 --------- arch/x86/entry/vdso/vma.c | 19 ++++--------------- arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/vdso.h | 2 +- arch/x86/kernel/cpu/common.c | 1 - 6 files changed, 11 insertions(+), 27 deletions(-)
arch/x86/entry/vdso/vdso2c.h +6 -0
@@ -179,6 +179,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"/* AUTOMATICALLY GENERATED -- DO NOT EDIT */\n\n" );fprintf (outfile,"#include <linux/linkage.h>\n" ); +fprintf (outfile,"#include <linux/init.h>\n" );fprintf (outfile,"#include <asm/page_types.h>\n" );fprintf (outfile,"#include <asm/vdso.h>\n" );fprintf (outfile,"\n" );
@@ -218,5 +219,10 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"\t.sym_%s = %" PRIi64",\n" , required_syms[i].name, (int64_t )syms[i]); } +fprintf (outfile,"};\n\n" ); +fprintf (outfile,"static __init int init_%s(void) {\n" , image_name); +fprintf (outfile,"\treturn init_vdso_image(&%s);\n" , image_name);fprintf (outfile,"};\n" ); +fprintf (outfile,"subsys_initcall(init_%s);\n" , image_name); + }
arch/x86/entry/vdso/vdso32-setup.c +0 -9
@@ -51,17 +51,8 @@ __setup("vdso32=", vdso32_setup);__setup_param ("vdso=" , vdso_setup, vdso32_setup,0 );#endif -int __init sysenter_setup (void ) -{ -init_vdso_image (&vdso_image_32); - -return 0 ; -} -#ifdef CONFIG_X86_64 -subsys_initcall (sysenter_setup); -#ifdef CONFIG_SYSCTL /* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h>
arch/x86/entry/vdso/vma.c +4 -15
@@ -44,13 +44,16 @@ unsigned int vclocks_used __read_mostly;unsigned int __read_mostly vdso64_enabled =1 ;#endif -void __init init_vdso_image (const struct vdso_image *image) +int __init init_vdso_image (const struct vdso_image *image) { +BUILD_BUG_ON (VDSO_CLOCKMODE_MAX >=32 );BUG_ON (image->size %PAGE_SIZE !=0 );apply_alternatives ((struct alt_instr *)(image->data + image->alt), (struct alt_instr *)(image->data + image->alt + image->alt_len)); + +return 0 ; }static const struct vm_special_mapping vvar_mapping;
@@ -418,18 +421,4 @@ static __init int vdso_setup(char *s) return 1; }__setup ("vdso=" , vdso_setup); - -static int __init init_vdso (void ) -{ -BUILD_BUG_ON (VDSO_CLOCKMODE_MAX >=32 ); - -init_vdso_image (&vdso_image_64); - -#ifdef CONFIG_X86_X32_ABI -init_vdso_image (&vdso_image_x32); -#endif - -return 0 ; -} -subsys_initcall (init_vdso);#endif /* CONFIG_X86_64 */
arch/x86/include/asm/processor.h +0 -1
@@ -542,7 +542,6 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, IDLE_POLL};extern void enable_sep_cpu (void ); -extern int sysenter_setup (void );/* Defined in head.S */
arch/x86/include/asm/vdso.h +1 -1
@@ -45,7 +45,7 @@ extern const struct vdso_image vdso_image_x32;extern const struct vdso_image vdso_image_32;#endif -extern void __init init_vdso_image (const struct vdso_image *image); +extern int __init init_vdso_image (const struct vdso_image *image);extern int map_vdso_once (const struct vdso_image *image,unsigned long addr);
arch/x86/kernel/cpu/common.c +0 -1
@@ -1953,7 +1953,6 @@ void __init identify_boot_cpu(void)if (HAS_KERNEL_IBT &&cpu_feature_enabled (X86_FEATURE_IBT ))pr_info ("CET detected: Indirect Branch Tracking enabled\n" );#ifdef CONFIG_X86_32 -sysenter_setup ();enable_sep_cpu ();#endif cpu_detect_tlb (&boot_cpu_data);
Signature · 1 line
2.39.1
The following commit has been merged into the x86/vdso branch of tip:
The following commit has been merged into the x86/vdso branch of tip:
Commit-ID: 4c382d723edce1b3c72b55b1b505cf5526a56afc Gitweb: https://git.kernel.org/tip/4c382d723edce1b3c72b55b1b505cf5526a56afc Author: Brian Gerst <[email protected]> AuthorDate: Tue, 24 Jan 2023 13:40:19 -05:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Wed, 25 Jan 2023 12:33:40 +01:00
x86/vdso: Move VDSO image init to vdso2c generated code
Generate an init function for each VDSO image, replacing init_vdso() and sysenter_setup().
Signed-off-by Brian Gerst <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/entry/vdso/vdso2c.h | 6 ++++++ arch/x86/entry/vdso/vdso32-setup.c | 9 --------- arch/x86/entry/vdso/vma.c | 19 ++++--------------- arch/x86/include/asm/processor.h | 1 - arch/x86/include/asm/vdso.h | 2 +- arch/x86/kernel/cpu/common.c | 1 - 6 files changed, 11 insertions(+), 27 deletions(-)
arch/x86/entry/vdso/vdso2c.h +6 -0
@@ -179,6 +179,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"/* AUTOMATICALLY GENERATED -- DO NOT EDIT */\n\n" );fprintf (outfile,"#include <linux/linkage.h>\n" ); +fprintf (outfile,"#include <linux/init.h>\n" );fprintf (outfile,"#include <asm/page_types.h>\n" );fprintf (outfile,"#include <asm/vdso.h>\n" );fprintf (outfile,"\n" );
@@ -218,5 +219,10 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,fprintf (outfile,"\t.sym_%s = %" PRIi64",\n" , required_syms[i].name, (int64_t )syms[i]); } +fprintf (outfile,"};\n\n" ); +fprintf (outfile,"static __init int init_%s(void) {\n" , image_name); +fprintf (outfile,"\treturn init_vdso_image(&%s);\n" , image_name);fprintf (outfile,"};\n" ); +fprintf (outfile,"subsys_initcall(init_%s);\n" , image_name); + }
arch/x86/entry/vdso/vdso32-setup.c +0 -9
@@ -51,17 +51,8 @@ __setup("vdso32=", vdso32_setup);__setup_param ("vdso=" , vdso_setup, vdso32_setup,0 );#endif -int __init sysenter_setup (void ) -{ -init_vdso_image (&vdso_image_32); - -return 0 ; -} -#ifdef CONFIG_X86_64 -subsys_initcall (sysenter_setup); -#ifdef CONFIG_SYSCTL /* Register vsyscall32 into the ABI table */ #include <linux/sysctl.h>
arch/x86/entry/vdso/vma.c +4 -15
@@ -44,13 +44,16 @@ unsigned int vclocks_used __read_mostly;unsigned int __read_mostly vdso64_enabled =1 ;#endif -void __init init_vdso_image (const struct vdso_image *image) +int __init init_vdso_image (const struct vdso_image *image) { +BUILD_BUG_ON (VDSO_CLOCKMODE_MAX >=32 );BUG_ON (image->size %PAGE_SIZE !=0 );apply_alternatives ((struct alt_instr *)(image->data + image->alt), (struct alt_instr *)(image->data + image->alt + image->alt_len)); + +return 0 ; }static const struct vm_special_mapping vvar_mapping;
@@ -418,18 +421,4 @@ static __init int vdso_setup(char *s) return 1; }__setup ("vdso=" , vdso_setup); - -static int __init init_vdso (void ) -{ -BUILD_BUG_ON (VDSO_CLOCKMODE_MAX >=32 ); - -init_vdso_image (&vdso_image_64); - -#ifdef CONFIG_X86_X32_ABI -init_vdso_image (&vdso_image_x32); -#endif - -return 0 ; -} -subsys_initcall (init_vdso);#endif /* CONFIG_X86_64 */
arch/x86/include/asm/processor.h +0 -1
@@ -542,7 +542,6 @@ enum idle_boot_override {IDLE_NO_OVERRIDE=0, IDLE_HALT, IDLE_NOMWAIT, IDLE_POLL};extern void enable_sep_cpu (void ); -extern int sysenter_setup (void );/* Defined in head.S */
arch/x86/include/asm/vdso.h +1 -1
@@ -45,7 +45,7 @@ extern const struct vdso_image vdso_image_x32;extern const struct vdso_image vdso_image_32;#endif -extern void __init init_vdso_image (const struct vdso_image *image); +extern int __init init_vdso_image (const struct vdso_image *image);extern int map_vdso_once (const struct vdso_image *image,unsigned long addr);
arch/x86/kernel/cpu/common.c +0 -1
@@ -1953,7 +1953,6 @@ void __init identify_boot_cpu(void)if (HAS_KERNEL_IBT &&cpu_feature_enabled (X86_FEATURE_IBT ))pr_info ("CET detected: Indirect Branch Tracking enabled\n" );#ifdef CONFIG_X86_32 -sysenter_setup ();enable_sep_cpu ();#endif cpu_detect_tlb (&boot_cpu_data);