]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "KVM: SVM: avoid infinite loop on NPF from bad address"
authorSean Christopherson <seanjc@google.com>
Thu, 20 Jan 2022 01:07:12 +0000 (01:07 +0000)
committerPaolo Bonzini <pbonzini@redhat.com>
Wed, 26 Jan 2022 17:14:59 +0000 (12:14 -0500)
commitc1f0e9d8c2c6c0b5f672454b84eeff66cdf3d784
tree90f8530f05f5a80529e6d43d7a7f26f6fe4915b9
parent6e1dc1e4ab8d4e867f93dbe419e24352526eba44
Revert "KVM: SVM: avoid infinite loop on NPF from bad address"

Revert a completely broken check on an "invalid" RIP in SVM's workaround
for the DecodeAssists SMAP errata.  kvm_vcpu_gfn_to_memslot() obviously
expects a gfn, i.e. operates in the guest physical address space, whereas
RIP is a virtual (not even linear) address.  The "fix" worked for the
problematic KVM selftest because the test identity mapped RIP.

Fully revert the hack instead of trying to translate RIP to a GPA, as the
non-SEV case is now handled earlier, and KVM cannot access guest page
tables to translate RIP.

This reverts commit 733782f8a52975da936b334a08b1b8420f488d6a.

Fixes: 733782f8a529 ("KVM: SVM: avoid infinite loop on NPF from bad address")
Reported-by: Liam Merwick <liam.merwick@oracle.com>
Cc: stable@vger.kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
Message-Id: <20220120010719.711476-3-seanjc@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
arch/x86/kvm/svm/svm.c
virt/kvm/kvm_main.c