Commit d1968421 authored by Oliver Upton's avatar Oliver Upton Committed by Paolo Bonzini
Browse files

KVM: nVMX: WARN on failure to set IA32_PERF_GLOBAL_CTRL 



Writes to MSR_CORE_PERF_GLOBAL_CONTROL should never fail if the VM-exit
and VM-entry controls are exposed to L1. Promote the checks to perform a
full WARN if kvm_set_msr() fails and remove the now unused macro
SET_MSR_OR_WARN().

Suggested-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarOliver Upton <oupton@google.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c0a21c3f

arch/x86/kvm/vmx/nested.c

+4 −14
Original line number Diff line number Diff line
@@ -28,16 +28,6 @@ module_param(nested_early_check, bool, S_IRUGO); 
	failed;								\

})



#define SET_MSR_OR_WARN(vcpu, idx, data)				\

({									\

	bool failed = kvm_set_msr(vcpu, idx, data);			\

	if (failed)							\

		pr_warn_ratelimited(					\

				"%s cannot write MSR (0x%x, 0x%llx)\n",	\

				__func__, idx, data);			\

	failed;								\

})



/*

 * Hyper-V requires all of these, so mark them as supported even though

 * they are just treated the same as all-context.
@@ -2550,8 +2540,8 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, 
		vcpu->arch.walk_mmu->inject_page_fault = vmx_inject_page_fault_nested;



	if ((vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) &&

	    SET_MSR_OR_WARN(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,

			    vmcs12->guest_ia32_perf_global_ctrl))

	    WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,

				     vmcs12->guest_ia32_perf_global_ctrl)))

		return -EINVAL;



	kvm_rsp_write(vcpu, vmcs12->guest_rsp);
@@ -3996,8 +3986,8 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu, 
		vcpu->arch.pat = vmcs12->host_ia32_pat;

	}

	if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)

		SET_MSR_OR_WARN(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,

				vmcs12->host_ia32_perf_global_ctrl);

		WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_CORE_PERF_GLOBAL_CTRL,

					 vmcs12->host_ia32_perf_global_ctrl));



	/* Set L1 segment info according to Intel SDM

	    27.5.2 Loading Host Segment and Descriptor-Table Registers */