arm64/kvm: Avoid invalid physical addresses to signal owner updates

The pKVM stage2 mapping code relies on an invalid physical address to
signal to the internal API that only the annotations of descriptors
should be updated, and these are stored in the high bits of invalid
descriptors covering memory that has been donated to protected guests,
and is therefore unmapped from the host stage-2 page tables.

Given that these invalid PAs are never stored into the descriptors, it
is better to rely on an explicit flag, to clarify the API and to avoid
confusion regarding whether or not the output address of a descriptor
can ever be invalid to begin with (which is not the case with LPA2).

That removes a dependency on the logic that reasons about the maximum PA
range, which differs on LPA2 capable CPUs based on whether LPA2 is
enabled or not, and will be further clarified in subsequent patches.

Cc: Quentin Perret <qperret@google.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Quentin Perret <qperret@google.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20241212081841.2168124-12-ardb+git@google.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/arch/arm64/kvm/hyp/pgtable.c b/arch/arm64/kvm/hyp/pgtable.c
index 40bd559665404d0b971314888dd0842179813d1c..d2b6fa051d6b0e58e39f9e35d990c898063b3860 100644 (file)
--- a/arch/arm64/kvm/hyp/pgtable.c
+++ b/arch/arm64/kvm/hyp/pgtable.c
@@ -35,14 +35,6 @@ static bool kvm_pgtable_walk_skip_cmo(const struct kvm_pgtable_visit_ctx *ctx)
        return unlikely(ctx->flags & KVM_PGTABLE_WALK_SKIP_CMO);
 }
 
-static bool kvm_phys_is_valid(u64 phys)
-{
-       u64 parange_max = kvm_get_parange_max();
-       u8 shift = id_aa64mmfr0_parange_to_phys_shift(parange_max);
-
-       return phys < BIT(shift);
-}
-
 static bool kvm_block_mapping_supported(const struct kvm_pgtable_visit_ctx *ctx, u64 phys)
 {
        u64 granule = kvm_granule_size(ctx->level);
@@ -53,7 +45,7 @@ static bool kvm_block_mapping_supported(const struct kvm_pgtable_visit_ctx *ctx,
        if (granule > (ctx->end - ctx->addr))
                return false;
 
-       if (kvm_phys_is_valid(phys) && !IS_ALIGNED(phys, granule))
+       if (!IS_ALIGNED(phys, granule))
                return false;
 
        return IS_ALIGNED(ctx->addr, granule);
@@ -587,6 +579,9 @@ struct stage2_map_data {
 
        /* Force mappings to page granularity */
        bool                            force_pte;
+
+       /* Walk should update owner_id only */
+       bool                            annotation;
 };
 
 u64 kvm_get_vtcr(u64 mmfr0, u64 mmfr1, u32 phys_shift)
@@ -885,18 +880,7 @@ static u64 stage2_map_walker_phys_addr(const struct kvm_pgtable_visit_ctx *ctx,
 {
        u64 phys = data->phys;
 
-       /*
-        * Stage-2 walks to update ownership data are communicated to the map
-        * walker using an invalid PA. Avoid offsetting an already invalid PA,
-        * which could overflow and make the address valid again.
-        */
-       if (!kvm_phys_is_valid(phys))
-               return phys;
-
-       /*
-        * Otherwise, work out the correct PA based on how far the walk has
-        * gotten.
-        */
+       /* Work out the correct PA based on how far the walk has gotten */
        return phys + (ctx->addr - ctx->start);
 }
 
@@ -908,6 +892,9 @@ static bool stage2_leaf_mapping_allowed(const struct kvm_pgtable_visit_ctx *ctx,
        if (data->force_pte && ctx->level < KVM_PGTABLE_LAST_LEVEL)
                return false;
 
+       if (data->annotation)
+               return true;
+
        return kvm_block_mapping_supported(ctx, phys);
 }
 
@@ -923,7 +910,7 @@ static int stage2_map_walker_try_leaf(const struct kvm_pgtable_visit_ctx *ctx,
        if (!stage2_leaf_mapping_allowed(ctx, data))
                return -E2BIG;
 
-       if (kvm_phys_is_valid(phys))
+       if (!data->annotation)
                new = kvm_init_valid_leaf_pte(phys, data->attr, ctx->level);
        else
                new = kvm_init_invalid_leaf_owner(data->owner_id);
@@ -1085,11 +1072,11 @@ int kvm_pgtable_stage2_set_owner(struct kvm_pgtable *pgt, u64 addr, u64 size,
 {
        int ret;
        struct stage2_map_data map_data = {
-               .phys           = KVM_PHYS_INVALID,
                .mmu            = pgt->mmu,
                .memcache       = mc,
                .owner_id       = owner_id,
                .force_pte      = true,
+               .annotation     = true,
        };
        struct kvm_pgtable_walker walker = {
                .cb             = stage2_map_walker,