[PATCH] KVM: arm64: Enable stack protection and branch profiling for VHE

[Quentin Perret]

On Tuesday 04 Oct 2022 at 16:42:16 (+0100), Vincent Donnefort wrote:
> 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.

+CC David who has been messing with these Makefiles in the past to
confirm, but this makes sense to me.

Reviewed-by: Quentin Perret <qperret at google.com>

> Signed-off-by: Vincent Donnefort <vdonnefort at google.com>
> 
> diff --git a/arch/arm64/kvm/hyp/Makefile b/arch/arm64/kvm/hyp/Makefile
> index 687598e41b21..a38dea6186c9 100644
> --- a/arch/arm64/kvm/hyp/Makefile
> +++ b/arch/arm64/kvm/hyp/Makefile
> @@ -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
> diff --git a/arch/arm64/kvm/hyp/nvhe/Makefile b/arch/arm64/kvm/hyp/nvhe/Makefile
> index b5c5119c7396..48f6ae7cc6e6 100644
> --- a/arch/arm64/kvm/hyp/nvhe/Makefile
> +++ b/arch/arm64/kvm/hyp/nvhe/Makefile
> @@ -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
> -- 
> 2.38.0.rc1.362.ged0d419d3c-goog
>