diff options
| author | Will Deacon <will@kernel.org> | 2021-03-19 11:01:10 +0100 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2021-03-19 13:01:19 +0100 |
| commit | 7b4a7b5e6fefd15f708f959dd43e188444e252ec (patch) | |
| tree | fed560659a22dfc991e5953a1f3fee539761f705 /arch/arm64/include/asm/hyp_image.h | |
| parent | arm64: lib: Annotate {clear, copy}_page() as position-independent (diff) | |
| download | linux-7b4a7b5e6fefd15f708f959dd43e188444e252ec.tar.xz linux-7b4a7b5e6fefd15f708f959dd43e188444e252ec.zip | |
KVM: arm64: Link position-independent string routines into .hyp.text
Pull clear_page(), copy_page(), memcpy() and memset() into the nVHE hyp
code and ensure that we always execute the '__pi_' entry point on the
offchance that it changes in future.
[ qperret: Commit title nits and added linker script alias ]
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Quentin Perret <qperret@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20210319100146.1149909-3-qperret@google.com
Diffstat (limited to 'arch/arm64/include/asm/hyp_image.h')
| -rw-r--r-- | arch/arm64/include/asm/hyp_image.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/hyp_image.h b/arch/arm64/include/asm/hyp_image.h index 737ded6b6d0d..78cd77990c9c 100644 --- a/arch/arm64/include/asm/hyp_image.h +++ b/arch/arm64/include/asm/hyp_image.h @@ -56,6 +56,9 @@ */ #define KVM_NVHE_ALIAS(sym) kvm_nvhe_sym(sym) = sym; +/* Defines a linker script alias for KVM nVHE hyp symbols */ +#define KVM_NVHE_ALIAS_HYP(first, sec) kvm_nvhe_sym(first) = kvm_nvhe_sym(sec); + #endif /* LINKER_SCRIPT */ #endif /* __ARM64_HYP_IMAGE_H__ */ |