Re: [PATCH v17 03/20] KVM: arm64: Track the type of VM in kvm_arch

[Marc Zyngier <maz@kernel.org>]

On Tue, 08 Sep 2026 17:22:06 +0100,
Suzuki K Poulose <suzuki.poulose@arm.com> wrote:
> 
> KVM arm64 has different types of VMs with all the different modes in which the
> hypervisor code can be run. e.g., VHE, nVHE, PKVM etc. Then there is protected
> VM and normal VMs with PKVM. We might soon add other types, e.g., Arm CCA Realm.
> So in an effort to make the handling of these different types of VMs a bit more
> friendlier to the eyes, add a VM flavor to the kvm_arch and we could then add
> handlers for different operations based on the VM type.
> 
> Keep the flavor initialisation at the beginning to allow for the detection
> early enough and fail out on any unsupported requests. (e.g., protected on !PKVM)
> 
> With that, use the vm_flavor to detect if a VM is protected VM on PKVM.
> 
> Based on a patch by Marc Zyngier
> 
> Suggested-by: Marc Zyngier <maz@kernel.org>
> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
> ---
>  arch/arm64/include/asm/kvm_host.h | 12 ++++++++++--
>  arch/arm64/kvm/arm.c              | 27 ++++++++++++++++++++++++---
>  arch/arm64/kvm/hyp/nvhe/pkvm.c    |  2 +-
>  arch/arm64/kvm/pkvm.c             |  1 -
>  4 files changed, 35 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
> index 27fe0cd5b2d7a..d0dccc9ad6aa8 100644
> --- a/arch/arm64/include/asm/kvm_host.h
> +++ b/arch/arm64/include/asm/kvm_host.h
> @@ -257,7 +257,6 @@ struct kvm_protected_vm {
>  	pkvm_handle_t handle;
>  	struct kvm_hyp_memcache teardown_mc;
>  	struct kvm_hyp_memcache stage2_teardown_mc;
> -	bool is_protected;
>  	bool is_created;
>  
>  	/*
> @@ -306,9 +305,18 @@ enum fgt_group_id {
>  	__NR_FGT_GROUP_IDS__
>  };
>  
> +enum kvm_arm_vm_flavor {
> +	VM_NVHE,
> +	VM_VHE,
> +	VM_PKVM,		/* Normal guests on PKVM */
> +	VM_PROTECTED_PKVM,	/* Protected VM */
> +	VM_FLAVOR_MAX,
> +};
> +

My original design did introduce classes of VMs, which I definitely
want to retain so that we don't pointlessly differentiate CCA VMs from
pKVM protected guests when at all possible. Realms are protected VMs,
full stop.

With that in mind, this should read:

enum kvm_arm_vm_flavor {
	VM_NVHE,
	VM_VHE,
	VM_PKVM,		/* Normal guests on PKVM */
	MARKER(__VM_FLAVOR_PROTECTED__),
	VM_PROTECTED_PKVM,	/* Protected VM */
	VM_REALM,		/* CCA */
	VM_FLAVOR_MAX,
};

>  struct kvm_arch {
>  	struct kvm_s2_mmu mmu;
>  
> +	enum kvm_arm_vm_flavor vm_flavor;
>  	/*
>  	 * Fine-Grained UNDEF, mimicking the FGT layout defined by the
>  	 * architecture. We track them globally, as we present the
> @@ -1504,7 +1512,7 @@ struct kvm *kvm_arch_alloc_vm(void);
>  
>  #define __KVM_HAVE_ARCH_FLUSH_REMOTE_TLBS_RANGE
>  
> -#define kvm_vm_is_protected(kvm)	(is_protected_kvm_enabled() && (kvm)->arch.pkvm.is_protected)
> +#define kvm_vm_is_protected(kvm)	((kvm)->arch.vm_flavor == VM_PROTECTED_PKVM)

and this should read ((kvm)->arch.vm_flavor >= __VM_FLAVOR_PROTECTED__).

Thanks,

	M.

-- 
Without deviation from the norm, progress is not possible.