Commit 7f3603b6 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: VMX: Rename RDTSCP secondary exec control name to insert "ENABLE" 



Rename SECONDARY_EXEC_RDTSCP to SECONDARY_EXEC_ENABLE_RDTSCP in
preparation for consolidating the logic for adjusting secondary exec
controls based on the guest CPUID model.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Message-Id: <20200923165048.20486-4-sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent b936d3eb

arch/x86/include/asm/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES VMCS_CONTROL_BIT(VIRT_APIC_ACCESSES)

#define SECONDARY_EXEC_ENABLE_EPT               VMCS_CONTROL_BIT(EPT)

#define SECONDARY_EXEC_DESC			VMCS_CONTROL_BIT(DESC_EXITING)

#define SECONDARY_EXEC_RDTSCP			VMCS_CONTROL_BIT(RDTSCP)

#define SECONDARY_EXEC_ENABLE_RDTSCP		VMCS_CONTROL_BIT(RDTSCP)

#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE   VMCS_CONTROL_BIT(VIRTUAL_X2APIC)

#define SECONDARY_EXEC_ENABLE_VPID              VMCS_CONTROL_BIT(VPID)

#define SECONDARY_EXEC_WBINVD_EXITING		VMCS_CONTROL_BIT(WBINVD_EXITING)

arch/x86/kvm/vmx/capabilities.h

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static inline bool vmx_umip_emulated(void) 
static inline bool cpu_has_vmx_rdtscp(void)

{

	return vmcs_config.cpu_based_2nd_exec_ctrl &

		SECONDARY_EXEC_RDTSCP;

		SECONDARY_EXEC_ENABLE_RDTSCP;

}



static inline bool cpu_has_vmx_virtualize_x2apic_mode(void)

arch/x86/kvm/vmx/nested.c

+2 −2
Original line number Diff line number Diff line
@@ -2286,7 +2286,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) 
		/* Take the following fields only from vmcs12 */

		exec_control &= ~(SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |

				  SECONDARY_EXEC_ENABLE_INVPCID |

				  SECONDARY_EXEC_RDTSCP |

				  SECONDARY_EXEC_ENABLE_RDTSCP |

				  SECONDARY_EXEC_XSAVES |

				  SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE |

				  SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
@@ -6404,7 +6404,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) 
	msrs->secondary_ctls_low = 0;

	msrs->secondary_ctls_high &=

		SECONDARY_EXEC_DESC |

		SECONDARY_EXEC_RDTSCP |

		SECONDARY_EXEC_ENABLE_RDTSCP |

		SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE |

		SECONDARY_EXEC_WBINVD_EXITING |

		SECONDARY_EXEC_APIC_REGISTER_VIRT |

arch/x86/kvm/vmx/vmx.c

+5 −5
Original line number Diff line number Diff line
@@ -2430,7 +2430,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, 
			SECONDARY_EXEC_UNRESTRICTED_GUEST |

			SECONDARY_EXEC_PAUSE_LOOP_EXITING |

			SECONDARY_EXEC_DESC |

			SECONDARY_EXEC_RDTSCP |

			SECONDARY_EXEC_ENABLE_RDTSCP |

			SECONDARY_EXEC_ENABLE_INVPCID |

			SECONDARY_EXEC_APIC_REGISTER_VIRT |

			SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
@@ -4146,15 +4146,15 @@ static void vmx_compute_secondary_exec_control(struct vcpu_vmx *vmx) 
	if (cpu_has_vmx_rdtscp()) {

		bool rdtscp_enabled = guest_cpuid_has(vcpu, X86_FEATURE_RDTSCP);

		if (!rdtscp_enabled)

			exec_control &= ~SECONDARY_EXEC_RDTSCP;

			exec_control &= ~SECONDARY_EXEC_ENABLE_RDTSCP;



		if (nested) {

			if (rdtscp_enabled)

				vmx->nested.msrs.secondary_ctls_high |=

					SECONDARY_EXEC_RDTSCP;

					SECONDARY_EXEC_ENABLE_RDTSCP;

			else

				vmx->nested.msrs.secondary_ctls_high &=

					~SECONDARY_EXEC_RDTSCP;

					~SECONDARY_EXEC_ENABLE_RDTSCP;

		}

	}
@@ -7323,7 +7323,7 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu, 
	 * Because it is marked as EmulateOnUD, we need to intercept it here.

	 */

	case x86_intercept_rdtscp:

		if (!nested_cpu_has2(vmcs12, SECONDARY_EXEC_RDTSCP)) {

		if (!nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_RDTSCP)) {

			exception->vector = UD_VECTOR;

			exception->error_code_valid = false;

			return X86EMUL_PROPAGATE_FAULT;

tools/testing/selftests/kvm/include/x86_64/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#define SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES 0x00000001

#define SECONDARY_EXEC_ENABLE_EPT		0x00000002

#define SECONDARY_EXEC_DESC			0x00000004

#define SECONDARY_EXEC_RDTSCP			0x00000008

#define SECONDARY_EXEC_ENABLE_RDTSCP		0x00000008

#define SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE	0x00000010

#define SECONDARY_EXEC_ENABLE_VPID		0x00000020

#define SECONDARY_EXEC_WBINVD_EXITING		0x00000040

CRA Git | Maintained and supported by SUSTech CRA and CCSE