kvm: vmx: Fix typos in vmentry/vmexit control setting (d9293597) · Commits · 戴 / test

Previously, 'commit ("KVM: x86: Add Intel PT virtualization work mode")' work mode' offered framework to support Intel PT virtualization. However, the patch has some typos in vmx_vmentry_ctrl() and vmx_vmexit_ctrl(), e.g. used wrong flags and wrong variable, which will cause the VM entry failure later. Fixes: 'commit ("KVM: x86: Add Intel PT virtualization work mode")' Signed-off-by:

Yu Zhang <yu.c.zhang@linux.intel.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/vmx/vmx.h

+5 −3

Original line number	Diff line number	Diff line
		@@ -444,7 +444,8 @@ static inline u32 vmx_vmentry_ctrl(void)
		{
		u32 vmentry_ctrl = vmcs_config.vmentry_ctrl;
		if (pt_mode == PT_MODE_SYSTEM)
		vmentry_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP \| VM_EXIT_CLEAR_IA32_RTIT_CTL);
		vmentry_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP \|
		VM_ENTRY_LOAD_IA32_RTIT_CTL);
		/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */
		return vmentry_ctrl &
		~(VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL \| VM_ENTRY_LOAD_IA32_EFER);
		@@ -454,9 +455,10 @@ static inline u32 vmx_vmexit_ctrl(void)
		{
		u32 vmexit_ctrl = vmcs_config.vmexit_ctrl;
		if (pt_mode == PT_MODE_SYSTEM)
		vmexit_ctrl &= ~(VM_ENTRY_PT_CONCEAL_PIP \| VM_ENTRY_LOAD_IA32_RTIT_CTL);
		vmexit_ctrl &= ~(VM_EXIT_PT_CONCEAL_PIP \|
		VM_EXIT_CLEAR_IA32_RTIT_CTL);
		/* Loading of EFER and PERF_GLOBAL_CTRL are toggled dynamically */
		return vmcs_config.vmexit_ctrl &
		return vmexit_ctrl &
		~(VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL \| VM_EXIT_LOAD_IA32_EFER);
		}

Admin message