KVM: x86/mmu: Fixup comments missed by the REMOVED_SPTE=>FROZEN_SPTE rename

Replace "removed" with "frozen" in comments as appropriate to complete the
rename of REMOVED_SPTE to FROZEN_SPTE.

Fixes: 964cea817196 ("KVM: x86/tdp_mmu: Rename REMOVED_SPTE to FROZEN_SPTE")
Signed-off-by: Yan Zhao <yan.y.zhao@intel.com>
Signed-off-by: Rick Edgecombe <rick.p.edgecombe@intel.com>
Link: https://lore.kernel.org/r/20240712233438.518591-1-rick.p.edgecombe@intel.com
[sean: write changelog]
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/mmu/spte.c b/arch/x86/kvm/mmu/spte.c
index d4527965e48c4004e0461d1e9451889c624b688f..8f7eb3ad88fcb97469ee9e3c5d5a02440b18ea77 100644 (file)
--- a/arch/x86/kvm/mmu/spte.c
+++ b/arch/x86/kvm/mmu/spte.c
@@ -391,9 +391,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 ef793c459b05b1c5d475c5627b5e636a6236a16f..2cb816ea24307aa38e46ee0b6e838c6eb99e805a 100644 (file)
--- 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 c7dc49ee73887ab53bc9bbc52d5a5f19d391a73e..3c55955bcaf8ca459476eacf5eaad0f4a8fe7daa 100644 (file)
--- a/arch/x86/kvm/mmu/tdp_mmu.c
+++ b/arch/x86/kvm/mmu/tdp_mmu.c
@@ -359,10 +359,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);
@@ -536,8 +536,8 @@ static inline int __must_check __tdp_mmu_set_spte_atomic(struct tdp_iter *iter,
        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.
         */