From ec37ba835961d3a7e3570d5f15eaf6a7c1310fc4 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Tue, 3 Aug 2021 07:47:40 +0000 Subject: [PATCH] Restrict creation of bootreceiver tracing instance to 64-bit systems. The main users of this instance are KFENCE and MTE-aided KASAN, which are only supported on arm64. Skip creation of this tracing instance on 32-bit systems to save ~6Mb memory on low-end devices. Bug: 195089948 Bug: 194719088 Bug: 194156700 Change-Id: Icaf762715fed7a282b1ad738c10bcb45dc848f4d --- rootdir/init.rc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rootdir/init.rc b/rootdir/init.rc index a7322faff..ab0aff5dc 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -591,9 +591,10 @@ on late-fs # Load trusted keys from dm-verity protected partitions exec -- /system/bin/fsverity_init --load-verified-keys +on late-fs && property:ro.product.cpu.abilist64=* # Set up a tracing instance for system_server to monitor error_report_end events. # These are sent by kernel tools like KASAN and KFENCE when a memory corruption - # is detected. + # is detected. This is only needed for 64-bit systems. mkdir /sys/kernel/tracing/instances/bootreceiver 0700 system system restorecon_recursive /sys/kernel/tracing/instances/bootreceiver write /sys/kernel/tracing/instances/bootreceiver/buffer_size_kb 1