diff options
| author |  Mathias Krause <minipli@grsecurity.net>
| 2023-03-22 02:37:29 +0100 |
|---|---|---|
| committer |  Sean Christopherson <seanjc@google.com>
| 2023-03-22 07:47:25 -0700 |
| commit | 74cdc836919bf34684ef66f995273f35e2189daf (patch) | |
| tree | cc9fa2d45611e6b719a5c8161db5d33b9242f5ff /arch/x86/kvm/pmu.c | |
| parent | KVM: x86: Ignore CR0.WP toggles in non-paging mode (diff) | |
| download | linux-74cdc836919bf34684ef66f995273f35e2189daf.tar.gz linux-74cdc836919bf34684ef66f995273f35e2189daf.tar.bz2 linux-74cdc836919bf34684ef66f995273f35e2189daf.zip | |
KVM: x86: Make use of kvm_read_cr*_bits() when testing bits
Make use of the kvm_read_cr{0,4}_bits() helper functions when we only
want to know the state of certain bits instead of the whole register.
This not only makes the intent cleaner, it also avoids a potential
VMREAD in case the tested bits aren't guest owned.
Signed-off-by: Mathias Krause <minipli@grsecurity.net>
Link: https://lore.kernel.org/r/20230322013731.102955-5-minipli@grsecurity.net
Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kvm/pmu.c')
| -rw-r--r-- | arch/x86/kvm/pmu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index 612e6c70ce2e..f4aa170b5b97 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -540,9 +540,9 @@ int kvm_pmu_rdpmc(struct kvm_vcpu *vcpu, unsigned idx, u64 *data) if (!pmc) return 1; - if (!(kvm_read_cr4(vcpu) & X86_CR4_PCE) && + if (!(kvm_read_cr4_bits(vcpu, X86_CR4_PCE)) && (static_call(kvm_x86_get_cpl)(vcpu) != 0) && - (kvm_read_cr0(vcpu) & X86_CR0_PE)) + (kvm_read_cr0_bits(vcpu, X86_CR0_PE))) return 1; *data = pmc_read_counter(pmc) & mask; |