ANDROID: Disable BTI and enable UNWIND_PATCH_PAC_INTO_SCS for microdroid
Disable CONFIG_ARM64_BTI_KERNEL since significant overhead has been observed on systems that don't have BTI/PAC hardware support due to increased number of NOPs added by these features. BTI is not as important in kernels that have CFI enabled because the protection these features offer overlap. Keep PAC enabled and also enable dynamic SCS (CONFIG_UNWIND_PATCH_PAC_INTO_SCS) which is available starting in v6.2. This removes SCS overhead on systems that support PAC, and PAC overhead on systems that need SCS instead. This feature uses runtime code patching, so it won't have the overhead of additional NOPs. Bug: 267119345 Bug: 431251829 Signed-off-by: Isaac J. Manjarres <isaacmanjarres@google.com> (cherry picked from https://android-review.googlesource.com/q/commit:6688be0f3ddf7c86eabac585885005ff294ed0b0) Merged-In: I8ace99b5edf377e5efd703784dc9e28641ff546e Change-Id: I8ace99b5edf377e5efd703784dc9e28641ff546e
This commit is contained in:
committed by
Android Build Cherrypicker Worker
parent
1827b85a1e
commit
a5cb8a7842
@@ -29,8 +29,10 @@ CONFIG_NR_CPUS=32
|
||||
CONFIG_PARAVIRT_TIME_ACCOUNTING=y
|
||||
CONFIG_KEXEC_FILE=y
|
||||
CONFIG_ARM64_SW_TTBR0_PAN=y
|
||||
# CONFIG_ARM64_BTI_KERNEL is not set
|
||||
CONFIG_RANDOMIZE_BASE=y
|
||||
# CONFIG_RANDOMIZE_MODULE_REGION_FULL is not set
|
||||
CONFIG_UNWIND_PATCH_PAC_INTO_SCS=y
|
||||
CONFIG_CMDLINE="stack_depot_disable=on kasan.stacktrace=off cgroup_disable=pressure ioremap_guard panic=-1 bootconfig"
|
||||
CONFIG_CMDLINE_EXTEND=y
|
||||
# CONFIG_EFI is not set
|
||||
|
||||
Reference in New Issue
Block a user