fixup! KVM: x86/tdp_mmu: Rename REMOVED_SPTE to FROZEN_SPTE

Commit Message

Edgecombe, Rick P July 12, 2024, 11:34 p.m. UTC

From: Yan Zhao <[e-mail]>

Fixing the missed Removed/REMOVED.

Signed-off-by: Yan Zhao <[e-mail]>
Signed-off-by: Rick Edgecombe <[e-mail]>
---
Hi Paolo,

I saw kvm-coco-queue got re-arranged and thought we better send this one
out ahead of the rest. It seems the target of this fixup patch is now
merged from some branch not in the public git. Hopefully, it's not too
difficult to squash.

Since these are just fixes for not too problematically wrong comments
(given that removed is currently the only use of frozen), we could also
instead do them in another patch later if you prefer.

It is based on the HEAD of the latest kvm-coco-queue, but also applies
cleanly to eb162c941c0b (Merge branch 'kvm-tdx-prep-1-truncated' into
HEAD).

Thanks,

Rick
---
 arch/x86/kvm/mmu/spte.c    | 6 +++---
 arch/x86/kvm/mmu/spte.h    | 2 +-
 arch/x86/kvm/mmu/tdp_mmu.c | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

Comments

Sean Christopherson Aug. 23, 2024, 11:47 p.m. UTC | #1

On Fri, 12 Jul 2024 16:34:38 -0700, Rick Edgecombe wrote:
> Fixing the missed Removed/REMOVED.
> 
> 

Applied to kvm-x86 fixes, with an appropriate shortlog, changelog, and metadata.

Thank!

[1/1] KVM: x86/mmu: Fixup comments missed by the REMOVED_SPTE=>FROZEN_SPTE rename
      https://github.com/kvm-x86/linux/commit/e03a7caa5335

--
https://github.com/kvm-x86/linux/tree/next

Edgecombe, Rick P Aug. 25, 2024, 3:15 a.m. UTC | #2

On Fri, 2024-08-23 at 16:47 -0700, Sean Christopherson wrote:
>  with an appropriate shortlog, changelog,

Thanks!

Patch

diff --git a/arch/x86/kvm/mmu/spte.c b/arch/x86/kvm/mmu/spte.c
index 59cac37615b6..5b8f005dac64 100644
--- a/arch/x86/kvm/mmu/spte.c
+++ b/arch/x86/kvm/mmu/spte.c
@@ -377,9 +377,9 @@  void kvm_mmu_set_mmio_spte_mask(u64 mmio_value, u64 mmio_mask, u64 access_mask)
 		mmio_value = 0;
 
 	/*
-	 * The masked MMIO value must obviously match itself and a removed SPTE
-	 * must not get a false positive.  Removed SPTEs and MMIO SPTEs should
-	 * never collide as MMIO must set some RWX bits, and removed SPTEs must
+	 * The masked MMIO value must obviously match itself and a frozen SPTE
+	 * must not get a false positive.  Frozen SPTEs and MMIO SPTEs should
+	 * never collide as MMIO must set some RWX bits, and frozen SPTEs must
 	 * not set any RWX bits.
 	 */
 	if (WARN_ON((mmio_value & mmio_mask) != mmio_value) ||
diff --git a/arch/x86/kvm/mmu/spte.h b/arch/x86/kvm/mmu/spte.h
index a72f0e3bde17..47c06f86c1af 100644
--- a/arch/x86/kvm/mmu/spte.h
+++ b/arch/x86/kvm/mmu/spte.h
@@ -214,7 +214,7 @@  extern u64 __read_mostly shadow_nonpresent_or_rsvd_mask;
  */
 #define FROZEN_SPTE	(SHADOW_NONPRESENT_VALUE | 0x5a0ULL)
 
-/* Removed SPTEs must not be misconstrued as shadow present PTEs. */
+/* Frozen SPTEs must not be misconstrued as shadow present PTEs. */
 static_assert(!(FROZEN_SPTE & SPTE_MMU_PRESENT_MASK));
 
 static inline bool is_frozen_spte(u64 spte)
diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c
index 2abe65226a57..6f88d6b47555 100644
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -400,10 +400,10 @@  static void handle_removed_pt(struct kvm *kvm, tdp_ptep_t pt, bool shared)
 			/*
 			 * Set the SPTE to a nonpresent value that other
 			 * threads will not overwrite. If the SPTE was
-			 * already marked as removed then another thread
+			 * already marked as frozen then another thread
 			 * handling a page fault could overwrite it, so
 			 * set the SPTE until it is set from some other
-			 * value to the removed SPTE value.
+			 * value to the frozen SPTE value.
 			 */
 			for (;;) {
 				old_spte = kvm_tdp_mmu_write_spte_atomic(sptep, FROZEN_SPTE);
@@ -648,8 +648,8 @@  static inline int __must_check __tdp_mmu_set_spte_atomic(struct kvm *kvm,
 	u64 *sptep = rcu_dereference(iter->sptep);
 
 	/*
-	 * The caller is responsible for ensuring the old SPTE is not a REMOVED
-	 * SPTE.  KVM should never attempt to zap or manipulate a REMOVED SPTE,
+	 * The caller is responsible for ensuring the old SPTE is not a FROZEN
+	 * SPTE.  KVM should never attempt to zap or manipulate a FROZEN SPTE,
 	 * and pre-checking before inserting a new SPTE is advantageous as it
 	 * avoids unnecessary work.
 	 */