[PATCH v4 00/23] KVM: Fix+harden against bad uaccess using dying VM · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 01/23] KVM: Reject user accesses to guest memory if current->mm != kvm->mm · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 02/23] KVM: nVMX: Don't force a full nested VM-Exit when destroying a vCPU · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 03/23] KVM: PPC: Flush/zap all memslots on kvm_arch_flush_shadow_all() · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 04/23] KVM: x86: Drop dead check on an existing memslot not having any pages · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 05/23] KVM: WARN and error out if memslot update encounters existing slot with no pages · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 06/23] KVM: x86: Unmap VMAs for KVM-internal memslots when the memslot is freed · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 07/23] KVM: x86: Delete non-SMM internal memslot if creating SMM memslot fails · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 08/23] KVM: x86: Process all address spaces when deleting internal memslot · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 09/23] KVM: x86: Re-queue APICv update request if inhibiting APIC access page fails · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 10/23] KVM: x86: Map a separate VMA for each address space for internal memslots · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 11/23] KVM: Disallow setting memslots when the VM is being destroyed · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 12/23] KVM: Destroy memslots immediately after mmu_notifiers are unregistered · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 13/23] KVM: WARN if KVM attempts to do guest-related uaccess with "wrong" process · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 14/23] KVM: WARN and reject guest-based uaccess if VM is dying · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 15/23] KVM: Pre-check uaccesses in KVM's APIs to read/write guest memory · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 16/23] KVM: VMX: Explicility free vmcs01, not the current VMCS, in vCPU free paths · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 17/23] KVM: nVMX: Don't explicitly VMCLEAR+free() vmcs01's shadow VMCS when freeing vCPU · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 18/23] KVM: nVMX: Cancel the nested VMX Preemption Timer's hrtimer in free_nested() · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 19/23] KVM: Add lockdep-only APIs to query and assert that a vCPU is unreachable · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 20/23] KVM: VMX: Explicitly remove dying vCPUs from the PI wakeup list · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 21/23] KVM: nVMX: Don't switch to vmcs01 when freeing a vCPU · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 22/23] KVM: nVMX: Don't load+put the vCPU when freeing nested state for a dying vCPU · Sean Christopherson <seanjc@google.com> · 2026-10-30
[PATCH v4 23/23] KVM: x86: Rename __x86_set_memory_region() => x86_set_internal_memslot() · Sean Christopherson <seanjc@google.com> · 2026-10-30

[PATCH v4 08/23] KVM: x86: Process all address spaces when deleting internal memslot

WARM1d

From: Sean Christopherson <seanjc@google.com>
Date: 2026-10-30 21:21:23
Also in: kvm, lkml
Subsystem: kernel virtual machine for x86 (kvm/x86), the rest, x86 architecture (32-bit and 64-bit) · Maintainers: Sean Christopherson, Paolo Bonzini, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen

Revision v4 (2 revisions archived).

Revisions (2)

2026-10-01 v2
2026-10-30 v4 current [diff against previous]

Process all address spaces when deleting a KVM-internal memslot, i.e. try
to delete the SMM memslot (if SMM is enabled) even if there is no non-SMM
memslot.  This will allow retrying deletion when inhibiting the APIC access
page (the only scenario where KVM deletes memslots while the VM is alive).

Fixes: 9da0e4d5ac96 ("KVM: x86: work on all available address spaces")
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
 arch/x86/kvm/x86.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 326f8a9a5d18..0b94f981a2e1 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c

@@ -10011,6 +10011,9 @@ static int x86_set_internal_memslot(struct kvm *kvm, int id, int as_id,
 {
 	struct kvm_userspace_memory_region2 m;
 
+	if (!size && !id_to_memslot(__kvm_memslots(kvm, as_id), id))
+		return 0;
+
 	m.slot = id | (as_id << 16);
 	m.flags = 0;
 	m.guest_phys_addr = gpa;

@@ -10044,8 +10047,6 @@ static int x86_set_internal_memslot(struct kvm *kvm, int id, int as_id,
 void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,
 				      u32 size)
 {
-	struct kvm_memslots *slots = kvm_memslots(kvm);
-	struct kvm_memory_slot *slot;
 	unsigned long hva;
 	int i, r;

@@ -10054,11 +10055,10 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,
 	if (WARN_ON(id >= KVM_MEM_SLOTS_NUM))
 		return ERR_PTR_USR(-EINVAL);
 
-	slot = id_to_memslot(slots, id);
+	if (size && id_to_memslot(kvm_memslots(kvm), id))
+		return ERR_PTR_USR(-EEXIST);
+
 	if (size) {
-		if (slot)
-			return ERR_PTR_USR(-EEXIST);
-
 		/*
 		 * MAP_SHARED to prevent internal slot pages from being moved
 		 * by fork()/COW.

@@ -10068,9 +10068,6 @@ void __user * __x86_set_memory_region(struct kvm *kvm, int id, gpa_t gpa,
 		if (IS_ERR_VALUE(hva))
 			return (void __user *)hva;
 	} else {
-		if (!slot)
-			return NULL;
-
 		hva = 0;
 	}

-- 
2.56.0.385.gac671c819a-goog

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help