summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Niethe <jniethe5@gmail.com>2023-12-01 18:56:13 +0530
committerMichael Ellerman <mpe@ellerman.id.au>2023-12-07 23:33:07 +1100
commita9a3de530d7531bf6cd3f6ccda769cd94c1105a0 (patch)
tree42615b5b2ba810f3dc0997587087391be714d119
parentdf938a5576f3f3b08e1f217c660385c0d58a0b91 (diff)
downloadlinux-a9a3de530d7531bf6cd3f6ccda769cd94c1105a0.tar.gz
linux-a9a3de530d7531bf6cd3f6ccda769cd94c1105a0.tar.bz2
linux-a9a3de530d7531bf6cd3f6ccda769cd94c1105a0.zip
KVM: PPC: Book3S HV nestedv2: Avoid msr check in kvmppc_handle_exit_hv()
The msr check in kvmppc_handle_exit_hv() is not needed for nestedv2 hosts, skip the check to avoid a H_GUEST_GET_STATE hcall. Signed-off-by: Jordan Niethe <jniethe5@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://msgid.link/20231201132618.555031-9-vaibhav@linux.ibm.com
-rw-r--r--arch/powerpc/kvm/book3s_hv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 4dc6a928073f..47fe470375df 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -1597,7 +1597,7 @@ static int kvmppc_handle_exit_hv(struct kvm_vcpu *vcpu,
* That can happen due to a bug, or due to a machine check
* occurring at just the wrong time.
*/
- if (__kvmppc_get_msr_hv(vcpu) & MSR_HV) {
+ if (!kvmhv_is_nestedv2() && (__kvmppc_get_msr_hv(vcpu) & MSR_HV)) {
printk(KERN_EMERG "KVM trap in HV mode!\n");
printk(KERN_EMERG "trap=0x%x | pc=0x%lx | msr=0x%llx\n",
vcpu->arch.trap, kvmppc_get_pc(vcpu),