]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
KVM: nSVM: Unify RIP and PMU handling calls when emulating VMRUN
authorYosry Ahmed <yosry@kernel.org>
Wed, 27 May 2026 23:46:57 +0000 (23:46 +0000)
committerSean Christopherson <seanjc@google.com>
Thu, 28 May 2026 01:45:48 +0000 (18:45 -0700)
commit0a35c2a051f34890f39befb5dc4f1cf41ec12b2a
treebb7464cc02831b7c654ac00e752245e966b4f2e2
parent42ff88db18a5a42f619eab1d862e04e6505e8ee6
KVM: nSVM: Unify RIP and PMU handling calls when emulating VMRUN

The code paths for advancing RIP and retiring the instruction for RIP
are very similar whether or not caching vmcb12 succeeds. The only
difference is handling mapping failures (i.e. EFAULT).

Pull the mapping failure handling out and unify the calls to
svm_skip_emulated_instruction() and kvm_pmu_instruction_retired(), but
return immediately after if copying and caching vmcb12 failed. A nice
side effect of this is that the FIXME comment is now above the only code
path calling svm_skip_emulated_instruction().

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