This is an archive of the discontinued LLVM Phabricator instance.

Differential D126825

[compiler-rt][lsan] Choose lsan allocator via SANITIZER_CAN_USE_ALLOCATOR64
ClosedPublic

Authored by leonardchan on Jun 1 2022, 2:10 PM.

Details

Reviewers
vitalybuka
Commits
rG4b15e665f8d9: [compiler-rt][lsan] Choose lsan allocator via SANITIZER_CAN_USE_ALLOCATOR64
Summary

Rather than checking a bunch of individual platforms.

Diff Detail

Event Timeline

leonardchan created this revision.Jun 1 2022, 2:10 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2022, 2:10 PM
Herald added subscribers: Enna1, luke957, s.egerton and 2 others. · View Herald Transcript
leonardchan requested review of this revision.Jun 1 2022, 2:10 PM
Herald added subscribers: Restricted Project, • pcwang-thead. · View Herald TranscriptJun 1 2022, 2:10 PM
leonardchan mentioned this in D123822: [compiler-rt][lsan] Share platform allocator settings between ASan and LSan.Jun 1 2022, 2:11 PM
leonardchan updated this revision to Diff 433545.Jun 1 2022, 2:14 PM
Harbormaster completed remote builds in B167365: Diff 433545.Jun 1 2022, 2:31 PM
leonardchan added a comment.Jun 7 2022, 4:46 PM

*ping*

vitalybuka accepted this revision.Jun 7 2022, 5:03 PM
This revision is now accepted and ready to land.Jun 7 2022, 5:03 PM
This revision was landed with ongoing or failed builds.Jun 7 2022, 5:24 PM
Closed by commit rG4b15e665f8d9: [compiler-rt][lsan] Choose lsan allocator via SANITIZER_CAN_USE_ALLOCATOR64 (authored by leonardchan). · Explain Why
This revision was automatically updated to reflect the committed changes.
leonardchan added a commit: rG4b15e665f8d9: [compiler-rt][lsan] Choose lsan allocator via SANITIZER_CAN_USE_ALLOCATOR64.
kito-cheng mentioned this in D139823: [RFC][RISCV][sanitizer] Enable AP64 for RISCV64.Dec 12 2022, 2:36 AM

Revision Contents

PathSize
compiler-rt/
lib/
lsan/
5 lines
sanitizer_common/
3 lines

Diff 435003

compiler-rt/lib/lsan/lsan_allocator.h

Show First 20 Lines • Show All 43 Lines • ▼ Show 20 Lines#if SANITIZER_WORDSIZE == 64
uptr requested_size : 54; uptr requested_size : 54;
#else #else
uptr requested_size : 32; uptr requested_size : 32;
uptr padding : 22; uptr padding : 22;
#endif #endif
u32 stack_trace_id; u32 stack_trace_id;
}; };
#if defined(__mips64) || defined(__aarch64__) || defined(__i386__) || \ #if !SANITIZER_CAN_USE_ALLOCATOR64
defined(__arm__) || SANITIZER_RISCV64 || defined(__hexagon__)
template <typename AddressSpaceViewTy> template <typename AddressSpaceViewTy>
struct AP32 { struct AP32 {
static const uptr kSpaceBeg = 0; static const uptr kSpaceBeg = 0;
static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE; static const u64 kSpaceSize = SANITIZER_MMAP_RANGE_SIZE;
static const uptr kMetadataSize = sizeof(ChunkMetadata); static const uptr kMetadataSize = sizeof(ChunkMetadata);
typedef __sanitizer::CompactSizeClassMap SizeClassMap; typedef __sanitizer::CompactSizeClassMap SizeClassMap;
static const uptr kRegionSizeLog = 20; static const uptr kRegionSizeLog = 20;
using AddressSpaceView = AddressSpaceViewTy; using AddressSpaceView = AddressSpaceViewTy;
typedef NoOpMapUnmapCallback MapUnmapCallback; typedef NoOpMapUnmapCallback MapUnmapCallback;
static const uptr kFlags = 0; static const uptr kFlags = 0;
}; };
template <typename AddressSpaceView> template <typename AddressSpaceView>
using PrimaryAllocatorASVT = SizeClassAllocator32<AP32<AddressSpaceView>>; using PrimaryAllocatorASVT = SizeClassAllocator32<AP32<AddressSpaceView>>;
using PrimaryAllocator = PrimaryAllocatorASVT<LocalAddressSpaceView>; using PrimaryAllocator = PrimaryAllocatorASVT<LocalAddressSpaceView>;
#elif defined(__x86_64__) || defined(__powerpc64__) || defined(__s390x__) #else
# if SANITIZER_FUCHSIA || defined(__powerpc64__) # if SANITIZER_FUCHSIA || defined(__powerpc64__)
const uptr kAllocatorSpace = ~(uptr)0; const uptr kAllocatorSpace = ~(uptr)0;
const uptr kAllocatorSize = 0x40000000000ULL; // 4T. const uptr kAllocatorSize = 0x40000000000ULL; // 4T.
#elif defined(__s390x__) #elif defined(__s390x__)
const uptr kAllocatorSpace = 0x40000000000ULL; const uptr kAllocatorSpace = 0x40000000000ULL;
const uptr kAllocatorSize = 0x40000000000ULL; // 4T. const uptr kAllocatorSize = 0x40000000000ULL; // 4T.
# else # else
const uptr kAllocatorSpace = 0x600000000000ULL; const uptr kAllocatorSpace = 0x600000000000ULL;
▲ Show 20 Lines • Show All 42 Lines • Show Last 20 Lines

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

Show First 20 Lines • Show All 279 Lines • ▼ Show 20 Lines
// By default we allow to use SizeClassAllocator64 on 64-bit platform. // By default we allow to use SizeClassAllocator64 on 64-bit platform.
// But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64 // But in some cases (e.g. AArch64's 39-bit address space) SizeClassAllocator64
// does not work well and we need to fallback to SizeClassAllocator32. // does not work well and we need to fallback to SizeClassAllocator32.
// For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or // For such platforms build this code with -DSANITIZER_CAN_USE_ALLOCATOR64=0 or
// change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here. // change the definition of SANITIZER_CAN_USE_ALLOCATOR64 here.
#ifndef SANITIZER_CAN_USE_ALLOCATOR64 #ifndef SANITIZER_CAN_USE_ALLOCATOR64
# if (SANITIZER_ANDROID && defined(__aarch64__)) || SANITIZER_FUCHSIA # if (SANITIZER_ANDROID && defined(__aarch64__)) || SANITIZER_FUCHSIA
# define SANITIZER_CAN_USE_ALLOCATOR64 1 # define SANITIZER_CAN_USE_ALLOCATOR64 1
# elif defined(__mips64) || defined(__aarch64__) # elif defined(__mips64) || defined(__aarch64__) || defined(__i386__) || \
defined(__arm__) || SANITIZER_RISCV64 || defined(__hexagon__)
# define SANITIZER_CAN_USE_ALLOCATOR64 0 # define SANITIZER_CAN_USE_ALLOCATOR64 0
# else # else
# define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64) # define SANITIZER_CAN_USE_ALLOCATOR64 (SANITIZER_WORDSIZE == 64)
# endif # endif
#endif #endif
// The range of addresses which can be returned my mmap. // The range of addresses which can be returned my mmap.
// FIXME: this value should be different on different platforms. Larger values // FIXME: this value should be different on different platforms. Larger values
▲ Show 20 Lines • Show All 151 Lines • Show Last 20 Lines