From nobody Thu Apr 2 06:15:26 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 224B93A7842 for ; Mon, 30 Mar 2026 07:49:16 +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=1774856957; cv=none; b=UjHVx+OITB5+wzWGdD/z7IJwbjiZriW/KXTXg4PB5hUHXVeo8ZvswQHZzhDLMYg7wyvDPzhKtRNK6LwyGS4WiwOTZvmrD/Uwf+3BT5I39U1dCaIh5oBd21b4+C07qM20ZCsNFjfC6uUBfjT3JSWMMbUiI0aQQZ7mBdebAlFpGbY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774856957; c=relaxed/simple; bh=trMSWKJiFjetMp3AqPFcz4zqskMkgPRMGKygU1o7Dn0=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=dh1bvQrIcnbfcOCGsRz+c/NHVoOM7CNTcg/rMdIsDCiA72ziaVg3FkDKNntjS0am7AVTMQwgnLlQi5CxaJ2bDtZG6q+vTIiaE2vGe1SS6ZyGS+n+IeSbthwQuZmAd2EfDwwGTbuRaEmbIAmcrY0TmmhcYakbqUgZNGpdE/Wvu2o= 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=YkisgKuU; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=V6DhZv7H; 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="YkisgKuU"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="V6DhZv7H" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774856955; 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=HdWbI73l5k5XBqdSB8dPfIfDNyc/SaWv7SXcZeEOjhQ=; b=YkisgKuUl4CSe9bWg6ToU/Gng5KK9d6HN8SragzkxCYSmjeVLeKg2/4kwlHXt0Ld4pIGRe 5U8Zh17PzX6kR+U6ADaZ0xBbbAdJEA6+QSKAIy4lJOLewjtk/H717+520jcOqAGkyiawK/ WMogE/iazy6xn5oHCVAH9Os56wBal58= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-132-J5aVoEDENSyI8qu-uxD7ug-1; Mon, 30 Mar 2026 03:49:14 -0400 X-MC-Unique: J5aVoEDENSyI8qu-uxD7ug-1 X-Mimecast-MFC-AGG-ID: J5aVoEDENSyI8qu-uxD7ug_1774856953 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48535f4d5e1so47934225e9.0 for ; Mon, 30 Mar 2026 00:49:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774856952; x=1775461752; 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=HdWbI73l5k5XBqdSB8dPfIfDNyc/SaWv7SXcZeEOjhQ=; b=V6DhZv7Hr/hMxKzSI90Wpz7uKKRUc+r2/XAXgKt10HuV9D02/bsfLxruD8G6P7IGT8 hEnGH3UwRO+5b/SIWJ0nleJwwtF/Yu6tQlG0c+LnQ1euu591CfhGBadqfoCqVOhJj016 /R/zr4Ls+boSrzTkZ9PyXGi8eY0o+NTOTnbMD27/qSbPg9dwn49MbxorMFmEyljsQrZ2 kxzHrRS0Dq4TEPdufroYggq/rPKb6zQQo2ZUoKKVo7SxvOV8d8X9vbdAcNGuyc+r/+ka Xz05PS58V+uFB9Bssw72ViRraBFdfwVhOxVSCBe+rydXJ9WfvN6nNRPCjs76JfDKx6VU OTMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774856952; x=1775461752; 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=HdWbI73l5k5XBqdSB8dPfIfDNyc/SaWv7SXcZeEOjhQ=; b=QVptK6pzbVMaNWmlReIUAcQw/kPzz8/sKWm6viD+kcnyvq5EyGH+I+eU4ZV+LptIGs i8wbtfvwi/d/T3fvNkMtPTOd8XrnZTsfRhrccuRoQQKmHWwE7IOr//wbUiNNMavyt9MT 7W1mjS/HMydmIC3VOSniqcsXL9DFjnwoDqvTkpOblRWax7G4AXPpC49Qqs72YrT5rQZF YjDysg2l10bL0Z2f+vVPXQm5fy+lkV8O1CBBPWULut/X9sTuO5H43gdK8nxn6nFW/fXB vaAVXH8njfIfrXIxIWJ6MnOLsfsj3QdU5p51Eh0VYBrFXMXia5Mn9qymh6LPWLYE+PB6 VKBQ== X-Gm-Message-State: AOJu0YyEWl6DmUzmj4vHk4XMcoQ/NKvvawb8A4ihjniKd/n7EFPm2TIQ 6N1Tzw6Cu67ruh5+TjNOMIV0IFOWHTQqUBfo6mwlDHRk3JsOP/5XXV/u6oJIy3JsliwvCQ6o92Q LpctGrTdGytin1IRN0IkDSXeF9J9xZRC/pxkzG8PfkzwDqWoqOPXRgK64uKw1Jb5CDdSgQ6Y0df rloc60V132nd+m0m2IbmTgLlxHpVG1B1A9msEp3N5YJh7vNSWuUQ== X-Gm-Gg: ATEYQzwfac+fp+sE9KMOA1JSMS/ydjVnIlBDEZ/BTn+Lyf5MID15aKj2KWLYbuM7IvE RgrmSxPZC2cfgQcM0EoPQ2luWGBC07o2+KjQ2Th2OTp8KgFbjd4qG2ISp+WmvlNjVSXIs4YG1bk uNyuFDq/77bsBOiD55W1/saxiAcJglHw+QSf+Vjb+CDmlZe3U2iIEqQCZT5hwpyA7U8/1ig5qQb 5bFhc1JjiPNb0e2ZezPfXrN/t6WJT1MydNrFdz1Vq5TiQWTOO/W0oMSlvZoSfRiKi+M1L2bye0C UGDTfE/54odYNOPoqj2xBn6m96tSY84GlaRkS66e3DNhX0Lm1e8GhZlTye6D5YLnqQC8EWgm0w6 qbSPYyHUBIGlZMcYTCB2WmDd8PofkHVbAGPitDTqegnnaMBAjiMF9XdDC5Kpt+BBnMv6qQ9a9vv UmL0uUB+Zd9hDCtnDGfBiLNkRr X-Received: by 2002:a05:600c:a00a:b0:486:fcc7:d6a with SMTP id 5b1f17b1804b1-48727ea275emr178546365e9.13.1774856952169; Mon, 30 Mar 2026 00:49:12 -0700 (PDT) X-Received: by 2002:a05:600c:a00a:b0:486:fcc7:d6a with SMTP id 5b1f17b1804b1-48727ea275emr178545905e9.13.1774856951674; Mon, 30 Mar 2026 00:49:11 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48727bfc5ecsm173139175e9.1.2026.03.30.00.49.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Mar 2026 00:49: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.18] KVM: x86/mmu: Drop/zap existing present SPTE even when creating an MMIO SPTE Date: Mon, 30 Mar 2026 09:49:08 +0200 Message-ID: <20260330074909.140480-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 667d66cf76d5..a8fe777ba274 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