Skip to contentSkip to conversation

KVM: x86/mmu: Bug the VM, not the host kernel, if KVM write-protects upper SPTEs

PATCH Applied Sean Christopherson 3 participants 3 messages Jun 18 – Jun 24

Subsystems (3)
lore
Share & tools
lore

Sean Christopherson

author maintainer
#0 lore raw

PATCH 1/1 KVM: x86/mmu: Bug the VM, not the host kernel, if KVM write-protects upper SPTEs

WARN and terminate the VM if KVM attempts to write-protect non-leaf SPTEs instead of bugging the host kernel, as there is no reason to bring down the entire host. Even termininating the VM is likely overkill, but in theory a missed write could corrupt guest memory, so play it safe.

---
 arch/x86/kvm/mmu/tdp_mmu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
arch/x86/kvm/mmu/tdp_mmu.c +5 -3
index 5b3041138301..c1cbae65d239 100644
@@ -1410,9 +1410,10 @@ static bool wrprot_gfn_range(struct kvm *kvm, struct kvm_mmu_page *root,
 	u64 new_spte;
 	bool spte_set = false;
 
-	rcu_read_lock();
+	if (KVM_BUG_ON(min_level > KVM_MAX_HUGEPAGE_LEVEL, kvm))
+		return false;
 
-	BUG_ON(min_level > KVM_MAX_HUGEPAGE_LEVEL);
+	rcu_read_lock();
 
 	for_each_tdp_pte_min_level(iter, kvm, root, min_level, start, end) {
 retry:
@@ -1844,7 +1845,8 @@ static bool write_protect_gfn(struct kvm *kvm, struct kvm_mmu_page *root,
 	u64 new_spte;
 	bool spte_set = false;
 
-	BUG_ON(min_level > KVM_MAX_HUGEPAGE_LEVEL);
+	if (KVM_BUG_ON(min_level > KVM_MAX_HUGEPAGE_LEVEL, kvm))
+		return false;
 
 	rcu_read_lock();
 

base-commit: 9d4853b044beefa21c4ee3e18c40653601a64ced

Signature · 1 line
2.55.0.rc0.738.g0c8ab3ebcc-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Sean Christopherson

WARN and terminate the VM if KVM attempts to write-protect non-leaf SPTEs instead of bugging the host kernel, as there is no reason to bring down the entire host. Even termininating the VM is likely overkill, but in theory a missed write could corrupt guest memory, so play it safe.

I wondered a bit whether the BUG_ON() was for checking "non-leaf SPTEs". I.e., maybe "write-protect the level which cannot have any leaf SPTE" reflects better, but perhaps they are the same thing.

maintainer Applied
#2 lore raw
In reply to Sean Christopherson

Queued, thanks. I adjusted the commit message to include Kai's ovservation:

Instead of bugging the host kernel, WARN and terminate the VM if KVM attempts to write-protect at a level that cannot use leaf SPTEs. There is no reason to bring down the entire host; even terminating the VM is likely overkill, but in theory a missed write could corrupt guest memory, so play it safe.

Paolo