KVM: arm64: Use 0b11 for encoding PKVM_NOPAGE

The page ownership state encoded as 0b11 is currently considered
reserved for future use, and PKVM_NOPAGE uses bit 2. In order to
simplify the relocation of the hyp ownership state into the
vmemmap in later patches, let's use the 'reserved' encoding for
the PKVM_NOPAGE state. The struct hyp_page layout isn't guaranteed
stable at all, so there is no real reason to have 'reserved' encodings.

No functional changes intended.

Reviewed-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Quentin Perret <qperret@google.com>
Link: https://lore.kernel.org/r/20250416152648.2982950-4-qperret@google.com
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/hyp/include/nvhe/memory.h b/arch/arm64/kvm/hyp/include/nvhe/memory.h
index 178028172c0b33139b79f018d74358694192a602..bf28f9f9de6536074d31939d463f009d0d4e54fa 100644 (file)
--- a/arch/arm64/kvm/hyp/include/nvhe/memory.h
+++ b/arch/arm64/kvm/hyp/include/nvhe/memory.h
@@ -23,7 +23,6 @@ enum pkvm_page_state {
        PKVM_PAGE_OWNED                 = 0ULL,
        PKVM_PAGE_SHARED_OWNED          = BIT(0),
        PKVM_PAGE_SHARED_BORROWED       = BIT(1),
-       __PKVM_PAGE_RESERVED            = BIT(0) | BIT(1),
 
        /*
         * 'Meta-states' are not stored directly in PTE SW bits for hyp and
@@ -31,9 +30,8 @@ enum pkvm_page_state {
         * entries). For the host, meta-states are stored directly in the
         * struct hyp_page.
         */
-       PKVM_NOPAGE                     = BIT(2),
+       PKVM_NOPAGE                     = BIT(0) | BIT(1),
 };
-#define PKVM_PAGE_META_STATES_MASK     (~__PKVM_PAGE_RESERVED)
 
 #define PKVM_PAGE_STATE_PROT_MASK      (KVM_PGTABLE_PROT_SW0 | KVM_PGTABLE_PROT_SW1)
 static inline enum kvm_pgtable_prot pkvm_mkstate(enum kvm_pgtable_prot prot,