x86/CPUID: move some static masks into .init
PATCH 1/1 x86/CPUID: move some static masks into .init
Except for hvm_shadow_max_featuremask and deep_features they're referenced by __init functions only.
xen/arch/x86/cpuid.c +8 -5
@@ -16,12 +16,15 @@const uint32_t known_features[] =INIT_KNOWN_FEATURES ;const uint32_t special_features[] =INIT_SPECIAL_FEATURES ; -static const uint32_t pv_max_featuremask[] =INIT_PV_MAX_FEATURES ; +static const uint32_t __initconst pv_max_featuremask[] =INIT_PV_MAX_FEATURES ;static const uint32_t hvm_shadow_max_featuremask[] =INIT_HVM_SHADOW_MAX_FEATURES ; -static const uint32_t hvm_hap_max_featuremask[] =INIT_HVM_HAP_MAX_FEATURES ; -static const uint32_t pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; -static const uint32_t hvm_shadow_def_featuremask[] =INIT_HVM_SHADOW_DEF_FEATURES ; -static const uint32_t hvm_hap_def_featuremask[] =INIT_HVM_HAP_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_max_featuremask[] = +INIT_HVM_HAP_MAX_FEATURES ; +static const uint32_t __initconst pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; +static const uint32_t __initconst hvm_shadow_def_featuremask[] = +INIT_HVM_SHADOW_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_def_featuremask[] = +INIT_HVM_HAP_DEF_FEATURES ;static const uint32_t deep_features[] =INIT_DEEP_FEATURES ;static int __init parse_xen_cpuid (const char *s)
Ping: [PATCH] x86/CPUID: move some static masks into .init
Quoted 29 lines · Jan Beulich
Except for
hvm_shadow_max_featuremaskanddeep_featuresthey're referenced by__initfunctions only.Signed-off-by Jan Beulich <[email protected]>xen/arch/x86/cpuid.c +8
-5@@ -16,12 +16,15 @@const uint32_t known_features[] =INIT_KNOWN_FEATURES ;const uint32_t special_features[] =INIT_SPECIAL_FEATURES ; -static const uint32_t pv_max_featuremask[] =INIT_PV_MAX_FEATURES ; +static const uint32_t __initconst pv_max_featuremask[] =INIT_PV_MAX_FEATURES ;static const uint32_t hvm_shadow_max_featuremask[] =INIT_HVM_SHADOW_MAX_FEATURES ; -static const uint32_t hvm_hap_max_featuremask[] =INIT_HVM_HAP_MAX_FEATURES ; -static const uint32_t pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; -static const uint32_t hvm_shadow_def_featuremask[] =INIT_HVM_SHADOW_DEF_FEATURES ; -static const uint32_t hvm_hap_def_featuremask[] =INIT_HVM_HAP_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_max_featuremask[] = +INIT_HVM_HAP_MAX_FEATURES ; +static const uint32_t __initconst pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; +static const uint32_t __initconst hvm_shadow_def_featuremask[] = +INIT_HVM_SHADOW_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_def_featuremask[] = +INIT_HVM_HAP_DEF_FEATURES ;static const uint32_t deep_features[] =INIT_DEEP_FEATURES ;static int __init parse_xen_cpuid (const char *s)
Ping²: [PATCH] x86/CPUID: move some static masks into .init
Quoted 28 lines · Jan Beulich
Quoted 27 lines · Jan Beulich
Except for
hvm_shadow_max_featuremaskanddeep_featuresthey're referenced by__initfunctions only.Signed-off-by Jan Beulich <[email protected]>xen/arch/x86/cpuid.c +8
-5@@ -16,12 +16,15 @@const uint32_t known_features[] =INIT_KNOWN_FEATURES ;const uint32_t special_features[] =INIT_SPECIAL_FEATURES ; -static const uint32_t pv_max_featuremask[] =INIT_PV_MAX_FEATURES ; +static const uint32_t __initconst pv_max_featuremask[] =INIT_PV_MAX_FEATURES ;static const uint32_t hvm_shadow_max_featuremask[] =INIT_HVM_SHADOW_MAX_FEATURES ; -static const uint32_t hvm_hap_max_featuremask[] =INIT_HVM_HAP_MAX_FEATURES ; -static const uint32_t pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; -static const uint32_t hvm_shadow_def_featuremask[] =INIT_HVM_SHADOW_DEF_FEATURES ; -static const uint32_t hvm_hap_def_featuremask[] =INIT_HVM_HAP_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_max_featuremask[] = +INIT_HVM_HAP_MAX_FEATURES ; +static const uint32_t __initconst pv_def_featuremask[] =INIT_PV_DEF_FEATURES ; +static const uint32_t __initconst hvm_shadow_def_featuremask[] = +INIT_HVM_SHADOW_DEF_FEATURES ; +static const uint32_t __initconst hvm_hap_def_featuremask[] = +INIT_HVM_HAP_DEF_FEATURES ;static const uint32_t deep_features[] =INIT_DEEP_FEATURES ;
Quoted 1 line
xen/arch/x86/cpuid.c line 30
Quoted 1 line
xen/arch/x86/cpuid.c +0
-0static int __init parse_xen_cpuid (const char *s)
While I seem to recall that you, Andrew, said on irc that this change may need almost immediate reverting with some further work you were meaning to do, this work hasn't surfaced in the 8.5 months this patch has been pending. Therefore I think I should have gone in right at the time. Even if it's going to get (partly) reverted over time, I think until such time it is benefitial to have that data moved to .init. I therefore intend to commit this, again if need be without any acks, once the tree is fully open again.
Jan
Quoted 4 lines · Jan Beulich
Except for
hvm_shadow_max_featuremaskanddeep_featuresthey're referenced by__initfunctions only.Signed-off-by Jan Beulich <[email protected]>
AFAICT those are still only used by __init functions:
And making those non-init when required is trivial.
Thanks, Roger.