Commit ceee2fe4 authored by Andrew Scull's avatar Andrew Scull Committed by Marc Zyngier

KVM: arm64: Choose hyp symbol based on context

Make CHOOSE_HYP_SYM select the symbol of the active hypervisor for the
host, the nVHE symbol for nVHE and the VHE symbol for VHE. The nVHE and
VHE hypervisors see their own symbols without prefixes and trigger a
link error when trying to use a symbol of the other hypervisor.
Signed-off-by: default avatarAndrew Scull <ascull@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Cc: David Brazdil <dbrazdil@google.com>
Link: https://lore.kernel.org/r/20200915104643.2543892-5-ascull@google.com
parent d7ca1079
...@@ -60,10 +60,24 @@ ...@@ -60,10 +60,24 @@
DECLARE_KVM_VHE_SYM(sym); \ DECLARE_KVM_VHE_SYM(sym); \
DECLARE_KVM_NVHE_SYM(sym) DECLARE_KVM_NVHE_SYM(sym)
#if defined(__KVM_NVHE_HYPERVISOR__)
#define CHOOSE_HYP_SYM(sym) CHOOSE_NVHE_SYM(sym)
#define CHOOSE_NVHE_SYM(sym) sym
/* The nVHE hypervisor shouldn't even try to access VHE symbols */
extern void *__nvhe_undefined_symbol;
#define CHOOSE_VHE_SYM(sym) __nvhe_undefined_symbol
#elif defined(__KVM_VHE_HYPERVISOR)
#define CHOOSE_HYP_SYM(sym) CHOOSE_VHE_SYM(sym)
#define CHOOSE_VHE_SYM(sym) sym #define CHOOSE_VHE_SYM(sym) sym
#define CHOOSE_NVHE_SYM(sym) kvm_nvhe_sym(sym) /* The VHE hypervisor shouldn't even try to access nVHE symbols */
extern void *__vhe_undefined_symbol;
#define CHOOSE_NVHE_SYM(sym) __vhe_undefined_symbol
#else
#ifndef __KVM_NVHE_HYPERVISOR__
/* /*
* BIG FAT WARNINGS: * BIG FAT WARNINGS:
* *
...@@ -77,10 +91,9 @@ ...@@ -77,10 +91,9 @@
*/ */
#define CHOOSE_HYP_SYM(sym) (is_kernel_in_hyp_mode() ? CHOOSE_VHE_SYM(sym) \ #define CHOOSE_HYP_SYM(sym) (is_kernel_in_hyp_mode() ? CHOOSE_VHE_SYM(sym) \
: CHOOSE_NVHE_SYM(sym)) : CHOOSE_NVHE_SYM(sym))
#else #define CHOOSE_VHE_SYM(sym) sym
/* The nVHE hypervisor shouldn't even try to access anything */ #define CHOOSE_NVHE_SYM(sym) kvm_nvhe_sym(sym)
extern void *__nvhe_undefined_symbol;
#define CHOOSE_HYP_SYM(sym) __nvhe_undefined_symbol
#endif #endif
/* Translate a kernel address @ptr into its equivalent linear mapping */ /* Translate a kernel address @ptr into its equivalent linear mapping */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment