]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: nSVM: Simplify error handling of nested_svm_copy_vmcb12_to_cache()
authorYosry Ahmed <yosry@kernel.org>
Fri, 6 Mar 2026 21:08:56 +0000 (21:08 +0000)
committerSean Christopherson <seanjc@google.com>
Fri, 13 Mar 2026 22:13:04 +0000 (15:13 -0700)
commit520a1347faf46c2c00c3499de05fdecc6d254c2e
tree50bfbe53a48eb90e6431b790ae2db6e607b9b3e2
parent0b4a043a54144aef3e5a2597c29c6adb5e6c47dc
KVM: nSVM: Simplify error handling of nested_svm_copy_vmcb12_to_cache()

nested_svm_vmrun() currently stores the return value of
nested_svm_copy_vmcb12_to_cache() in a local variable 'err', separate
from the generally used 'ret' variable. This is done to have a single
call to kvm_skip_emulated_instruction(), such that we can store the
return value of kvm_skip_emulated_instruction() in 'ret', and then
re-check the return value of nested_svm_copy_vmcb12_to_cache() in 'err'.

The code is unnecessarily confusing. Instead, call
kvm_skip_emulated_instruction() in the failure path of
nested_svm_copy_vmcb12_to_cache() if the return value is not -EFAULT,
and drop 'err'.

Suggested-by: Sean Christopherson <seanjc@google.com>
Signed-off-by: Yosry Ahmed <yosry@kernel.org>
Link: https://patch.msgid.link/20260306210900.1933788-3-yosry@kernel.org
Signed-off-by: Sean Christopherson <seanjc@google.com>
arch/x86/kvm/svm/nested.c