diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-26 23:12:52 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-08-26 23:12:52 +0000 |
commit | ac408cf4ed643f09097ca4b38bfd4141233682c3 (patch) | |
tree | c8df1e08210befab8ebf0bccd3aaec6089579594 | |
parent | 2861b08ff440e3180307bad40ffbe29ab78ff412 (diff) | |
parent | 9ae674f6f6964dbd4d261beda92755735f7b6d8a (diff) | |
download | platform_external_scudo-ac408cf4ed643f09097ca4b38bfd4141233682c3.tar.gz platform_external_scudo-ac408cf4ed643f09097ca4b38bfd4141233682c3.tar.bz2 platform_external_scudo-ac408cf4ed643f09097ca4b38bfd4141233682c3.zip |
Snap for 6793271 from 9ae674f6f6964dbd4d261beda92755735f7b6d8a to rvc-qpr1-releaseandroid-11.0.0_r31android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-release
Change-Id: I779b355240fc215f78f5eac75c417d8b2741cf7c
-rw-r--r-- | standalone/primary32.h | 5 | ||||
-rw-r--r-- | standalone/primary64.h | 4 | ||||
-rw-r--r-- | standalone/release.h | 20 | ||||
-rw-r--r-- | standalone/tests/release_test.cpp | 3 |
4 files changed, 26 insertions, 6 deletions
diff --git a/standalone/primary32.h b/standalone/primary32.h index 61752e14f66..1629f7925a4 100644 --- a/standalone/primary32.h +++ b/standalone/primary32.h @@ -474,12 +474,15 @@ private: } } uptr TotalReleasedBytes = 0; + auto SkipRegion = [this, First, ClassId](uptr RegionIndex) { + return (PossibleRegions[First + RegionIndex] - 1U) != ClassId; + }; if (First != 0U && Last != 0U) { const uptr Base = First * RegionSize; const uptr NumberOfRegions = Last - First + 1U; ReleaseRecorder Recorder(Base); releaseFreeMemoryToOS(Sci->FreeList, Base, RegionSize, NumberOfRegions, - BlockSize, &Recorder); + BlockSize, &Recorder, SkipRegion); if (Recorder.getReleasedRangesCount() > 0) { Sci->ReleaseInfo.PushedBlocksAtLastRelease = Sci->Stats.PushedBlocks; Sci->ReleaseInfo.RangesReleased += Recorder.getReleasedRangesCount(); diff --git a/standalone/primary64.h b/standalone/primary64.h index 2e28ed6189f..7da1832dfc3 100644 --- a/standalone/primary64.h +++ b/standalone/primary64.h @@ -425,9 +425,11 @@ private: } } + auto SkipRegion = [](UNUSED uptr RegionIndex) { return false; }; ReleaseRecorder Recorder(Region->RegionBeg, &Region->Data); releaseFreeMemoryToOS(Region->FreeList, Region->RegionBeg, - Region->AllocatedUser, 1U, BlockSize, &Recorder); + Region->AllocatedUser, 1U, BlockSize, &Recorder, + SkipRegion); if (Recorder.getReleasedRangesCount() > 0) { Region->ReleaseInfo.PushedBlocksAtLastRelease = diff --git a/standalone/release.h b/standalone/release.h index b50f36fa0c0..ff4346f32cc 100644 --- a/standalone/release.h +++ b/standalone/release.h @@ -157,6 +157,11 @@ public: CurrentPage++; } + void skipPages(uptr N) { + closeOpenedRange(); + CurrentPage += N; + } + void finish() { closeOpenedRange(); } private: @@ -175,11 +180,11 @@ private: uptr CurrentRangeStatePage = 0; }; -template <class TransferBatchT, class ReleaseRecorderT> +template <class TransferBatchT, class ReleaseRecorderT, typename SkipRegionT> NOINLINE void releaseFreeMemoryToOS(const IntrusiveList<TransferBatchT> &FreeList, uptr Base, uptr RegionSize, uptr NumberOfRegions, uptr BlockSize, - ReleaseRecorderT *Recorder) { + ReleaseRecorderT *Recorder, SkipRegionT SkipRegion) { const uptr PageSize = getPageSizeCached(); // Figure out the number of chunks per page and whether we can take a fast @@ -271,10 +276,15 @@ releaseFreeMemoryToOS(const IntrusiveList<TransferBatchT> &FreeList, uptr Base, FreePagesRangeTracker<ReleaseRecorderT> RangeTracker(Recorder); if (SameBlockCountPerPage) { // Fast path, every page has the same number of chunks affecting it. - for (uptr I = 0; I < NumberOfRegions; I++) + for (uptr I = 0; I < NumberOfRegions; I++) { + if (SkipRegion(I)) { + RangeTracker.skipPages(PagesCount); + continue; + } for (uptr J = 0; J < PagesCount; J++) RangeTracker.processNextPage(Counters.get(I, J) == FullPagesBlockCountMax); + } } else { // Slow path, go through the pages keeping count how many chunks affect // each page. @@ -286,6 +296,10 @@ releaseFreeMemoryToOS(const IntrusiveList<TransferBatchT> &FreeList, uptr Base, // up the number of chunks on the current page and checking on every step // whether the page boundary was crossed. for (uptr I = 0; I < NumberOfRegions; I++) { + if (SkipRegion(I)) { + RangeTracker.skipPages(PagesCount); + continue; + } uptr PrevPageBoundary = 0; uptr CurrentBoundary = 0; for (uptr J = 0; J < PagesCount; J++) { diff --git a/standalone/tests/release_test.cpp b/standalone/tests/release_test.cpp index 8907520d30c..779b5d733e8 100644 --- a/standalone/tests/release_test.cpp +++ b/standalone/tests/release_test.cpp @@ -189,9 +189,10 @@ template <class SizeClassMap> void testReleaseFreeMemoryToOS() { } // Release the memory. + auto SkipRegion = [](UNUSED scudo::uptr RegionIndex) { return false; }; ReleasedPagesRecorder Recorder; releaseFreeMemoryToOS(FreeList, 0, MaxBlocks * BlockSize, 1U, BlockSize, - &Recorder); + &Recorder, SkipRegion); // Verify that there are no released pages touched by used chunks and all // ranges of free chunks big enough to contain the entire memory pages had |