diff options
| author | Steven Moreland <smoreland@google.com> | 2024-03-20 23:53:47 +0000 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2024-03-20 23:53:47 +0000 |
| commit | b475ad86c497882f2bd9e51649e2bbbb485e61bf (patch) | |
| tree | 42c48bc6a63ab1b0fab8601baea819a5644ef40a | |
| parent | 6088e3dc07d903ec3a447b385a341807e1a96b4a (diff) | |
| download | kernel-b475ad86c497882f2bd9e51649e2bbbb485e61bf.tar.gz | |
Vts16KPageSizeTest: require 16kB align, not 64kB
Reduce requirement because it turns out that 64kB
has a larger impact on the page table size and page
caching than anticipated, exacerbated by use of
`-z separate-loadable-segments` instead of
`-z separate-code` which caused many small segments to
increase in size in Android.
Bug: 328797737
Test: Vts16KPageSizeTest
Change-Id: I6451ab8da40e5c08a661c56e5bf9d28d9f4e61d3
| -rw-r--r-- | pagesize_16kb/Vts16KPageSizeTest.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pagesize_16kb/Vts16KPageSizeTest.cpp b/pagesize_16kb/Vts16KPageSizeTest.cpp index 4a56ea67..b14d76f6 100644 --- a/pagesize_16kb/Vts16KPageSizeTest.cpp +++ b/pagesize_16kb/Vts16KPageSizeTest.cpp @@ -69,7 +69,7 @@ class Vts16KPageSizeTest : public ::testing::Test { if (mArch == "x86_64") { return 4096; } else if (mArch == "arm64" || mArch == "aarch64") { - return 65536; + return 16384; } else { return -1; } @@ -92,6 +92,7 @@ TEST_F(Vts16KPageSizeTest, InitMaxPageSizeTest) { ssize_t initMaxPageSize = MaxPageSize(initPath); ASSERT_NE(initMaxPageSize, -1) << "Failed to get max page size of ELF: " << initPath; - ASSERT_EQ(initMaxPageSize, expectedMaxPageSize) - << "ELF " << initPath << " was not built with the required max-page-size"; + ASSERT_EQ(initMaxPageSize % expectedMaxPageSize, 0) + << "ELF " << initPath << " with page size " << initMaxPageSize + << " was not built with the required max-page-size " << expectedMaxPageSize; } |