Commit 837d632a authored Oct 04, 2022 by Vincent Donnefort Committed by Marc Zyngier Oct 09, 2022

KVM: arm64: Enable stack protection and branch profiling for VHE



For historical reasons, the VHE code inherited the build configuration from
nVHE. Now those two parts have their own folder and makefile, we can
enable stack protection and branch profiling for VHE.

Signed-off-by: Vincent Donnefort <vdonnefort@google.com>
Reviewed-by: Quentin Perret <qperret@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221004154216.2833636-1-vdonnefort@google.com

parent 5994bc9e

arch/arm64/kvm/hyp/Makefile

+1 −4

Original line number	Diff line number	Diff line
		@@ -5,9 +5,6 @@

		incdir := $(srctree)/$(src)/include
		subdir-asflags-y := -I$(incdir)
		subdir-ccflags-y := -I$(incdir) \
		-fno-stack-protector \
		-DDISABLE_BRANCH_PROFILING \
		$(DISABLE_STACKLEAK_PLUGIN)
		subdir-ccflags-y := -I$(incdir)

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

arch/arm64/kvm/hyp/nvhe/Makefile

+3 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,9 @@ asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS
		# will explode instantly (Words of Marc Zyngier). So introduce a generic flag
		# __DISABLE_TRACE_MMIO__ to disable MMIO tracing for nVHE KVM.
		ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -D__DISABLE_TRACE_MMIO__
		ccflags-y += -fno-stack-protector \
		-DDISABLE_BRANCH_PROFILING \
		$(DISABLE_STACKLEAK_PLUGIN)

		hostprogs := gen-hyprel
		HOST_EXTRACFLAGS += -I$(objtree)/include