From cadad290a79d5b0a30add935aaadab7c1b1ef5e9 Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Tue, 26 Nov 2024 02:56:24 +0000 Subject: [PATCH 1/5] Fix the dm-verity Merkle tree caches to not expire so quickly Bug: 335233956 Test: cat /sys/module/dm_bufio/parameters/max_age_seconds Change-Id: I20e4df7dd3eb2ac1f462510e900568e946195faf --- rootdir/init.rc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rootdir/init.rc b/rootdir/init.rc index f00479ece..58f0495e6 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -54,6 +54,10 @@ on early-init mkdir /linkerconfig/bootstrap 0755 mkdir /linkerconfig/default 0755 + # Greatly extend dm-verity's Merkle tree cache timeout. The default timeout + # is much too short and is unnecessary, given that there is also a shrinker. + write /sys/module/dm_bufio/parameters/max_age_seconds 86400 + # Disable dm-verity hash prefetching, since it doesn't help performance # Read more in b/136247322 write /sys/module/dm_verity/parameters/prefetch_cluster 0 From 9731ea7b673edc3a0c914a1bdb3ef81152b61158 Mon Sep 17 00:00:00 2001 From: Eric Lin Date: Tue, 26 Nov 2024 04:24:56 +0000 Subject: [PATCH 2/5] Update comments to point to the new location of event.logtags. event.logtags was moved from system/core/logcat to system/logging/logcat in Android 12 by aosp/1454058. Change-Id: Ia3cedee549145eddb0484ec589a9599a156bea14 BUG: 168791309 Flag: DOCS_ONLY Test: Local build --- libsysutils/EventLogTags.logtags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsysutils/EventLogTags.logtags b/libsysutils/EventLogTags.logtags index 713f8cd6b..bb06d3433 100644 --- a/libsysutils/EventLogTags.logtags +++ b/libsysutils/EventLogTags.logtags @@ -1,4 +1,4 @@ -# See system/core/logcat/event.logtags for a description of the format of this file. +# See system/logging/logcat/event.logtags for a description of the format of this file. # FrameworkListener dispatchCommand overflow 78001 exp_det_dispatchCommand_overflow From f26b13aeb1a9baec66dc592adee82cac626fcf46 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Tue, 26 Nov 2024 00:43:59 +0000 Subject: [PATCH 3/5] libprocessgroup: Remove recovery_available from libcgrouprc ...which no longer appears to be required. Bug: 349105928 Change-Id: I0ad1f44912fdaf98c05b60402c0166c535155775 --- libprocessgroup/cgrouprc/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp index 38b2fa31d..c157d9b18 100644 --- a/libprocessgroup/cgrouprc/Android.bp +++ b/libprocessgroup/cgrouprc/Android.bp @@ -21,7 +21,6 @@ cc_library { host_supported: true, ramdisk_available: true, vendor_ramdisk_available: true, - recovery_available: true, // Do not ever mark this as vendor_available; otherwise, vendor modules // that links to the static library will behave unexpectedly. All on-device // modules should use libprocessgroup which links to the LL-NDK library From 62f8723f6764a3d45a48b772691c1e677e90e259 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Tue, 26 Nov 2024 00:44:41 +0000 Subject: [PATCH 4/5] libprocessgroup: Remove vendor_ramdisk_available from libcgrouprc ...which no longer appears to be required. Bug: 349105928 Change-Id: I9fc71f9cf3238dcc935da63ce1a3b0b69d9cccc1 --- libprocessgroup/cgrouprc/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp index c157d9b18..4007a2344 100644 --- a/libprocessgroup/cgrouprc/Android.bp +++ b/libprocessgroup/cgrouprc/Android.bp @@ -20,7 +20,6 @@ cc_library { name: "libcgrouprc", host_supported: true, ramdisk_available: true, - vendor_ramdisk_available: true, // Do not ever mark this as vendor_available; otherwise, vendor modules // that links to the static library will behave unexpectedly. All on-device // modules should use libprocessgroup which links to the LL-NDK library From 8972ce18d2d8cf1177654c60194083dde00ae617 Mon Sep 17 00:00:00 2001 From: "T.J. Mercier" Date: Tue, 26 Nov 2024 00:44:58 +0000 Subject: [PATCH 5/5] libprocessgroup: Remove ramdisk_available from libcgrouprc ...which no longer appears to be required. Bug: 349105928 Change-Id: I0586f76147d9519ef6a520a10164e1b0f5e5c9b8 --- libprocessgroup/cgrouprc/Android.bp | 1 - 1 file changed, 1 deletion(-) diff --git a/libprocessgroup/cgrouprc/Android.bp b/libprocessgroup/cgrouprc/Android.bp index 4007a2344..9e46b8e7c 100644 --- a/libprocessgroup/cgrouprc/Android.bp +++ b/libprocessgroup/cgrouprc/Android.bp @@ -19,7 +19,6 @@ package { cc_library { name: "libcgrouprc", host_supported: true, - ramdisk_available: true, // Do not ever mark this as vendor_available; otherwise, vendor modules // that links to the static library will behave unexpectedly. All on-device // modules should use libprocessgroup which links to the LL-NDK library