[PATCH v4 14/21] KVM: arm64: Expose pkvm_hyp_id

[Fuad Tabba]

Hi Quentin,

On Mon, Aug 9, 2021 at 5:25 PM Quentin Perret <qperret at google.com> wrote:
>
> Allow references to the hypervisor's owner id from outside
> mem_protect.c.
>
> Signed-off-by: Quentin Perret <qperret at google.com>
> ---

Reviewed-by: Fuad Tabba <tabba at google.com>

Thanks,
/fuad

>  arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 ++
>  arch/arm64/kvm/hyp/nvhe/mem_protect.c         | 2 +-
>  2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h
> index 0849ee8fa260..23316a021880 100644
> --- a/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h
> +++ b/arch/arm64/kvm/hyp/include/nvhe/mem_protect.h
> @@ -46,6 +46,8 @@ struct host_kvm {
>  };
>  extern struct host_kvm host_kvm;
>
> +extern const u8 pkvm_hyp_id;
> +
>  int __pkvm_prot_finalize(void);
>  int __pkvm_mark_hyp(phys_addr_t start, phys_addr_t end);
>
> diff --git a/arch/arm64/kvm/hyp/nvhe/mem_protect.c b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> index f95a5a4aa09c..ee255171945c 100644
> --- a/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> +++ b/arch/arm64/kvm/hyp/nvhe/mem_protect.c
> @@ -31,7 +31,7 @@ static struct hyp_pool host_s2_pool;
>  u64 id_aa64mmfr0_el1_sys_val;
>  u64 id_aa64mmfr1_el1_sys_val;
>
> -static const u8 pkvm_hyp_id = 1;
> +const u8 pkvm_hyp_id = 1;
>
>  static void *host_s2_zalloc_pages_exact(size_t size)
>  {
> --
> 2.32.0.605.g8dce9f2422-goog
>