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

KVM: arm64: Compile remaining hyp/ files for both VHE/nVHE 



The following files in hyp/ contain only code shared by VHE/nVHE:
  vgic-v3-sr.c, aarch32.c, vgic-v2-cpuif-proxy.c, entry.S, fpsimd.S
Compile them under both configurations. Deletions in image-vars.h reflect
eliminated dependencies of nVHE code on the rest of the kernel.

Signed-off-by: default avatarDavid Brazdil <dbrazdil@google.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-14-dbrazdil@google.com
parent 9aebdea4

arch/arm64/kernel/image-vars.h

+0 −29
Original line number Diff line number Diff line
@@ -63,35 +63,6 @@ __efistub__ctype = _ctype; 


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



/* Symbols defined in aarch32.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(kvm_skip_instr32);



/* Symbols defined in entry.S (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__guest_enter);

KVM_NVHE_ALIAS(__guest_exit);

KVM_NVHE_ALIAS(abort_guest_exit_end);

KVM_NVHE_ALIAS(abort_guest_exit_start);



/* Symbols defined in fpsimd.S (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__fpsimd_restore_state);

KVM_NVHE_ALIAS(__fpsimd_save_state);



/* Symbols defined in vgic-v2-cpuif-proxy.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__vgic_v2_perform_cpuif_access);



/* Symbols defined in vgic-v3-sr.c (not yet compiled with nVHE build rules). */

KVM_NVHE_ALIAS(__vgic_v3_activate_traps);

KVM_NVHE_ALIAS(__vgic_v3_deactivate_traps);

KVM_NVHE_ALIAS(__vgic_v3_get_ich_vtr_el2);

KVM_NVHE_ALIAS(__vgic_v3_init_lrs);

KVM_NVHE_ALIAS(__vgic_v3_perform_cpuif_access);

KVM_NVHE_ALIAS(__vgic_v3_read_vmcr);

KVM_NVHE_ALIAS(__vgic_v3_restore_aprs);

KVM_NVHE_ALIAS(__vgic_v3_restore_state);

KVM_NVHE_ALIAS(__vgic_v3_save_aprs);

KVM_NVHE_ALIAS(__vgic_v3_save_state);

KVM_NVHE_ALIAS(__vgic_v3_write_vmcr);



/* 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/kvm/hyp/Makefile

+1 −12
Original line number Diff line number Diff line
@@ -10,16 +10,5 @@ subdir-ccflags-y := -I$(incdir) \ 
		    -DDISABLE_BRANCH_PROFILING		\

		    $(DISABLE_STACKLEAK_PLUGIN)



obj-$(CONFIG_KVM) += hyp.o vhe/ nvhe/

obj-$(CONFIG_KVM) += vhe/ nvhe/

obj-$(CONFIG_KVM_INDIRECT_VECTORS) += smccc_wa.o
 


hyp-y := vgic-v3-sr.o aarch32.o vgic-v2-cpuif-proxy.o entry.o \

	 fpsimd.o



# KVM code is run at a different exception code with a different map, so

# compiler instrumentation that inserts callbacks or checks into the code may

# cause crashes. Just disable it.

GCOV_PROFILE	:= n

KASAN_SANITIZE	:= n

UBSAN_SANITIZE	:= n

KCOV_INSTRUMENT	:= n

arch/arm64/kvm/hyp/nvhe/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 
asflags-y := -D__KVM_NVHE_HYPERVISOR__

ccflags-y := -D__KVM_NVHE_HYPERVISOR__



obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o \

	 ../hyp-entry.o

obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o hyp-init.o

obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \

	 ../fpsimd.o ../hyp-entry.o



obj-y := $(patsubst %.o,%.hyp.o,$(obj-y))

extra-y := $(patsubst %.hyp.o,%.hyp.tmp.o,$(obj-y))

arch/arm64/kvm/hyp/vhe/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ 
asflags-y := -D__KVM_VHE_HYPERVISOR__

ccflags-y := -D__KVM_VHE_HYPERVISOR__



obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o ../hyp-entry.o

obj-y := timer-sr.o sysreg-sr.o debug-sr.o switch.o tlb.o

obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \

	 ../fpsimd.o ../hyp-entry.o



# KVM code is run at a different exception code with a different map, so

# compiler instrumentation that inserts callbacks or checks into the code may

CRA Git | Maintained and supported by SUSTech CRA and CCSE