| Message ID | 20230609162200.2024064-3-maz@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | KVM: arm64: Allow using VHE in the nVHE hypervisor | expand |
On Fri, Jun 09, 2023 at 05:21:45PM +0100, Marc Zyngier wrote: > Using is_kernel_in_hyp_mode() in hypervisor code is a pretty bad > mistake. This helper only checks for CurrentEL being EL2, which > is always true. > > Make the compilation fail if using the helper in hypervisor context > Whilst we're at it, flag the helper as __always_inline, which it > really should be. > > Signed-off-by: Marc Zyngier <maz@kernel.org> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
On 6/10/23 00:21, Marc Zyngier wrote: > Using is_kernel_in_hyp_mode() in hypervisor code is a pretty bad > mistake. This helper only checks for CurrentEL being EL2, which > is always true. > > Make the compilation fail if using the helper in hypervisor context > Whilst we're at it, flag the helper as __always_inline, which it > really should be. > > Signed-off-by: Marc Zyngier <maz@kernel.org> Reviewed-by: Shaoqin Huang <shahuang@redhat.com> > --- > arch/arm64/include/asm/virt.h | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h > index 4eb601e7de50..21e94068804d 100644 > --- a/arch/arm64/include/asm/virt.h > +++ b/arch/arm64/include/asm/virt.h > @@ -110,8 +110,10 @@ static inline bool is_hyp_mode_mismatched(void) > return __boot_cpu_mode[0] != __boot_cpu_mode[1]; > } > > -static inline bool is_kernel_in_hyp_mode(void) > +static __always_inline bool is_kernel_in_hyp_mode(void) > { > + BUILD_BUG_ON(__is_defined(__KVM_NVHE_HYPERVISOR__) || > + __is_defined(__KVM_VHE_HYPERVISOR__)); > return read_sysreg(CurrentEL) == CurrentEL_EL2; > } >
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 4eb601e7de50..21e94068804d 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -110,8 +110,10 @@ static inline bool is_hyp_mode_mismatched(void) return __boot_cpu_mode[0] != __boot_cpu_mode[1]; } -static inline bool is_kernel_in_hyp_mode(void) +static __always_inline bool is_kernel_in_hyp_mode(void) { + BUILD_BUG_ON(__is_defined(__KVM_NVHE_HYPERVISOR__) || + __is_defined(__KVM_VHE_HYPERVISOR__)); return read_sysreg(CurrentEL) == CurrentEL_EL2; }
Using is_kernel_in_hyp_mode() in hypervisor code is a pretty bad mistake. This helper only checks for CurrentEL being EL2, which is always true. Make the compilation fail if using the helper in hypervisor context Whilst we're at it, flag the helper as __always_inline, which it really should be. Signed-off-by: Marc Zyngier <maz@kernel.org> --- arch/arm64/include/asm/virt.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)