arm64: enable harden branch predictor

Enable the harden branch predictor for arm64 as it is recommend.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/armvirt/64/config-default b/target/linux/armvirt/64/config-default
index 4e63668f5f8a63ae7cf568a0184cd7f4e7caa4f5..00456513331243a483025822fc848e4f201e8726 100644 (file)
--- a/target/linux/armvirt/64/config-default
+++ b/target/linux/armvirt/64/config-default
@@ -106,6 +106,7 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y


@@ -177,6 +178,7 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 # CONFIG_THUNDER_NIC_PF is not set
 # CONFIG_THUNDER_NIC_RGX is not set
 # CONFIG_THUNDER_NIC_VF is not set
 # CONFIG_THUNDER_NIC_PF is not set
 # CONFIG_THUNDER_NIC_RGX is not set
 # CONFIG_THUNDER_NIC_VF is not set

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_VEXPRESS_CONFIG=y
 CONFIG_VEXPRESS_SYSCFG=y
 CONFIG_VIDEOMODE_HELPERS=y

diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index a27198335d14c9448530929d714c003a9e9fdff0..c9ee88c751663f3cc80d762fd2eca034dbfa4c49 100644 (file)
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -1534,7 +1534,6 @@ CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_HAMRADIO is not set
 # CONFIG_HAPPYMEAL is not set
 # CONFIG_HARDENED_USERCOPY is not set

-# CONFIG_HARDEN_BRANCH_PREDICTOR is not set

 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 # CONFIG_HARDLOCKUP_DETECTOR is not set
 # CONFIG_HAVE_AOUT is not set
 CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y


@@ -5021,7 +5020,6 @@ CONFIG_UNIX=y
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNIX_DIAG is not set
 CONFIG_UNIX98_PTYS=y
 # CONFIG_UNIXWARE_DISKLABEL is not set
 # CONFIG_UNIX_DIAG is not set

-# CONFIG_UNMAP_KERNEL_AT_EL0 is not set

 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_UPROBES is not set
 # CONFIG_UPROBE_EVENT is not set
 # CONFIG_UNUSED_SYMBOLS is not set
 # CONFIG_UPROBES is not set
 # CONFIG_UPROBE_EVENT is not set

diff --git a/target/linux/mvebu/cortexa53/config-default b/target/linux/mvebu/cortexa53/config-default
index 0ee5d3cca63b603e6bb60631778bc89eeaadbd65..4c0ced320d110a36406b9263ea09fceee4b19d63 100644 (file)
--- a/target/linux/mvebu/cortexa53/config-default
+++ b/target/linux/mvebu/cortexa53/config-default
@@ -64,6 +64,7 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_PINCONF=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_PINCONF=y
 CONFIG_GENERIC_TIME_VSYSCALL=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y


@@ -109,4 +110,5 @@ CONFIG_SPI_ARMADA_3700=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_THREAD_INFO_IN_TASK=y

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_VMAP_STACK=y
 CONFIG_VMAP_STACK=y

diff --git a/target/linux/mvebu/cortexa72/config-default b/target/linux/mvebu/cortexa72/config-default
index ba0fd35b568e4203cad82357672f4d0729fe6f8e..3c2b2b04463c0076b446de5935218c968a41dfcb 100644 (file)
--- a/target/linux/mvebu/cortexa72/config-default
+++ b/target/linux/mvebu/cortexa72/config-default
@@ -62,6 +62,7 @@ CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_PINCONF=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_PINCONF=y
 CONFIG_GENERIC_TIME_VSYSCALL=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y


@@ -118,4 +119,5 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_THREAD_INFO_IN_TASK=y

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_VMAP_STACK=y
 CONFIG_VMAP_STACK=y

diff --git a/target/linux/octeontx/config-4.14 b/target/linux/octeontx/config-4.14
index 6e70c9d327479e275692befb5531121cf725ed7a..b2ea99be0a082a64037f9e914e883b9f31b33b93 100644 (file)
--- a/target/linux/octeontx/config-4.14
+++ b/target/linux/octeontx/config-4.14
@@ -253,6 +253,7 @@ CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_THUNDERX=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_GPIO_THUNDERX=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y


@@ -513,6 +514,7 @@ CONFIG_TASK_XACCT=y
 CONFIG_TEE=y
 CONFIG_THIN_ARCHIVES=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_TEE=y
 CONFIG_THIN_ARCHIVES=y
 CONFIG_THREAD_INFO_IN_TASK=y

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_THUNDER_NIC_BGX=y
 CONFIG_THUNDER_NIC_PF=y
 CONFIG_THUNDER_NIC_RGX=y
 CONFIG_THUNDER_NIC_BGX=y
 CONFIG_THUNDER_NIC_PF=y
 CONFIG_THUNDER_NIC_RGX=y

diff --git a/target/linux/sunxi/cortexa53/config-default b/target/linux/sunxi/cortexa53/config-default
index ef67c0ea16caeb100a7c912a93b8a7d1d91dc1eb..2d9dd0191ad4007920c5a42d32bb6a52c4165305 100644 (file)
--- a/target/linux/sunxi/cortexa53/config-default
+++ b/target/linux/sunxi/cortexa53/config-default
@@ -55,6 +55,7 @@ CONFIG_FRAME_POINTER=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_IRQ_MIGRATION=y
 CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
 CONFIG_GENERIC_CSUM=y
 CONFIG_GENERIC_IRQ_MIGRATION=y

+CONFIG_HARDEN_BRANCH_PREDICTOR=y

 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_ARCH_HUGE_VMAP=y
 CONFIG_HAVE_ARCH_KASAN=y


@@ -103,4 +104,5 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_SUN50I_A64_CCU=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_THREAD_INFO_IN_TASK=y

+CONFIG_UNMAP_KERNEL_AT_EL0=y

 CONFIG_VMAP_STACK=y
 CONFIG_VMAP_STACK=y