* [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() [not found] <20241015095818.357915-1-kirill.shutemov@linux.intel.com> @ 2024-10-16 10:50 ` Kirill A. Shutemov 2024-10-19 5:11 ` Michael Kelley 2024-10-29 15:13 ` Kirill A. Shutemov 0 siblings, 2 replies; 5+ messages in thread From: Kirill A. Shutemov @ 2024-10-16 10:50 UTC (permalink / raw) To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86 Cc: K. Y. Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui, H. Peter Anvin, Paolo Bonzini, Vitaly Kuznetsov, Juergen Gross, Boris Ostrovsky, Kirill A. Shutemov, Gaosheng Cui, Michael Roth, Tom Lendacky, Ashish Kalra, Kai Huang, Andi Kleen, Sean Christopherson, Xiaoyao Li, linux-hyperv, linux-kernel, kvm, xen-devel, Dave Hansen 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> --- 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 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* RE: [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() 2024-10-16 10:50 ` [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() Kirill A. Shutemov @ 2024-10-19 5:11 ` Michael Kelley 2024-10-29 15:13 ` Kirill A. Shutemov 1 sibling, 0 replies; 5+ messages in thread From: Michael Kelley @ 2024-10-19 5:11 UTC (permalink / raw) To: Kirill A. Shutemov, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86@kernel.org Cc: K. Y. Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui, H. Peter Anvin, Paolo Bonzini, Vitaly Kuznetsov, Juergen Gross, Boris Ostrovsky, Gaosheng Cui, Michael Roth, Tom Lendacky, Ashish Kalra, Kai Huang, Andi Kleen, Sean Christopherson, Xiaoyao Li, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org, Dave Hansen From: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Sent: Wednesday, October 16, 2024 3:51 AM > > 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> > --- > 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 > LGTM Reviewed-by: Michael Kelley <mhklinux@outlook.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() 2024-10-16 10:50 ` [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() Kirill A. Shutemov 2024-10-19 5:11 ` Michael Kelley @ 2024-10-29 15:13 ` Kirill A. Shutemov 2024-10-29 17:37 ` Dave Hansen 1 sibling, 1 reply; 5+ messages in thread From: Kirill A. Shutemov @ 2024-10-29 15:13 UTC (permalink / raw) To: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86 Cc: K. Y. Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui, H. Peter Anvin, Paolo Bonzini, Vitaly Kuznetsov, Juergen Gross, Boris Ostrovsky, Gaosheng Cui, Michael Roth, Tom Lendacky, Ashish Kalra, Kai Huang, Andi Kleen, Sean Christopherson, Xiaoyao Li, linux-hyperv, linux-kernel, kvm, xen-devel, Dave Hansen On Wed, Oct 16, 2024 at 01:50:48PM +0300, 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> KVM patch is Linus' tree. Dave, can you take this one? -- Kiryl Shutsemau / Kirill A. Shutemov ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() 2024-10-29 15:13 ` Kirill A. Shutemov @ 2024-10-29 17:37 ` Dave Hansen 2024-10-29 19:32 ` Kirill A. Shutemov 0 siblings, 1 reply; 5+ messages in thread From: Dave Hansen @ 2024-10-29 17:37 UTC (permalink / raw) To: Kirill A. Shutemov, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86 Cc: K. Y. Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui, H. Peter Anvin, Paolo Bonzini, Vitaly Kuznetsov, Juergen Gross, Boris Ostrovsky, Gaosheng Cui, Michael Roth, Tom Lendacky, Ashish Kalra, Kai Huang, Andi Kleen, Sean Christopherson, Xiaoyao Li, linux-hyperv, linux-kernel, kvm, xen-devel On 10/29/24 08:13, Kirill A. Shutemov wrote: > On Wed, Oct 16, 2024 at 01:50:48PM +0300, 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> > > KVM patch is Linus' tree. > > Dave, can you take this one? Not easily without a merge of Paolo's KVM bits. The confusion that might cause isn't quite worth it for a rename. I can either stash this somewhere or I'm also fine if Paolo takes it on top of your other patch: Acked-by: Dave Hansen <dave.hansen@intel.com> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() 2024-10-29 17:37 ` Dave Hansen @ 2024-10-29 19:32 ` Kirill A. Shutemov 0 siblings, 0 replies; 5+ messages in thread From: Kirill A. Shutemov @ 2024-10-29 19:32 UTC (permalink / raw) To: Dave Hansen Cc: Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen, x86, K. Y. Srinivasan, Haiyang Zhang, Wei Liu, Dexuan Cui, H. Peter Anvin, Paolo Bonzini, Vitaly Kuznetsov, Juergen Gross, Boris Ostrovsky, Gaosheng Cui, Michael Roth, Tom Lendacky, Ashish Kalra, Kai Huang, Andi Kleen, Sean Christopherson, Xiaoyao Li, linux-hyperv, linux-kernel, kvm, xen-devel On Tue, Oct 29, 2024 at 10:37:07AM -0700, Dave Hansen wrote: > On 10/29/24 08:13, Kirill A. Shutemov wrote: > > On Wed, Oct 16, 2024 at 01:50:48PM +0300, 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> > > > > KVM patch is Linus' tree. > > > > Dave, can you take this one? > > Not easily without a merge of Paolo's KVM bits. The confusion that > might cause isn't quite worth it for a rename. I can either stash this > somewhere or I'm also fine if Paolo takes it on top of your other patch: > > Acked-by: Dave Hansen <dave.hansen@intel.com> I don't follow what is the problem. As I said KVM patch is already in Linus' tree -- v6.12-rc5 -- and tip tree already uses the tag as basis for x86/urgent. Hm? -- Kiryl Shutsemau / Kirill A. Shutemov ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-10-29 19:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20241015095818.357915-1-kirill.shutemov@linux.intel.com>
2024-10-16 10:50 ` [PATCH] x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state() Kirill A. Shutemov
2024-10-19 5:11 ` Michael Kelley
2024-10-29 15:13 ` Kirill A. Shutemov
2024-10-29 17:37 ` Dave Hansen
2024-10-29 19:32 ` Kirill A. Shutemov
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox