Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71b9d45 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 2dc5013d on remote branch 

Change-Id: Id6789606d804f5e31a45fcb0d06ed06f6c800c6e
parents 156f8ff5 2dc5013d

arch/arm/include/asm/kvm_host.h

+7 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/fpstate.h>

#include <asm/spectre.h>

#include <kvm/arm_arch_timer.h>



#define __KVM_HAVE_ARCH_INTC_INITIALIZED
@@ -366,4 +367,10 @@ void kvm_arch_free_vm(struct kvm *kvm); 


#define kvm_arm_vcpu_loaded(vcpu)	(false)



static inline int kvm_arm_get_spectre_bhb_state(void)

{

	/* 32bit guests don't need firmware for this */

	return SPECTRE_VULNERABLE; /* aka SMCCC_RET_NOT_SUPPORTED */

}



#endif /* __ARM_KVM_HOST_H__ */

arch/arm64/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -1152,6 +1152,15 @@ config COMPAT_VDSO 
	  You must have a 32-bit build of glibc 2.22 or later for programs

	  to seamlessly take advantage of this.



config MITIGATE_SPECTRE_BRANCH_HISTORY

	bool "Mitigate Spectre style attacks against branch history" if EXPERT

	default y

	help

	  Speculation attacks against some high-performance processors can

	  make use of branch history to influence future speculation.

	  When taking an exception from user-space, a sequence of branches

	  or a firmware call overwrites the branch history.



menuconfig ARMV8_DEPRECATED

	bool "Emulate deprecated/obsolete ARMv8 instructions"

	depends on COMPAT

arch/arm64/include/asm/assembler.h

+34 −0
Original line number Diff line number Diff line
@@ -140,6 +140,13 @@ 
	hint	#20

	.endm



/*

 * Clear Branch History instruction

 */

	.macro clearbhb

	hint	#22

	.endm



/*

 * Sanitise a 64-bit bounded index wrt speculation, returning zero if out

 * of bounds.
@@ -732,4 +739,31 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU 
.Lyield_out_\@ :

	.endm



	.macro __mitigate_spectre_bhb_loop	tmp

#ifdef CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY

alternative_cb  spectre_bhb_patch_loop_iter

	mov	\tmp, #32		// Patched to correct the immediate

alternative_cb_end

.Lspectre_bhb_loop\@:

	b	. + 4

	subs	\tmp, \tmp, #1

	b.ne	.Lspectre_bhb_loop\@

	dsb	nsh

	isb

#endif /* CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY */

	.endm



	/* Save/restores x0-x3 to the stack */

	.macro __mitigate_spectre_bhb_fw

#ifdef CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY

	stp	x0, x1, [sp, #-16]!

	stp	x2, x3, [sp, #-16]!

	mov	w0, #ARM_SMCCC_ARCH_WORKAROUND_3

alternative_cb	arm64_update_smccc_conduit

	nop			// Patched to SMC/HVC #0

alternative_cb_end

	ldp	x2, x3, [sp], #16

	ldp	x0, x1, [sp], #16

#endif /* CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY */

	.endm

#endif	/* __ASM_ASSEMBLER_H */

arch/arm64/include/asm/cpu.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct cpuinfo_arm64 { 
	u64		reg_id_aa64dfr1;

	u64		reg_id_aa64isar0;

	u64		reg_id_aa64isar1;

	u64		reg_id_aa64isar2;

	u64		reg_id_aa64mmfr0;

	u64		reg_id_aa64mmfr1;

	u64		reg_id_aa64mmfr2;

arch/arm64/include/asm/cpucaps.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#define ARM64_WORKAROUND_1188873		35

#define ARM64_WORKAROUND_1542418		36

#define ARM64_WORKAROUND_1542419		37

#define ARM64_SPECTRE_BHB			38



/* kabi: reserve 38 - 62 for future cpu capabilities */

#define ARM64_NCAPS				62