Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

authored by

Kirill A. Shutemov and committed by
Ingo Molnar
dd405963 9d93db0d

+13 -13
+1 -1
arch/x86/hyperv/ivm.c
··· 664 664 x86_platform.guest.enc_status_change_finish = hv_vtom_set_host_visibility; 665 665 666 666 /* Set WB as the default cache mode. */ 667 - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); 667 + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); 668 668 } 669 669 670 670 #endif /* defined(CONFIG_AMD_MEM_ENCRYPT) || defined(CONFIG_INTEL_TDX_GUEST) */
+5 -5
arch/x86/include/asm/mtrr.h
··· 58 58 */ 59 59 # ifdef CONFIG_MTRR 60 60 void mtrr_bp_init(void); 61 - void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, 62 - mtrr_type def_type); 61 + void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, 62 + mtrr_type def_type); 63 63 extern u8 mtrr_type_lookup(u64 addr, u64 end, u8 *uniform); 64 64 extern void mtrr_save_fixed_ranges(void *); 65 65 extern void mtrr_save_state(void); ··· 75 75 void mtrr_enable(void); 76 76 void mtrr_generic_set_state(void); 77 77 # else 78 - static inline void mtrr_overwrite_state(struct mtrr_var_range *var, 79 - unsigned int num_var, 80 - mtrr_type def_type) 78 + static inline void guest_force_mtrr_state(struct mtrr_var_range *var, 79 + unsigned int num_var, 80 + mtrr_type def_type) 81 81 { 82 82 } 83 83
+3 -3
arch/x86/kernel/cpu/mtrr/generic.c
··· 423 423 } 424 424 425 425 /** 426 - * mtrr_overwrite_state - set static MTRR state 426 + * guest_force_mtrr_state - set static MTRR state for a guest 427 427 * 428 428 * Used to set MTRR state via different means (e.g. with data obtained from 429 429 * a hypervisor). ··· 436 436 * @num_var: length of the @var array 437 437 * @def_type: default caching type 438 438 */ 439 - void mtrr_overwrite_state(struct mtrr_var_range *var, unsigned int num_var, 440 - mtrr_type def_type) 439 + void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var, 440 + mtrr_type def_type) 441 441 { 442 442 unsigned int i; 443 443
+1 -1
arch/x86/kernel/cpu/mtrr/mtrr.c
··· 625 625 static int __init mtrr_init_finalize(void) 626 626 { 627 627 /* 628 - * Map might exist if mtrr_overwrite_state() has been called or if 628 + * Map might exist if guest_force_mtrr_state() has been called or if 629 629 * mtrr_enabled() returns true. 630 630 */ 631 631 mtrr_copy_map();
+1 -1
arch/x86/kernel/kvm.c
··· 983 983 x86_platform.apic_post_init = kvm_apic_init; 984 984 985 985 /* Set WB as the default cache mode for SEV-SNP and TDX */ 986 - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); 986 + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); 987 987 } 988 988 989 989 #if defined(CONFIG_AMD_MEM_ENCRYPT)
+2 -2
arch/x86/xen/enlighten_pv.c
··· 171 171 172 172 /* Only overwrite MTRR state if any MTRR could be got from Xen. */ 173 173 if (reg) 174 - mtrr_overwrite_state(var, reg, MTRR_TYPE_UNCACHABLE); 174 + guest_force_mtrr_state(var, reg, MTRR_TYPE_UNCACHABLE); 175 175 #endif 176 176 } 177 177 ··· 195 195 if (xen_initial_domain()) 196 196 xen_set_mtrr_data(); 197 197 else 198 - mtrr_overwrite_state(NULL, 0, MTRR_TYPE_WRBACK); 198 + guest_force_mtrr_state(NULL, 0, MTRR_TYPE_WRBACK); 199 199 200 200 /* Adjust nr_cpu_ids before "enumeration" happens */ 201 201 xen_smp_count_cpus();