Commit 5fe9805d authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: x86: Handle PERF_CAPABILITIES in common x86's kvm_get_msr_feature() 



Handle PERF_CAPABILITIES directly in kvm_get_msr_feature() now that the
supported value is available in kvm_caps.

No functional change intended.

Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
Message-Id: <20221006000314.73240-8-seanjc@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 6c6f82be

arch/x86/kvm/svm/svm.c

+0 −3
Original line number Diff line number Diff line
@@ -2713,9 +2713,6 @@ static int svm_get_msr_feature(struct kvm_msr_entry *msr) 
		if (boot_cpu_has(X86_FEATURE_LFENCE_RDTSC))

			msr->data |= MSR_F10H_DECFG_LFENCE_SERIALIZE;

		break;

	case MSR_IA32_PERF_CAPABILITIES:

		msr->data = kvm_caps.supported_perf_cap;

		return 0;

	default:

		return KVM_MSR_RET_INVALID;

	}

arch/x86/kvm/vmx/vmx.c

+0 −3
Original line number Diff line number Diff line
@@ -1849,9 +1849,6 @@ static int vmx_get_msr_feature(struct kvm_msr_entry *msr) 
		if (!nested)

			return 1;

		return vmx_get_vmx_msr(&vmcs_config.nested, msr->index, &msr->data);

	case MSR_IA32_PERF_CAPABILITIES:

		msr->data = kvm_caps.supported_perf_cap;

		return 0;

	default:

		return KVM_MSR_RET_INVALID;

	}

arch/x86/kvm/x86.c

+3 −0
Original line number Diff line number Diff line
@@ -1648,6 +1648,9 @@ static int kvm_get_msr_feature(struct kvm_msr_entry *msr) 
	case MSR_IA32_ARCH_CAPABILITIES:

		msr->data = kvm_get_arch_capabilities();

		break;

	case MSR_IA32_PERF_CAPABILITIES:

		msr->data = kvm_caps.supported_perf_cap;

		break;

	case MSR_IA32_UCODE_REV:

		rdmsrl_safe(msr->index, &msr->data);

		break;