Skip to content

Commit 24adff3

Browse files
committed
KVM: TDX: Avoid a double-KVM_BUG_ON() in tdx_sept_zap_private_spte()
Return -EIO immediately from tdx_sept_zap_private_spte() if the number of to-be-added pages underflows, so that the following "KVM_BUG_ON(err, kvm)" isn't also triggered. Isolating the check from the "is premap error" if-statement will also allow adding a lockdep assertion that premap errors are encountered if and only if slots_lock is held. Reviewed-by: Rick Edgecombe <rick.p.edgecombe@intel.com> Reviewed-by: Binbin Wu <binbin.wu@linux.intel.com> Reviewed-by: Kai Huang <kai.huang@intel.com> Reviewed-by: Yan Zhao <yan.y.zhao@intel.com> Tested-by: Yan Zhao <yan.y.zhao@intel.com> Tested-by: Kai Huang <kai.huang@intel.com> Link: https://patch.msgid.link/20251030200951.3402865-14-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
1 parent b9d5cf6 commit 24adff3

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

arch/x86/kvm/vmx/tdx.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,8 +1725,10 @@ static int tdx_sept_zap_private_spte(struct kvm *kvm, gfn_t gfn,
17251725
err = tdh_mem_range_block(&kvm_tdx->td, gpa, tdx_level, &entry, &level_state);
17261726
tdx_no_vcpus_enter_stop(kvm);
17271727
}
1728-
if (tdx_is_sept_zap_err_due_to_premap(kvm_tdx, err, entry, level) &&
1729-
!KVM_BUG_ON(!atomic64_read(&kvm_tdx->nr_premapped), kvm)) {
1728+
if (tdx_is_sept_zap_err_due_to_premap(kvm_tdx, err, entry, level)) {
1729+
if (KVM_BUG_ON(!atomic64_read(&kvm_tdx->nr_premapped), kvm))
1730+
return -EIO;
1731+
17301732
atomic64_dec(&kvm_tdx->nr_premapped);
17311733
return 0;
17321734
}

0 commit comments

Comments
 (0)