From nobody Mon Feb 9 14:32:02 2026 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5C0F4330647 for ; Thu, 29 Jan 2026 01:15:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769649344; cv=none; b=lJsazmwaIAcaoSkNtqhL0cErEE00zhWltxPshZUFs4FlSi7hvr3ovJw5bTZE/kq/LVb9MWObjDC0X2FEtO4Oa/E7R2Qnw3TBgqiIhi1jLEqfCWw7uQs6J1goDj/YUJ8M47PakjnIuuMZOYqO0DyJq1ujwj1hSgUwsQTsYS+wcS4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769649344; c=relaxed/simple; bh=u2c/NHbwd0lYBbUDVthgSs2By7odK2wgvzMf1mYm8nw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XMIAyu3tkBGi2ItmvbQLnMioVHWxPlCLTREJAWiTDPrbpGjL1Uv20gErN7KAnfN7U1Z3wguC6bwRafnEvK8/2S2+RlLUi70xZBl6OyL7QpNBWgoePGQ/G9Whinb+tozBNJUCbcf7CSxc3PeJ0NLuyDTvwHqagWF8jcgxBZhE3sU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=3TPPBt9x; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="3TPPBt9x" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2a13be531b2so3454995ad.2 for ; Wed, 28 Jan 2026 17:15:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1769649341; x=1770254141; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=yG0aJZj9vYemOuZH1z1kqzk7rC62lJqsq0W3///tL/M=; b=3TPPBt9xfC4daULq855+G1xZ8/MD3fU3A6zDwIlq59gwqQ61ijTWwM00lcrAn+KZid wUnNpw85dMlXJ3fdV4JOjEO5UhL8INXoJesshXjCq+sh3JcYeds5FB7jO81t135r6MTJ KYzZI1S0MudJDLBu5vfHSSL++YZQ/UUL6YQxnw0sq+AnTaUC2pyvDo6OHSFUIUFwzzQO Nc2oc1C6MiZHLf2uCZlZZH33+xoGeSvt6IukZX3vCLnNwkjyxLx6cue7kadxwTUt2pTe vkaiqwAORkfidawGhOdCtHQfe/OEbuA17XxIxJ9u8unXjfG5UMC2soUKLXAt6hud+w2B I9Nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769649341; x=1770254141; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=yG0aJZj9vYemOuZH1z1kqzk7rC62lJqsq0W3///tL/M=; b=u8JpCIokcqNDBLcahWLh/RHvRmA13heDVcBLsT5y0S/X6ZnVGxLa6jbiICwCFs4CBA tPTMeEvLKRsekVS/k3ZZed6D2yPVLqj8QBnMJ+egNf0Rqn8IkL8yDc6ljq6O+2XH+8C9 zRKZOWfqANLcirUs3Rde+2vRkQnXpkHEWjOTSENJcVqLUxWJA9H/gDjdkEbAbpnxTQY6 JTVuy3Qwd8xM1ZIoj/Sk4mfye9FUF++/shm5y0bwdPtFChC7OaPAoGhjvLkLQoRylBG7 QUKCTL8lbEvUf/yvBcpa9GqVETd1qqUKLyEISLHwvV7hsTK/HbxsyJivQ133DktrF6A2 jYww== X-Gm-Message-State: AOJu0YxQwncEC4nrGl4n8QiMXikAmSMGZo4dSuYQ/IK3iQ79XFFqLo4D 0wqw3J2u9QZPwc/Bj3Wi88WH1kAYf94YRnvxzoY74gQIBXeDXQEgeawpdM9zE/eHFKN2ri/M363 aVlRbbg== X-Received: from pgbcq1.prod.google.com ([2002:a05:6a02:4081:b0:bc3:ac3:8769]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:a41:b0:389:94e1:25c1 with SMTP id adf61e73a8af0-38ec658ba91mr6736564637.70.1769649340957; Wed, 28 Jan 2026 17:15:40 -0800 (PST) Reply-To: Sean Christopherson Date: Wed, 28 Jan 2026 17:14:39 -0800 In-Reply-To: <20260129011517.3545883-1-seanjc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260129011517.3545883-1-seanjc@google.com> X-Mailer: git-send-email 2.53.0.rc1.217.geba53bf80e-goog Message-ID: <20260129011517.3545883-8-seanjc@google.com> Subject: [RFC PATCH v5 07/45] KVM: x86/mmu: Plumb the SPTE _pointer_ into the TDP MMU's handle_changed_spte() From: Sean Christopherson To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Kiryl Shutsemau , Sean Christopherson , Paolo Bonzini Cc: linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev, kvm@vger.kernel.org, Kai Huang , Rick Edgecombe , Yan Zhao , Vishal Annapurve , Ackerley Tng , Sagi Shahar , Binbin Wu , Xiaoyao Li , Isaku Yamahata Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Plumb the SPTE pointer into handle_changed_spte() so that remove leaf mirror entries can be forwarded to TDX in handle_changed_spte(), instead of effectively requiring callers to manually do so. Relying on each caller to invoke .remove_external_spte() is confusing and brittle, e.g. subtly relies tdp_mmu_set_spte_atomic() never removing SPTEs. This will also allow consolidating all S-EPT updates into a single kvm_x86_ops hook. Signed-off-by: Sean Christopherson --- arch/x86/kvm/mmu/tdp_mmu.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 6fb48b217f5b..8743cd020d12 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -320,9 +320,9 @@ void kvm_tdp_mmu_alloc_root(struct kvm_vcpu *vcpu, bool= mirror) } } =20 -static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn, - u64 old_spte, u64 new_spte, int level, - bool shared); +static void handle_changed_spte(struct kvm *kvm, int as_id, tdp_ptep_t spt= ep, + gfn_t gfn, u64 old_spte, u64 new_spte, + int level, bool shared); =20 static void tdp_account_mmu_page(struct kvm *kvm, struct kvm_mmu_page *sp) { @@ -471,7 +471,7 @@ static void handle_removed_pt(struct kvm *kvm, tdp_ptep= _t pt, bool shared) old_spte =3D kvm_tdp_mmu_write_spte(sptep, old_spte, FROZEN_SPTE, level); } - handle_changed_spte(kvm, kvm_mmu_page_as_id(sp), gfn, + handle_changed_spte(kvm, kvm_mmu_page_as_id(sp), sptep, gfn, old_spte, FROZEN_SPTE, level, shared); =20 if (is_mirror_sp(sp)) { @@ -499,6 +499,7 @@ static void handle_removed_pt(struct kvm *kvm, tdp_ptep= _t pt, bool shared) * handle_changed_spte - handle bookkeeping associated with an SPTE change * @kvm: kvm instance * @as_id: the address space of the paging structure the SPTE was a part of + * @sptep: pointer to the SPTE * @gfn: the base GFN that was mapped by the SPTE * @old_spte: The value of the SPTE before the change * @new_spte: The value of the SPTE after the change @@ -511,9 +512,9 @@ static void handle_removed_pt(struct kvm *kvm, tdp_ptep= _t pt, bool shared) * dirty logging updates are handled in common code, not here (see make_sp= te() * and fast_pf_fix_direct_spte()). */ -static void handle_changed_spte(struct kvm *kvm, int as_id, gfn_t gfn, - u64 old_spte, u64 new_spte, int level, - bool shared) +static void handle_changed_spte(struct kvm *kvm, int as_id, tdp_ptep_t spt= ep, + gfn_t gfn, u64 old_spte, u64 new_spte, + int level, bool shared) { bool was_present =3D is_shadow_present_pte(old_spte); bool is_present =3D is_shadow_present_pte(new_spte); @@ -685,8 +686,8 @@ static inline int __must_check tdp_mmu_set_spte_atomic(= struct kvm *kvm, if (ret) return ret; =20 - handle_changed_spte(kvm, iter->as_id, iter->gfn, iter->old_spte, - new_spte, iter->level, true); + handle_changed_spte(kvm, iter->as_id, iter->sptep, iter->gfn, + iter->old_spte, new_spte, iter->level, true); =20 return 0; } @@ -720,7 +721,7 @@ static u64 tdp_mmu_set_spte(struct kvm *kvm, int as_id,= tdp_ptep_t sptep, =20 old_spte =3D kvm_tdp_mmu_write_spte(sptep, old_spte, new_spte, level); =20 - handle_changed_spte(kvm, as_id, gfn, old_spte, new_spte, level, false); + handle_changed_spte(kvm, as_id, sptep, gfn, old_spte, new_spte, level, fa= lse); =20 /* * Users that do non-atomic setting of PTEs don't operate on mirror --=20 2.53.0.rc1.217.geba53bf80e-goog