From nobody Thu Apr 2 09:10:38 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA0963A6EE7 for ; Mon, 30 Mar 2026 07:55:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774857318; cv=none; b=tE35Gxz7Qa85aGdUZPhR1rqvLIEI6o+fCTGfC/3bRHR3V47daPEwWUbi1mD5qw7fctRjcF9+rqZAwuGNUOfU23eNp961u1L53pz5U1cnAfhSp5+vS5cDCD4x4jrYbnS/JrS4uYJywZuZBgAP7Mqzv6/x8lr0d+DLeS3F7dFgmpk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774857318; c=relaxed/simple; bh=T+HmSjUn6z8OZZRxZT/JFBxpd0V4CB7xIFG8EfORfvk=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CV3YIbzXBxHb3gfP6NjtB52dId9tZ7IutUXQ6+9F+0T3L9Va4BTie3VbK8KEsqvCvBvTtgBia3oVdox2s3GuDDFDEhuwuQwSvkjr3I3vbuz1TvpgT5wXXTYsfpUWlXyNksxkT19YFwGznWNNNK7bMEgIGFZMvEiKy291o7v0u8o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=U/47+u+B; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=s+YBoMjc; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="U/47+u+B"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="s+YBoMjc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774857316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=KOkZ7WrFrzNMDpXbyrtubTWNgppCw3HrcM7a5zUN2j8=; b=U/47+u+BbuaeXmYe0V3yXfjYhqCp9V7qMyUbDFC9z29MURrjI2uFpQhTVnOF4i+rOPGfkD LMz23KnJZul2Odi6jC8RC4Hiyuu7r9RGm/8k2+kc2WzIzvNnVzYga0HBinZfEJnZTozlE5 sBD5Vr8LNHwgIQ7eXCk1DHWf4K4lwKM= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-445-0tEVHyZ5M8ayqpOH-exquw-1; Mon, 30 Mar 2026 03:55:14 -0400 X-MC-Unique: 0tEVHyZ5M8ayqpOH-exquw-1 X-Mimecast-MFC-AGG-ID: 0tEVHyZ5M8ayqpOH-exquw_1774857313 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4836abfc742so35681445e9.0 for ; Mon, 30 Mar 2026 00:55:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774857312; x=1775462112; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=KOkZ7WrFrzNMDpXbyrtubTWNgppCw3HrcM7a5zUN2j8=; b=s+YBoMjcxKzbtp9EDhyA7HM8FvLfS3ghUHEI9CFrx32j8BtBjT1QbRBYeU74wT5igC 9V11p1oFkOv3X9Faf1ghm6kqq3dCfGGRavpHtetaTEppmPj+QscFICt792V2kq/F2L2l SgQpDXSfX4PwZxr1E4+MFsP84374EsFpWnXVo7sZ+Ftxdxj8vL9iago+ObzDeFefa5jo h0WfAlN1Ba3hoSyOYBnDq6IX/pHABa5ZyhmhcPMpqgynMvTncilOAgEC6Sda+P9j03FB TBz0JCSkPdibwdt3sut4xT1Icxmv7SuOAciU3veTzkNv9bFRBcVbNZp1zpA16po1CedQ kQig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774857312; x=1775462112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=KOkZ7WrFrzNMDpXbyrtubTWNgppCw3HrcM7a5zUN2j8=; b=UJuPOiyd5ZkDvOAft+JjeiE61gF2bSBzmZoP9cfOOpwhna60uz7EiVpOOIIdFdV4jO sAzTylv1jaDnuZekEyAVHppdwF9eIyu9VnDVCT0gNWtLmgbJrAfmo+dp4AocmaelHe/x 6MgURLnW0DHwm+hhKMtnSyANmUOMumxMofByzzfjlvMYGIfgYTEN1ltNc16H0b0K+5cT IkOl/Y2maSfHqlC/Rzj9khn85qa27MYY3Xf2RRtaVqtWFwptsUm0gXuRZ3m1KaFCHCJs aKxyD8f8ZY8+1hi3n+Z2fPzSU4yRGtISJu+lJq+RN33fxBBwXja3JbrBBP6vCszzez0b vnhA== X-Gm-Message-State: AOJu0YzErG89Gwk8KGcRB9gPcm66ARlUUPOi0An+v7hkqFZPDPd/YQMq EXRny+4xA1NpMbiFtZhfKDo71RRhIBxN/rAdYLuy2ItunC8huvUJ1I49gCZvDDsqGB8gHyg7c+H qSMLyPQn55BfdKwh1dpD8VCV2HvcBvNTkrjOdeeJYkVHXMTs7TGPCxIYffdn9VbJR7n72U+Xk5f UNPIOpHEhi2TzmPKFe3BhADjwkV0g0QPABcioMC/T6mWhQql7pqA== X-Gm-Gg: ATEYQzwm0vLJshSFfXh0ZlG8aOjyUqZwHRUWnpO9jrtsarM0vo4tJc4fsS1MYp+fu93 z9ia0vvXzlnWQoztx5XyCqtlhGqtxZyrFOyJryXBmdSGZfLPuUjAQAiLqt01dNhvqJWPuBbhNSq nfbtE2Di4IkzaPlvXhBooHk7i4ZshmunBTdr9+EBY3ynv5qwKg1bQFJyFn2qyaehUsvAjP/BFrS ImTyfYjgs7cfy2ss3LGRv4e70AwWPbjXHX2Vq51hcytIow3mVqS840rRVzENXosbIm8d+6WsPgn SMKCn/oPclDV61jQNyBm8fbqZYhbPvLuEg0Oa2G19C+LVVs1elWAK+OwpB7wVzxEKY1wJ3c/68f xvkaujEAsYw7KENPeZIPUkY0G8Jcg4iODVankI1+Bu7hvr2ooyGEBYUmMrufgffFcVuPUursA7U 53jioAgNi50hsEEX2oU6XHFyhF X-Received: by 2002:a05:600c:3d87:b0:487:2092:b2e0 with SMTP id 5b1f17b1804b1-48727d5a246mr189674155e9.1.1774857312437; Mon, 30 Mar 2026 00:55:12 -0700 (PDT) X-Received: by 2002:a05:600c:3d87:b0:487:2092:b2e0 with SMTP id 5b1f17b1804b1-48727d5a246mr189673785e9.1.1774857311868; Mon, 30 Mar 2026 00:55:11 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48727bfc5ecsm173559295e9.1.2026.03.30.00.55.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 00:55:11 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Sean Christopherson , Alexander Bulekov , Fred Griffoul , stable@vger.kernel.org Subject: [PATCH for-6.6] KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE Date: Mon, 30 Mar 2026 09:55:10 +0200 Message-ID: <20260330075510.147430-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sean Christopherson commit aad885e774966e97b675dfe928da164214a71605 upstream. When installing an emulated MMIO SPTE, do so *after* dropping/zapping the existing SPTE (if it's shadow-present). While commit a54aa15c6bda3 was right about it being impossible to convert a shadow-present SPTE to an MMIO SPTE due to a _guest_ write, it failed to account for writes to guest memory that are outside the scope of KVM. E.g. if host userspace modifies a shadowed gPTE to switch from a memslot to emulted MMIO and then the guest hits a relevant page fault, KVM will install the MMIO SPTE without first zapping the shadow-present SPTE. ------------[ cut here ]------------ is_shadow_present_pte(*sptep) WARNING: arch/x86/kvm/mmu/mmu.c:484 at mark_mmio_spte+0xb2/0xc0 [kvm], CP= U#0: vmx_ept_stale_r/4292 Modules linked in: kvm_intel kvm irqbypass CPU: 0 UID: 1000 PID: 4292 Comm: vmx_ept_stale_r Not tainted 7.0.0-rc2-ea= febd2d2ab0-sink-vm #319 PREEMPT Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 0.0.0 02/06/2015 RIP: 0010:mark_mmio_spte+0xb2/0xc0 [kvm] Call Trace: mmu_set_spte+0x237/0x440 [kvm] ept_page_fault+0x535/0x7f0 [kvm] kvm_mmu_do_page_fault+0xee/0x1f0 [kvm] kvm_mmu_page_fault+0x8d/0x620 [kvm] vmx_handle_exit+0x18c/0x5a0 [kvm_intel] kvm_arch_vcpu_ioctl_run+0xc55/0x1c20 [kvm] kvm_vcpu_ioctl+0x2d5/0x980 [kvm] __x64_sys_ioctl+0x8a/0xd0 do_syscall_64+0xb5/0x730 entry_SYSCALL_64_after_hwframe+0x4b/0x53 RIP: 0033:0x47fa3f ---[ end trace 0000000000000000 ]--- Reported-by: Alexander Bulekov Debugged-by: Alexander Bulekov Suggested-by: Fred Griffoul Fixes: a54aa15c6bda3 ("KVM: x86/mmu: Handle MMIO SPTEs directly in mmu_set_= spte()") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 04b9b919235e..0dc804149b0f 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -2914,12 +2914,6 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struc= t kvm_memory_slot *slot, bool prefetch =3D !fault || fault->prefetch; bool write_fault =3D fault && fault->write; =20 - if (unlikely(is_noslot_pfn(pfn))) { - vcpu->stat.pf_mmio_spte_created++; - mark_mmio_spte(vcpu, sptep, gfn, pte_access); - return RET_PF_EMULATE; - } - if (is_shadow_present_pte(*sptep)) { /* * If we overwrite a PTE page pointer with a 2MB PMD, unlink @@ -2939,6 +2933,14 @@ static int mmu_set_spte(struct kvm_vcpu *vcpu, struc= t kvm_memory_slot *slot, was_rmapped =3D 1; } =20 + if (unlikely(is_noslot_pfn(pfn))) { + vcpu->stat.pf_mmio_spte_created++; + mark_mmio_spte(vcpu, sptep, gfn, pte_access); + if (flush) + kvm_flush_remote_tlbs_gfn(vcpu->kvm, gfn, level); + return RET_PF_EMULATE; + } + wrprot =3D make_spte(vcpu, sp, slot, pte_access, gfn, pfn, *sptep, prefet= ch, true, host_writable, &spte); =20 --=20 2.53.0