| Message ID | 20241202073139.448208-1-kirill.shutemov@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [RESEND] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() | expand |
From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Sent: Sunday, December 1, 2024 11:32 PM > > Rename the helper to better reflect its function. > > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> > Suggested-by: Dave Hansen <dave.hansen@intel.com> > Acked-by: Dave Hansen <dave.hansen@intel.com> FWIW, I previously gave my "Reviewed-by" on this patch [1]. I didn't call it out explicitly, but did so for the patch in general as well as specifically for the Hyper-V related change. Michael [1]: https://lore.kernel.org/linux-hyperv/SN6PR02MB4157C91EE70F4EF4B6EDDE46D4412@SN6PR02MB4157.namprd02.prod.outlook.com/ > --- > arch/x86/hyperv/ivm.c | 2 +- > arch/x86/include/asm/mtrr.h | 10 +++++----- > arch/x86/kernel/cpu/mtrr/generic.c | 6 +++--- > arch/x86/kernel/cpu/mtrr/mtrr.c | 2 +- > arch/x86/kernel/kvm.c | 2 +- > arch/x86/xen/enlighten_pv.c | 4 ++-- > 6 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c > index 60fc3ed72830..90aabe1fd3b6 100644 > --- a/arch/x86/hyperv/ivm.c > +++ b/arch/x86/hyperv/ivm.c > @@ -664,7 +664,7 @@ void __init hv_vtom_init(void) > x86_platform.guest.enc_status_change_finish = hv_vtom_set_host_visibility; > > /* Set WB as the default cache mode. */ > - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); > + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); > } > > #endif /* defined(CONFIG_AMD_MEM_ENCRYPT) || > defined(CONFIG_INTEL_TDX_GUEST) */ > diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h > index 4218248083d9..c69e269937c5 100644 > --- a/arch/x86/include/asm/mtrr.h > +++ b/arch/x86/include/asm/mtrr.h > @@ -58,8 +58,8 @@ struct mtrr_state_type { > */ > # ifdef CONFIG_MTRR > void mtrr_bp_init(void); > -void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, > - mtrr_type def_type); > +void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, > + mtrr_type def_type); > extern u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform); > extern void mtrr_save_fixed_ranges(void *); > extern void mtrr_save_state(void); > @@ -75,9 +75,9 @@ void mtrr_disable(void); > void mtrr_enable(void); > void mtrr_generic_set_state(void); > # else > -static inline void mtrr_overwrite_state(struct mtrr_var_range *var, > - unsigned int num_var, > - mtrr_type def_type) > +static inline void guest_force_mtrr_state(struct mtrr_var_range *var, > + unsigned int num_var, > + mtrr_type def_type) > { > } > > diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c > index 7b29ebda024f..2fdfda2b60e4 100644 > --- a/arch/x86/kernel/cpu/mtrr/generic.c > +++ b/arch/x86/kernel/cpu/mtrr/generic.c > @@ -423,7 +423,7 @@ void __init mtrr_copy_map(void) > } > > /** > - * mtrr_overwrite_state - set static MTRR state > + * guest_force_mtrr_state - set static MTRR state for a guest > * > * Used to set MTRR state via different means (e.g. with data obtained from > * a hypervisor). > @@ -436,8 +436,8 @@ void __init mtrr_copy_map(void) > * @num_var: length of the @var array > * @def_type: default caching type > */ > -void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, > - mtrr_type def_type) > +void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, > + mtrr_type def_type) > { > unsigned int i; > > diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c > index 989d368be04f..ecbda0341a8a 100644 > --- a/arch/x86/kernel/cpu/mtrr/mtrr.c > +++ b/arch/x86/kernel/cpu/mtrr/mtrr.c > @@ -625,7 +625,7 @@ void mtrr_save_state(void) > static int __init mtrr_init_finalize(void) > { > /* > - * Map might exist if mtrr_overwrite_state() has been called or if > + * Map might exist if guest_force_mtrr_state() has been called or if > * mtrr_enabled() returns true. > */ > mtrr_copy_map(); > diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c > index 21e9e4845354..7a422a6c5983 100644 > --- a/arch/x86/kernel/kvm.c > +++ b/arch/x86/kernel/kvm.c > @@ -983,7 +983,7 @@ static void __init kvm_init_platform(void) > x86_platform.apic_post_init = kvm_apic_init; > > /* Set WB as the default cache mode for SEV-SNP and TDX */ > - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); > + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); > } > > #if defined(CONFIG_AMD_MEM_ENCRYPT) > diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c > index d6818c6cafda..633469fab536 100644 > --- a/arch/x86/xen/enlighten_pv.c > +++ b/arch/x86/xen/enlighten_pv.c > @@ -171,7 +171,7 @@ static void __init xen_set_mtrr_data(void) > > /* Only overwrite MTRR state if any MTRR could be got from Xen. */ > if (reg) > - mtrr_overwrite_state(var, reg, MTRR_TYPE_UNCACHABLE); > + guest_force_mtrr_state(var, reg, MTRR_TYPE_UNCACHABLE); > #endif > } > > @@ -195,7 +195,7 @@ static void __init xen_pv_init_platform(void) > if (xen_initial_domain()) > xen_set_mtrr_data(); > else > - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); > + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); > > /* Adjust nr_cpu_ids before "enumeration" happens */ > xen_smp_count_cpus(); > -- > 2.45.2 >
On Mon, Dec 02, 2024 at 09:31:39AM +0200, Kirill A. Shutemov wrote: > Rename the helper to better reflect its function. > > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> > Suggested-by: Dave Hansen <dave.hansen@intel.com> > Acked-by: Dave Hansen <dave.hansen@intel.com> > --- > arch/x86/hyperv/ivm.c | 2 +- Acked-by: Wei Liu <wei.liu@kernel.org>
diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c index 60fc3ed72830..90aabe1fd3b6 100644 --- a/arch/x86/hyperv/ivm.c +++ b/arch/x86/hyperv/ivm.c @@ -664,7 +664,7 @@ void __init hv_vtom_init(void) x86_platform.guest.enc_status_change_finish = hv_vtom_set_host_visibility; /* Set WB as the default cache mode. */ - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); } #endif /* defined(CONFIG_AMD_MEM_ENCRYPT) || defined(CONFIG_INTEL_TDX_GUEST) */ diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 4218248083d9..c69e269937c5 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -58,8 +58,8 @@ struct mtrr_state_type { */ # ifdef CONFIG_MTRR void mtrr_bp_init(void); -void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, - mtrr_type def_type); +void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, + mtrr_type def_type); extern u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform); extern void mtrr_save_fixed_ranges(void *); extern void mtrr_save_state(void); @@ -75,9 +75,9 @@ void mtrr_disable(void); void mtrr_enable(void); void mtrr_generic_set_state(void); # else -static inline void mtrr_overwrite_state(struct mtrr_var_range *var, - unsigned int num_var, - mtrr_type def_type) +static inline void guest_force_mtrr_state(struct mtrr_var_range *var, + unsigned int num_var, + mtrr_type def_type) { } diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c index 7b29ebda024f..2fdfda2b60e4 100644 --- a/arch/x86/kernel/cpu/mtrr/generic.c +++ b/arch/x86/kernel/cpu/mtrr/generic.c @@ -423,7 +423,7 @@ void __init mtrr_copy_map(void) } /** - * mtrr_overwrite_state - set static MTRR state + * guest_force_mtrr_state - set static MTRR state for a guest * * Used to set MTRR state via different means (e.g. with data obtained from * a hypervisor). @@ -436,8 +436,8 @@ void __init mtrr_copy_map(void) * @num_var: length of the @var array * @def_type: default caching type */ -void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, - mtrr_type def_type) +void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, + mtrr_type def_type) { unsigned int i; diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c index 989d368be04f..ecbda0341a8a 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.c +++ b/arch/x86/kernel/cpu/mtrr/mtrr.c @@ -625,7 +625,7 @@ void mtrr_save_state(void) static int __init mtrr_init_finalize(void) { /* - * Map might exist if mtrr_overwrite_state() has been called or if + * Map might exist if guest_force_mtrr_state() has been called or if * mtrr_enabled() returns true. */ mtrr_copy_map(); diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c index 21e9e4845354..7a422a6c5983 100644 --- a/arch/x86/kernel/kvm.c +++ b/arch/x86/kernel/kvm.c @@ -983,7 +983,7 @@ static void __init kvm_init_platform(void) x86_platform.apic_post_init = kvm_apic_init; /* Set WB as the default cache mode for SEV-SNP and TDX */ - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); } #if defined(CONFIG_AMD_MEM_ENCRYPT) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index d6818c6cafda..633469fab536 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -171,7 +171,7 @@ static void __init xen_set_mtrr_data(void) /* Only overwrite MTRR state if any MTRR could be got from Xen. */ if (reg) - mtrr_overwrite_state(var, reg, MTRR_TYPE_UNCACHABLE); + guest_force_mtrr_state(var, reg, MTRR_TYPE_UNCACHABLE); #endif } @@ -195,7 +195,7 @@ static void __init xen_pv_init_platform(void) if (xen_initial_domain()) xen_set_mtrr_data(); else - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); /* Adjust nr_cpu_ids before "enumeration" happens */ xen_smp_count_cpus();