x86/mtrr: Rename mtrr_overwrite_state() to guest_force_mtrr_state()

Rename the helper to better reflect its function.

Suggested-by: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Dave Hansen <dave.hansen@intel.com>
Reviewed-by: Michael Kelley <mhklinux@outlook.com>
Link: https://lore.kernel.org/r/20241202073139.448208-1-kirill.shutemov@linux.intel.com

diff --git a/arch/x86/hyperv/ivm.c b/arch/x86/hyperv/ivm.c
index 60fc3ed728304c547efc9d67c3c89bf5ebe0b628..90aabe1fd3b66e2b15ff7c19d89e616c07de8497 100644 (file)
--- 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 4218248083d985142d03044705a694e965c2c6f1..c69e269937c567c95e357d7b469a949ccb1b33da 100644 (file)
--- 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 7b29ebda024f4e69bc9a9326f9cecd8a86ee2abb..2fdfda2b60e4f8e44a3f2ed3203eac94e3d7cad5 100644 (file)
--- 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 989d368be04fccebdffd7da5a4a2ef029823c2b3..ecbda0341a8a32f9952b3818c622c22eefda0991 100644 (file)
--- 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 21e9e4845354159cf289eb765a63e80e69a12e25..7a422a6c5983c81aa473a00b04952e046e3bf6c8 100644 (file)
--- 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 d6818c6cafda1612bfe404235772555f14d67780..633469fab5362f4280bff26684b7f934d0ce1d7e 100644 (file)
--- 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();