This is an archive of the discontinued LLVM Phabricator instance.

Differential D152964

Revert "[scudo] Temporariy dispatch region from `RegionBeg`"
ClosedPublic

Authored by Chia-hungDuan on Jun 14 2023, 2:31 PM.

Details

Reviewers
cferris
fabio-d
Commits
rG163f8e1b01a3: Revert "[scudo] Temporariy dispatch region from `RegionBeg`"
Summary

This reverts commit 9d9a7732e14d7d4c0db7b46d6ebe588e8f43b951.

This was a workaround for some platform and it has been fixed in
bfa02523b2e7ed66368ea61866a474e55ef354a3

Diff Detail

Event Timeline

Chia-hungDuan created this revision.Jun 14 2023, 2:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 2:31 PM
Herald added subscribers: yaneury, Enna1. · View Herald Transcript
Chia-hungDuan requested review of this revision.Jun 14 2023, 2:31 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 14 2023, 2:31 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
cferris accepted this revision.Jun 14 2023, 2:33 PM

LGTM

This revision is now accepted and ready to land.Jun 14 2023, 2:33 PM
fabio-d accepted this revision.Jun 14 2023, 2:35 PM
fabio-d added a subscriber: fabio-d.

Thanks!

This revision was landed with ongoing or failed builds.Jun 14 2023, 2:50 PM
Closed by commit rG163f8e1b01a3: Revert "[scudo] Temporariy dispatch region from `RegionBeg`" (authored by Chia-hungDuan). · Explain Why
This revision was automatically updated to reflect the committed changes.
Chia-hungDuan added a commit: rG163f8e1b01a3: Revert "[scudo] Temporariy dispatch region from `RegionBeg`".
Harbormaster completed remote builds in B238952: Diff 531517.Jun 14 2023, 3:03 PM

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
10 lines

Diff 531525

compiler-rt/lib/scudo/standalone/primary64.h

Show First 20 Lines • Show All 750 Lines • ▼ Show 20 Lines if (TotalUserBytes > MappedUser) {
roundUp(TotalUserBytes - MappedUser, MapSizeIncrement); roundUp(TotalUserBytes - MappedUser, MapSizeIncrement);
const uptr RegionBase = RegionBeg - getRegionBaseByClassId(ClassId); const uptr RegionBase = RegionBeg - getRegionBaseByClassId(ClassId);
if (UNLIKELY(RegionBase + MappedUser + MapSize > RegionSize)) { if (UNLIKELY(RegionBase + MappedUser + MapSize > RegionSize)) {
Region->Exhausted = true; Region->Exhausted = true;
return false; return false;
} }
// TODO: Consider allocating MemMap in init(). // TODO: Consider allocating MemMap in init().
if (!Region->MemMap.isAllocated()) { if (!Region->MemMap.isAllocated()) {
// TODO: Ideally, a region should reserve RegionSize because the memory Region->MemMap = ReservedMemory.dispatch(
// between `RegionBeg` and region base is still belong to a region and getRegionBaseByClassId(ClassId), RegionSize);
// it's just not used. In order to make it work on every platform (some
// of them don't support `remap()` across the unused range), dispatch
// from `RegionBeg` for now.
const uptr ReserveSize =
RegionSize - (RegionBeg - getRegionBaseByClassId(ClassId));
Region->MemMap = ReservedMemory.dispatch(RegionBeg, ReserveSize);
} }
DCHECK(Region->MemMap.isAllocated()); DCHECK(Region->MemMap.isAllocated());
if (UNLIKELY(!Region->MemMap.remap( if (UNLIKELY(!Region->MemMap.remap(
RegionBeg + MappedUser, MapSize, "scudo:primary", RegionBeg + MappedUser, MapSize, "scudo:primary",
MAP_ALLOWNOMEM | MAP_RESIZABLE | MAP_ALLOWNOMEM | MAP_RESIZABLE |
(useMemoryTagging<Config>(Options.load()) ? MAP_MEMTAG (useMemoryTagging<Config>(Options.load()) ? MAP_MEMTAG
: 0)))) { : 0)))) {
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines