Commit 6a5abeea authored by Kiryl Shutsemau's avatar Kiryl Shutsemau Committed by Dave Hansen
Browse files

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



Rename the helper to better reflect its function.

Suggested-by: default avatarDave Hansen <dave.hansen@intel.com>
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
Acked-by: default avatarDave Hansen <dave.hansen@intel.com>
Link: https://lore.kernel.org/all/20241202073139.448208-1-kirill.shutemov%40linux.intel.com
parent 40384c84

arch/x86/hyperv/ivm.c

+1 −1
Original line number Diff line number Diff line
@@ -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) */

arch/x86/include/asm/mtrr.h

+5 −5
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 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,

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 *);
@@ -75,7 +75,7 @@ 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,

static inline void guest_force_mtrr_state(struct mtrr_var_range *var,

					  unsigned int num_var,

					  mtrr_type def_type)

{

arch/x86/kernel/cpu/mtrr/generic.c

+3 −3
Original line number Diff line number Diff line
@@ -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,7 +436,7 @@ 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,

void guest_force_mtrr_state(struct mtrr_var_range *var, unsigned int num_var,

			    mtrr_type def_type)

{

	unsigned int i;

arch/x86/kernel/cpu/mtrr/mtrr.c

+1 −1
Original line number Diff line number Diff line
@@ -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();

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -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)