Commit ce492a16 authored by David Brazdil's avatar David Brazdil Committed by Marc Zyngier
Browse files

kvm: arm64: Move nVHE hyp namespace macros to hyp_image.h 



Minor cleanup to move all macros related to prefixing nVHE hyp section
and symbol names into one place: hyp_image.h.

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20200922204910.7265-3-dbrazdil@google.com
parent ab25464b

arch/arm64/include/asm/hyp_image.h

+12 −0
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
#ifndef __ARM64_HYP_IMAGE_H__

#define __ARM64_HYP_IMAGE_H__



/*

 * KVM nVHE code has its own symbol namespace prefixed with __kvm_nvhe_,

 * to separate it from the kernel proper.

 */

#define kvm_nvhe_sym(sym)	__kvm_nvhe_##sym



#ifdef LINKER_SCRIPT



/*
@@ -19,6 +25,12 @@ 
#define HYP_SECTION(NAME) \

	HYP_SECTION_NAME(NAME) : { *(NAME NAME##.*) }



/*

 * Defines a linker script alias of a kernel-proper symbol referenced by

 * KVM nVHE hyp code.

 */

#define KVM_NVHE_ALIAS(sym)	kvm_nvhe_sym(sym) = sym;



#endif /* LINKER_SCRIPT */



#endif /* __ARM64_HYP_IMAGE_H__ */

arch/arm64/include/asm/kvm_asm.h

+1 −7
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#ifndef __ARM_KVM_ASM_H__

#define __ARM_KVM_ASM_H__



#include <asm/hyp_image.h>

#include <asm/virt.h>



#define	VCPU_WORKAROUND_2_FLAG_SHIFT	0
@@ -42,13 +43,6 @@ 


#include <linux/mm.h>



/*

 * Translate name of a symbol defined in nVHE hyp to the name seen

 * by kernel proper. All nVHE symbols are prefixed by the build system

 * to avoid clashes with the VHE variants.

 */

#define kvm_nvhe_sym(sym)	__kvm_nvhe_##sym



#define DECLARE_KVM_VHE_SYM(sym)	extern char sym[]

#define DECLARE_KVM_NVHE_SYM(sym)	extern char kvm_nvhe_sym(sym)[]

arch/arm64/kernel/image-vars.h

+0 −2
Original line number Diff line number Diff line
@@ -61,8 +61,6 @@ __efistub__ctype = _ctype; 
 * memory mappings.

 */



#define KVM_NVHE_ALIAS(sym) __kvm_nvhe_##sym = sym;



/* Alternative callbacks for init-time patching of nVHE hyp code. */

KVM_NVHE_ALIAS(arm64_enable_wa2_handling);

KVM_NVHE_ALIAS(kvm_patch_vector_branch);

arch/arm64/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 


#include <asm-generic/vmlinux.lds.h>

#include <asm/cache.h>

#include <asm/hyp_image.h>

#include <asm/kernel-pgtable.h>

#include <asm/memory.h>

#include <asm/page.h>