From nobody Thu Apr 2 05:49:34 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 BE6943859C5 for ; Mon, 30 Mar 2026 07:47:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774856880; cv=none; b=jAdLHJqLZzcMAT5kjICUMDEDnehSbDfrdXKrTpESfPILd8w/Tdv3mZwFanIcwdOlnd/eXcZIJHrPRjqBZZJE2hyM5yRv9ATTKKTEB3IO+tkw+W2K/Zr4aWmtYnlZ/99jkWb/UREgC7mF5pzbFzJONmJ8hDiOAMhRinuaFcrlW0k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774856880; c=relaxed/simple; bh=k1bITzSqw1ZFJDT+lcziOHSVt+l678M6zhCmLGBLavM=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=SKGjkwczLTQNToj0qr/LheX+kBWR/jYbZeCtunsDUixCCzCWWZinIWWQK4DeC/G24S/NRTeHN78c69xuJIBQjh99bAy1eckYI0DHnaE681hOWtQjhnIjGiteqoRZIwzWEDp3iSfPsA4aedE9SFHZ0vHySjZOfFhfCRW1ETkx8ZA= 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=S5qj9Irt; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=JJd9BQ0i; arc=none smtp.client-ip=170.10.133.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="S5qj9Irt"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="JJd9BQ0i" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774856878; 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=ee7WfC4ao1ITQjnVMBY/T1x8jIUaoFThw0bW/nGasZE=; b=S5qj9IrtFNeSQlEylT9O2cxxeM/Qo9wSW8x46LPBbyj7R3J0SoshCDcUku9zA/dhgmizK8 4F4nBtV2vkkvSSpvTKuotvI+y2w75ChynO5GWqRp/KNatz64GqgeGFhVmbb25yNi4ryhvp ucLrb/T7JZu/ajPuzLxCpNgIyMcy75A= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-612-VnXIu2cRMgmXjLc376qyZw-1; Mon, 30 Mar 2026 03:47:56 -0400 X-MC-Unique: VnXIu2cRMgmXjLc376qyZw-1 X-Mimecast-MFC-AGG-ID: VnXIu2cRMgmXjLc376qyZw_1774856875 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-43cff5ef652so398504f8f.2 for ; Mon, 30 Mar 2026 00:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774856875; x=1775461675; 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=ee7WfC4ao1ITQjnVMBY/T1x8jIUaoFThw0bW/nGasZE=; b=JJd9BQ0irY5hmLXlCQCUfnbK7CaKGomBzrTipGgiOprZ5zmtHhXONcUFzhCu7fadV0 TZUvjlA41ZwD3bQxrHIW/GI/KYTzQTlZPt9tATS+vacjKkEsvukDIdkwgl70u3+RSmry zIxtji2CKR229It7B0nwZvK1NIuB4g1ET4ylST/FykNHJ/zO6hT2XHSk+UAAQWLmMpmi 9b49UuRP53VtSlIBeajgYiFC6oSSCizFJvqTs06GfLhe5fXnNKJJQx+4oLxbuJFeHfow zmuh7YcXGQ3jLeJnkOhPW/nRGQfpdZJh0XjdpaIZmFS3FK0gzgdImH/tyr2hG+1E6z7i FA8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774856875; x=1775461675; 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=ee7WfC4ao1ITQjnVMBY/T1x8jIUaoFThw0bW/nGasZE=; b=k+XMa18tLm7iDs/kcUrxGP9/POpxQL9W290z1ng+m6uxXRxvyjKPzcqFqgyepaQ2+V oGGV3Prf7fq8OaqUcaLIJE6s/P4ncTUDjo6Plxjs/3fpeWpwlPr8Uk0VTjQS+XvQP/Wn HuW489mzlS2VVPyst7VWDeziiIr+zrdVadteZ0UmDvy+9dmRZ5qoOP/uD+0IN7saWMlE FWBGvcHEKE4szEsSPXUz0kk6WTrzj0MJdZjTs467l4uIs25ls+OWq7ldomDp+70pYeC2 lpmI1sZ/Rywd4JpuXrRmM3ZIgpXFs0zio7Xddwix6FZqM/5OH6m8JVwxVEyEWUeC3JZy 828g== X-Gm-Message-State: AOJu0YzakAmK/8uQ1D3+RFGimzkVwT9+UVWQhN0AmAsegjqFbMBMVbvL IUB32k6hxAB/gb+nuFmUgYIQNvCFx/tFJQFhqY1OCw9Bs6pUz98SWBo8l+76WwT9hmNOkf/9NmI dpRdjDPE4XE4t9ewyMxsErLkvXPfbAbhjciRX0Pe315k9AwtV2S72yz1hb5LZZO1OL2K1sX4dci wM/x4mIiAhEG4O9muui3dUBxMlTjkCS5rGV9IL1lVdUQ3Gea0q2g== X-Gm-Gg: ATEYQzwukt3g3N3LzaUXdJt2W2X6pD0nD2Vm7VWorm+x0rknjwIr7DBkhjqEdjom+EJ +VjGttKXFFENlvFdbEjAcfkn6egKL5e6rveo82KyM4zdAqUy2nks1e9D3VwPyFXshqStbNi/hfJ U9R4wpotfHI5tkmIizhKGH9FCTHZTL9GSPxacxT9ihR2t8iuXWUCoNniKlxTsHiJRUgs1WIpqRd GEac65L2IlPVHLS4GjrP5Xn9VS2BCyeQZPYuTVArly77iahImjpsXnZL5tEb6LkXY7IafXAh6cA nzohMS7N89irJQa5Rowu7kA/712LMK/BbBa+1TCM0YAvj/a1a6Y4zQvESjOgu4sJW7cyyGpeYUR brgNziz76qKiLRWO4iK9HHVcgRrFjAmZBMYF1zs6Ypws3D+Ij1W1zetiO34/ufmv2kNmrGJNs0g OxpAfCBgTqej3b0J66L4w/2jFC X-Received: by 2002:a5d:5d84:0:b0:43b:4d2e:a004 with SMTP id ffacd0b85a97d-43b9e981468mr20214703f8f.10.1774856874812; Mon, 30 Mar 2026 00:47:54 -0700 (PDT) X-Received: by 2002:a5d:5d84:0:b0:43b:4d2e:a004 with SMTP id ffacd0b85a97d-43b9e981468mr20214656f8f.10.1774856874299; Mon, 30 Mar 2026 00:47:54 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43cf245ebafsm15438543f8f.21.2026.03.30.00.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 00:47:53 -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.19] KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE Date: Mon, 30 Mar 2026 09:47:51 +0200 Message-ID: <20260330074752.136232-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 02c450686b4a..01e159941434 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3044,12 +3044,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 (prefetch && is_last_spte(*sptep, level) && pfn =3D=3D spte_to_pfn(*sptep)) @@ -3073,6 +3067,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, false, host_writable, &spte); =20 --=20 2.53.0