x86: arrange for ENDBR zapping from <vendor>_ctxt_switch_masking()
PATCH 1/1 x86: arrange for ENDBR zapping from <vendor>_ctxt_switch_masking()
While altcall is already used for them, the functions want announcing in .init.rodata.cf_clobber, even if the resulting static variables aren't otherwise used.
While doing this also move ctxt_switch_masking to .data.ro_after_init.
xen/arch/x86/cpu/amd.c +5 -0
@@ -258,6 +258,11 @@ static void cf_check amd_ctxt_switch_mas#undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + amd_ctxt_switch_masking; +#endif +/* * Mask the features and extended features returned by CPUID. Parameters are * set from the boot line via two methods:
xen/arch/x86/cpu/common.c +1 -1
@@ -119,7 +119,7 @@ static const struct cpu_dev __initconst_static const struct cpu_dev *this_cpu = &default_cpu; static DEFINE_PER_CPU(uint64_t, msr_misc_features); -void (*__read_mostly ctxt_switch_masking)(const struct vcpu *next); +void (*__ro_after_init ctxt_switch_masking)(const struct vcpu *next);bool __init probe_cpuid_faulting (void ) {
xen/arch/x86/cpu/intel.c +5 -0
@@ -220,6 +220,11 @@ static void cf_check intel_ctxt_switch_m#undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + intel_ctxt_switch_masking; +#endif +/* * opt_cpuid_mask_ecx/edx: cpuid.1[ecx, edx] feature mask. * For example, E8400[Intel Core 2 Duo Processor series] ecx = 0x0008E3FD,
Quoted 7 lines · Jan Beulich
While altcall is already used for them, the functions want announcing in .init.rodata.cf_clobber, even if the resulting static variables aren't otherwise used.
While doing this also move
ctxt_switch_maskingto .data.ro_after_init.Signed-off-by Jan Beulich <[email protected]>
xen/arch/x86/cpu/amd.c static void cf_check amd_ctxt_switch_mas · line 264
Quoted 11 lines
xen/arch/x86/cpu/amd.c +4
-0@@ -258,6 +258,11 @@ static void cf_check amd_ctxt_switch_mas#undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + amd_ctxt_switch_masking; +#endif
If we gain more of these, I suspect we'll want a wrapper for it.
Irritatingly you can't pass parameters into global asm, because the nice way to do this would be an _ASM_PTR in a pushsection.
~Andrew
Quoted 10 lines · Andrew Cooper
Quoted 7 lines · Jan Beulich
While altcall is already used for them, the functions want announcing in .init.rodata.cf_clobber, even if the resulting static variables aren't otherwise used.
While doing this also move
ctxt_switch_maskingto .data.ro_after_init.Signed-off-by Jan Beulich <[email protected]>Reviewed-by Andrew Cooper <[email protected]>
Thanks.
Quoted 13 lines
xen/arch/x86/cpu/amd.c static void cf_check amd_ctxt_switch_mas · line 264
Quoted 10 lines
xen/arch/x86/cpu/amd.c +4
-0@@ -258,6 +258,11 @@ static void cf_check amd_ctxt_switch_mas#undef LAZY } +#ifdef CONFIG_XEN_IBT /* Announce the function to ENDBR clobbering logic. */ +static const typeof(ctxt_switch_masking) __initconst_cf_clobber __used csm = + amd_ctxt_switch_masking; +#endif If we gain more of these, I suspect we'll want a wrapper for it.
Quoted 2 lines
Irritatingly you can't pass parameters into global asm, because the nice way to do this would be an
_ASM_PTRin a pushsection.
While I'm not convinced resorting to asm() here would indeed be a good thing, for very many years I've been carrying a gcc change to permit exactly this. I don't even recall anymore why it wasn't liked upstream.
Jan