From d6102197ee8e9816963c8993fb3f84e49d035be8 Mon Sep 17 00:00:00 2001 From: Kalesh Singh Date: Wed, 9 Aug 2023 13:26:15 -0700 Subject: [PATCH] CachedAppOptimizer: Remove use of hardcoded PAGE_SIZE 4096 bionic hard codes the PAGE_SIZE macro as 4096. This is going away as Android begins to support larger page sizes. Remove the usage of this assumption from CachedAppOptimizer source; use instead getpagesize() which provides the real pagesize. Test: mma Bug: 295082310 Change-Id: I2adc60ffa38bd23442a08cbd80b68f0158057c5e Signed-off-by: Kalesh Singh --- services/core/jni/com_android_server_am_CachedAppOptimizer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp b/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp index af5718f076d60..9f1113cd4c697 100644 --- a/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp +++ b/services/core/jni/com_android_server_am_CachedAppOptimizer.cpp @@ -224,6 +224,7 @@ public: // process_madvise on failure int madviseVmasFromBatch(unique_fd& pidfd, VmaBatch& batch, int madviseType, uint64_t* outBytesProcessed) { + static const size_t kPageSize = getpagesize(); if (batch.totalVmas == 0 || batch.totalBytes == 0) { // No VMAs in Batch, skip. *outBytesProcessed = 0; @@ -249,7 +250,7 @@ int madviseVmasFromBatch(unique_fd& pidfd, VmaBatch& batch, int madviseType, } else if (bytesProcessedInSend < batch.totalBytes) { // Partially processed the bytes requested // skip last page which is where it failed. - bytesProcessedInSend += PAGE_SIZE; + bytesProcessedInSend += kPageSize; } bytesProcessedInSend = consumeBytes(batch, bytesProcessedInSend);