Commit 67b45af9 authored by Like Xu's avatar Like Xu Committed by Paolo Bonzini

KVM: vmx/pmu: Fix dummy check if lbr_desc->event is created

If lbr_desc->event is successfully created, the intel_pmu_create_
guest_lbr_event() will return 0, otherwise it will return -ENOENT,
and then jump to LBR msrs dummy handling.

Fixes: 1b5ac322 ("KVM: vmx/pmu: Pass-through LBR msrs when the guest LBR event is ACTIVE")
Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Message-Id: <20210223013958.1280444-1-like.xu@linux.intel.com>
[Add "< 0" and PTR_ERR to make the code clearer. - Paolo]
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4a42d848
...@@ -298,7 +298,7 @@ int intel_pmu_create_guest_lbr_event(struct kvm_vcpu *vcpu) ...@@ -298,7 +298,7 @@ int intel_pmu_create_guest_lbr_event(struct kvm_vcpu *vcpu)
if (IS_ERR(event)) { if (IS_ERR(event)) {
pr_debug_ratelimited("%s: failed %ld\n", pr_debug_ratelimited("%s: failed %ld\n",
__func__, PTR_ERR(event)); __func__, PTR_ERR(event));
return -ENOENT; return PTR_ERR(event);
} }
lbr_desc->event = event; lbr_desc->event = event;
pmu->event_count++; pmu->event_count++;
...@@ -320,7 +320,7 @@ static bool intel_pmu_handle_lbr_msrs_access(struct kvm_vcpu *vcpu, ...@@ -320,7 +320,7 @@ static bool intel_pmu_handle_lbr_msrs_access(struct kvm_vcpu *vcpu,
if (!intel_pmu_is_valid_lbr_msr(vcpu, index)) if (!intel_pmu_is_valid_lbr_msr(vcpu, index))
return false; return false;
if (!lbr_desc->event && !intel_pmu_create_guest_lbr_event(vcpu)) if (!lbr_desc->event && intel_pmu_create_guest_lbr_event(vcpu) < 0)
goto dummy; goto dummy;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment