Commit 662f6815 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: VMX: Rename XSAVES control to follow KVM's preferred "ENABLE_XYZ" 



Rename the XSAVES secondary execution control to follow KVM's preferred
style so that XSAVES related logic can use common macros that depend on
KVM's preferred style.

No functional change intended.

Reviewed-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Link: https://lore.kernel.org/r/20230815203653.519297-6-seanjc@google.com


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 0497d2ac

arch/x86/include/asm/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 
#define SECONDARY_EXEC_RDSEED_EXITING		VMCS_CONTROL_BIT(RDSEED_EXITING)

#define SECONDARY_EXEC_ENABLE_PML               VMCS_CONTROL_BIT(PAGE_MOD_LOGGING)

#define SECONDARY_EXEC_PT_CONCEAL_VMX		VMCS_CONTROL_BIT(PT_CONCEAL_VMX)

#define SECONDARY_EXEC_XSAVES			VMCS_CONTROL_BIT(XSAVES)

#define SECONDARY_EXEC_ENABLE_XSAVES		VMCS_CONTROL_BIT(XSAVES)

#define SECONDARY_EXEC_MODE_BASED_EPT_EXEC	VMCS_CONTROL_BIT(MODE_BASED_EPT_EXEC)

#define SECONDARY_EXEC_PT_USE_GPA		VMCS_CONTROL_BIT(PT_USE_GPA)

#define SECONDARY_EXEC_TSC_SCALING              VMCS_CONTROL_BIT(TSC_SCALING)

arch/x86/kvm/vmx/capabilities.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static inline bool cpu_has_vmx_pml(void) 
static inline bool cpu_has_vmx_xsaves(void)

{

	return vmcs_config.cpu_based_2nd_exec_ctrl &

		SECONDARY_EXEC_XSAVES;

		SECONDARY_EXEC_ENABLE_XSAVES;

}



static inline bool cpu_has_vmx_waitpkg(void)

arch/x86/kvm/vmx/hyperv.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
	 SECONDARY_EXEC_DESC |						\

	 SECONDARY_EXEC_ENABLE_RDTSCP |					\

	 SECONDARY_EXEC_ENABLE_INVPCID |				\

	 SECONDARY_EXEC_XSAVES |					\

	 SECONDARY_EXEC_ENABLE_XSAVES |					\

	 SECONDARY_EXEC_RDSEED_EXITING |				\

	 SECONDARY_EXEC_RDRAND_EXITING |				\

	 SECONDARY_EXEC_TSC_SCALING |					\

arch/x86/kvm/vmx/nested.c

+3 −3
Original line number Diff line number Diff line
@@ -2307,7 +2307,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0 
				  SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |

				  SECONDARY_EXEC_ENABLE_INVPCID |

				  SECONDARY_EXEC_ENABLE_RDTSCP |

				  SECONDARY_EXEC_XSAVES |

				  SECONDARY_EXEC_ENABLE_XSAVES |

				  SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE |

				  SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |

				  SECONDARY_EXEC_APIC_REGISTER_VIRT |
@@ -6331,7 +6331,7 @@ static bool nested_vmx_l1_wants_exit(struct kvm_vcpu *vcpu, 
		 * If if it were, XSS would have to be checked against

		 * the XSS exit bitmap in vmcs12.

		 */

		return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES);

		return nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_XSAVES);

	case EXIT_REASON_UMWAIT:

	case EXIT_REASON_TPAUSE:

		return nested_cpu_has2(vmcs12,
@@ -6874,7 +6874,7 @@ static void nested_vmx_setup_secondary_ctls(u32 ept_caps, 
		SECONDARY_EXEC_ENABLE_INVPCID |

		SECONDARY_EXEC_ENABLE_VMFUNC |

		SECONDARY_EXEC_RDSEED_EXITING |

		SECONDARY_EXEC_XSAVES |

		SECONDARY_EXEC_ENABLE_XSAVES |

		SECONDARY_EXEC_TSC_SCALING |

		SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE;

arch/x86/kvm/vmx/nested.h

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ static inline int nested_cpu_has_ept(struct vmcs12 *vmcs12) 


static inline bool nested_cpu_has_xsaves(struct vmcs12 *vmcs12)

{

	return nested_cpu_has2(vmcs12, SECONDARY_EXEC_XSAVES);

	return nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_XSAVES);

}



static inline bool nested_cpu_has_pml(struct vmcs12 *vmcs12)