Re: [PATCH v2 1/7] KVM: arm64: Factor out code for checking E2H into a macro

[Oliver Upton <oliver.upton@linux.dev>]

Hi Fuad,

On Fri, Jul 21, 2023 at 10:51:38AM +0100, Fuad Tabba wrote:
> The code for checking whether the kernel is in (h)VHE mode is
> repeated, and will be needed again in future patches. Factor it
> out in a macro.
> 
> No functional change intended.
> No change in emitted assembly code intended.
> 
> Signed-off-by: Fuad Tabba <tabba@google.com>

Looks good, one nitpick below:

> ---
>  arch/arm64/include/asm/el2_setup.h | 19 ++++++++++---------
>  1 file changed, 10 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/include/asm/el2_setup.h b/arch/arm64/include/asm/el2_setup.h
> index 8e5ffb58f83e..383f6be66ed6 100644
> --- a/arch/arm64/include/asm/el2_setup.h
> +++ b/arch/arm64/include/asm/el2_setup.h
> @@ -31,6 +31,13 @@
>  .Lskip_hcrx_\@:
>  .endm
>  
> +/* Check if running in host at EL2 mode, i.e., (h)VHE. Jumps to fail if not. */
> +.macro __check_e2h fail, tmp
> +	mrs	\tmp, hcr_el2
> +	and	\tmp, \tmp, #HCR_E2H
> +	cbz	\tmp, \fail
> +.endm
> +

I was really hoping for the macro to have hVHE somewhere in the name,
since it may not be immediately obvious to folks why we're testing E2H
in this context.

So maybe: s/__check_e2h/__check_hvhe/ ?

I can fix it up when applying the series if you agree.

-- 
Thanks,
Oliver