x86: harden use of calc_ler_msr()
PATCH 1/1 x86: harden use of calc_ler_msr()
Avoid calling the function more than once, thus making sure we won't, under any unusual circumstances, attempt to enable XEN_LER late (which can't work, for setup_force_cpu_cap() being __init. In turn this then allows making the function itself __init, too.
While fiddling with section attributes in this area, also move the two involved variables to .data.ro_after_init.
xen/arch/x86/traps.c +13 -4
@@ -126,11 +126,11 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_pstatic int debug_stack_lines =20 ;integer_param ("debug_stack_lines" , debug_stack_lines); -static bool opt_ler; +static bool __ro_after_init opt_ler;boolean_param ("ler" , opt_ler);/* LastExceptionFromIP on this hardware. Zero if LER is not in use. */ -unsigned int __read_mostly ler_msr; +unsigned int __ro_after_init ler_msr;const unsigned int nmi_cpu;
@@ -2133,7 +2133,7 @@ static void __init set_intr_gate(unsigne__set_intr_gate (n,0 , addr); } -static unsigned int calc_ler_msr (void ) +static unsigned int noinline __init calc_ler_msr(void) {switch ( boot_cpu_data.x86_vendor ) {
@@ -2171,8 +2171,17 @@ void percpu_traps_init(void)if ( !opt_ler )return ; -if ( !ler_msr && (ler_msr =calc_ler_msr ()) ) +if ( !ler_msr ) + { + ler_msr =calc_ler_msr (); +if ( !ler_msr ) + { + opt_ler = false; +return ; + } +setup_force_cpu_cap (X86_FEATURE_XEN_LBR ); + }if ( cpu_has_xen_lbr )wrmsrl (MSR_IA32_DEBUGCTLMSR ,IA32_DEBUGCTLMSR_LBR );
Quoted 36 lines · Jan Beulich
Avoid calling the function more than once, thus making sure we won't, under any unusual circumstances, attempt to enable
XEN_LERlate (which can't work, forsetup_force_cpu_cap()being__init. In turn this then allows making the function itself__init, too.While fiddling with section attributes in this area, also move the two involved variables to .data.ro_after_init.
Signed-off-by Jan Beulich <[email protected]>xen/arch/x86/traps.c +3
-3@@ -126,11 +126,11 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_pstatic int debug_stack_lines =20 ;integer_param ("debug_stack_lines" , debug_stack_lines); -static bool opt_ler; +static bool __ro_after_init opt_ler;boolean_param ("ler" , opt_ler);/* LastExceptionFromIP on this hardware. Zero if LER is not in use. */ -unsigned int __read_mostly ler_msr; +unsigned int __ro_after_init ler_msr;const unsigned int nmi_cpu;@@ -2133,7 +2133,7 @@ static void __init set_intr_gate(unsigne__set_intr_gate (n,0 , addr); } -static unsigned int calc_ler_msr (void ) +static unsigned int noinline __init calc_ler_msr(void) {switch ( boot_cpu_data.x86_vendor ) {
xen/arch/x86/traps.c void percpu_traps_init(void) · line 2178
Quoted 9 lines
xen/arch/x86/traps.c +5
-1@@ -2171,8 +2171,17 @@ void percpu_traps_init(void)if ( !opt_ler )return ; -if ( !ler_msr && (ler_msr =calc_ler_msr ()) ) +if ( !ler_msr ) + { + ler_msr =calc_ler_msr (); +if ( !ler_msr ) + {
While doing this rework it might make sense to print some message here, like: "LER option requested but no LBR support available" or similar IMO.
The rest LGTM:
Thanks, Roger.
Quoted 40 lines · Roger Pau Monné
Quoted 39 lines · Jan Beulich
Avoid calling the function more than once, thus making sure we won't, under any unusual circumstances, attempt to enable
XEN_LERlate (which can't work, forsetup_force_cpu_cap()being__init. In turn this then allows making the function itself__init, too.While fiddling with section attributes in this area, also move the two involved variables to .data.ro_after_init.
Signed-off-by Jan Beulich <[email protected]>xen/arch/x86/traps.c +3
-3@@ -126,11 +126,11 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_pstatic int debug_stack_lines =20 ;integer_param ("debug_stack_lines" , debug_stack_lines); -static bool opt_ler; +static bool __ro_after_init opt_ler;boolean_param ("ler" , opt_ler);/* LastExceptionFromIP on this hardware. Zero if LER is not in use. */ -unsigned int __read_mostly ler_msr; +unsigned int __ro_after_init ler_msr;const unsigned int nmi_cpu;@@ -2133,7 +2133,7 @@ static void __init set_intr_gate(unsigne__set_intr_gate (n,0 , addr); } -static unsigned int calc_ler_msr (void ) +static unsigned int noinline __init calc_ler_msr(void) {switch ( boot_cpu_data.x86_vendor ) {@@ -2171,8 +2171,17 @@ void percpu_traps_init(void)if ( !opt_ler )return ;
Quoted 10 lines
xen/arch/x86/traps.c void percpu_traps_init(void) · line 2178
Quoted 6 lines
xen/arch/x86/traps.c +5
-1-if ( !ler_msr && (ler_msr =calc_ler_msr ()) ) +if ( !ler_msr ) + { + ler_msr =calc_ler_msr (); +if ( !ler_msr ) + {While doing this rework it might make sense to print some message here, like: "LER option requested but no LBR support available" or similar IMO.
Hmm, yes, but you look to do so in your series already. Could we leave things silent here (as it always was) until your adding of arch-LBR support, and then taking care of both failure conditions with a single log message? Of course I could add a message here just for you to then (likely) alter it again ...
Quoted 3 lines
The rest LGTM:
Reviewed-by Roger Pau Monné <[email protected]>
Thanks, but I'll wait with applying this.
Jan
Quoted 52 lines · Jan Beulich
Quoted 40 lines · Roger Pau Monné
Quoted 39 lines · Jan Beulich
Avoid calling the function more than once, thus making sure we won't, under any unusual circumstances, attempt to enable
XEN_LERlate (which can't work, forsetup_force_cpu_cap()being__init. In turn this then allows making the function itself__init, too.While fiddling with section attributes in this area, also move the two involved variables to .data.ro_after_init.
Signed-off-by Jan Beulich <[email protected]>xen/arch/x86/traps.c +3
-3@@ -126,11 +126,11 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct tss_pstatic int debug_stack_lines =20 ;integer_param ("debug_stack_lines" , debug_stack_lines); -static bool opt_ler; +static bool __ro_after_init opt_ler;boolean_param ("ler" , opt_ler);/* LastExceptionFromIP on this hardware. Zero if LER is not in use. */ -unsigned int __read_mostly ler_msr; +unsigned int __ro_after_init ler_msr;const unsigned int nmi_cpu;@@ -2133,7 +2133,7 @@ static void __init set_intr_gate(unsigne__set_intr_gate (n,0 , addr); } -static unsigned int calc_ler_msr (void ) +static unsigned int noinline __init calc_ler_msr(void) {switch ( boot_cpu_data.x86_vendor ) {@@ -2171,8 +2171,17 @@ void percpu_traps_init(void)if ( !opt_ler )return ;Quoted 10 lines
xen/arch/x86/traps.c void percpu_traps_init(void) · line 2178
Quoted 6 lines
xen/arch/x86/traps.c +5
-1-if ( !ler_msr && (ler_msr =calc_ler_msr ()) ) +if ( !ler_msr ) + { + ler_msr =calc_ler_msr (); +if ( !ler_msr ) + {While doing this rework it might make sense to print some message here, like: "LER option requested but no LBR support available" or similar IMO.
Quoted 5 lines
Hmm, yes, but you look to do so in your series already. Could we leave things silent here (as it always was) until your adding of arch-LBR support, and then taking care of both failure conditions with a single log message? Of course I could add a message here just for you to then (likely) alter it again ...
Oh, so I do introduce one, sorry I didn't remember. Then it's fine to go as-is.
Thanks, Roger.