This is an archive of the discontinued LLVM Phabricator instance.

Differential D114825

tsan: work around malloc reserved address range on macOS 12
Needs ReviewPublic

Authored by cherry on Nov 30 2021, 3:48 PM.

Details

Reviewers
dvyukov
Summary

On macOS 12 a new malloc implementation (nano) is used by default, and apparently it reserves address range 0x600000000000-0x600020000000, which conflicts with the address range that TSAN uses for Go ( https://github.com/golang/go/issues/49138 ). Work around the issue by changing the address range slightly.

NOTE: on LLVM tip a new TSAN runtime (v3) has landed, which also makes the problem go away. But for Go 1.18 release, we may do something less massive. This change is not intended to be landed on LLVM tip, but rather a minimal change based on an old commit of LLVM (which Go currently uses) for Go 1.18.

Diff Detail

Event Timeline

cherry requested review of this revision.Nov 30 2021, 3:48 PM
cherry created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptNov 30 2021, 3:48 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B136787: Diff 390835.Nov 30 2021, 3:48 PM
cherry added a reviewer: dvyukov.Nov 30 2021, 4:16 PM

Dmitry,

As noted above, this is not intended to land on LLVM tip, but for Go 1.18 where we may want to do something less massive. Do you think this change makes sense? Or there is a better address we could use? Thanks!

zchee added a subscriber: zchee.Nov 30 2021, 10:34 PM
dvyukov added a comment.Nov 30 2021, 10:45 PM

This looks fine as a hot fix.

cherry added a comment.Dec 1 2021, 7:39 AM

Thanks!

Revision Contents

PathSize
compiler-rt/
lib/
tsan/
rtl/
20 lines

Diff 390835

compiler-rt/lib/tsan/rtl/tsan_platform.h

Show First 20 Lines • Show All 358 Lines • ▼ Show 20 Lines
/* Go on linux, darwin and freebsd on x86_64 /* Go on linux, darwin and freebsd on x86_64
0000 0000 1000 - 0000 1000 0000: executable 0000 0000 1000 - 0000 1000 0000: executable
0000 1000 0000 - 00c0 0000 0000: - 0000 1000 0000 - 00c0 0000 0000: -
00c0 0000 0000 - 00e0 0000 0000: heap 00c0 0000 0000 - 00e0 0000 0000: heap
00e0 0000 0000 - 2000 0000 0000: - 00e0 0000 0000 - 2000 0000 0000: -
2000 0000 0000 - 2380 0000 0000: shadow 2000 0000 0000 - 2380 0000 0000: shadow
2380 0000 0000 - 3000 0000 0000: - 2380 0000 0000 - 3000 0000 0000: -
3000 0000 0000 - 4000 0000 0000: metainfo (memory blocks and sync objects) 3000 0000 0000 - 4000 0000 0000: metainfo (memory blocks and sync objects)
4000 0000 0000 - 6000 0000 0000: - 4000 0000 0000 - 6200 0000 0000: -
6000 0000 0000 - 6200 0000 0000: traces 6200 0000 0000 - 6400 0000 0000: traces
6200 0000 0000 - 8000 0000 0000: - 6400 0000 0000 - 8000 0000 0000: -
*/ */
struct Mapping { struct Mapping {
static const uptr kMetaShadowBeg = 0x300000000000ull; static const uptr kMetaShadowBeg = 0x300000000000ull;
static const uptr kMetaShadowEnd = 0x400000000000ull; static const uptr kMetaShadowEnd = 0x400000000000ull;
static const uptr kTraceMemBeg = 0x600000000000ull; static const uptr kTraceMemBeg = 0x620000000000ull;
static const uptr kTraceMemEnd = 0x620000000000ull; static const uptr kTraceMemEnd = 0x640000000000ull;
static const uptr kShadowBeg = 0x200000000000ull; static const uptr kShadowBeg = 0x200000000000ull;
static const uptr kShadowEnd = 0x238000000000ull; static const uptr kShadowEnd = 0x238000000000ull;
static const uptr kAppMemBeg = 0x000000001000ull; static const uptr kAppMemBeg = 0x000000001000ull;
static const uptr kAppMemEnd = 0x00e000000000ull; static const uptr kAppMemEnd = 0x00e000000000ull;
}; };
#elif SANITIZER_GO && SANITIZER_WINDOWS #elif SANITIZER_GO && SANITIZER_WINDOWS
▲ Show 20 Lines • Show All 79 Lines • ▼ Show 20 Lines
/* Go on linux/aarch64 (48-bit VMA) and darwin/aarch64 (47-bit VMA) /* Go on linux/aarch64 (48-bit VMA) and darwin/aarch64 (47-bit VMA)
0000 0000 1000 - 0000 1000 0000: executable 0000 0000 1000 - 0000 1000 0000: executable
0000 1000 0000 - 00c0 0000 0000: - 0000 1000 0000 - 00c0 0000 0000: -
00c0 0000 0000 - 00e0 0000 0000: heap 00c0 0000 0000 - 00e0 0000 0000: heap
00e0 0000 0000 - 2000 0000 0000: - 00e0 0000 0000 - 2000 0000 0000: -
2000 0000 0000 - 3000 0000 0000: shadow 2000 0000 0000 - 3000 0000 0000: shadow
3000 0000 0000 - 3000 0000 0000: - 3000 0000 0000 - 3000 0000 0000: -
3000 0000 0000 - 4000 0000 0000: metainfo (memory blocks and sync objects) 3000 0000 0000 - 4000 0000 0000: metainfo (memory blocks and sync objects)
4000 0000 0000 - 6000 0000 0000: - 4000 0000 0000 - 6200 0000 0000: -
6000 0000 0000 - 6200 0000 0000: traces 6200 0000 0000 - 6400 0000 0000: traces
6200 0000 0000 - 8000 0000 0000: - 6400 0000 0000 - 8000 0000 0000: -
*/ */
struct Mapping { struct Mapping {
static const uptr kMetaShadowBeg = 0x300000000000ull; static const uptr kMetaShadowBeg = 0x300000000000ull;
static const uptr kMetaShadowEnd = 0x400000000000ull; static const uptr kMetaShadowEnd = 0x400000000000ull;
static const uptr kTraceMemBeg = 0x600000000000ull; static const uptr kTraceMemBeg = 0x620000000000ull;
static const uptr kTraceMemEnd = 0x620000000000ull; static const uptr kTraceMemEnd = 0x640000000000ull;
static const uptr kShadowBeg = 0x200000000000ull; static const uptr kShadowBeg = 0x200000000000ull;
static const uptr kShadowEnd = 0x300000000000ull; static const uptr kShadowEnd = 0x300000000000ull;
static const uptr kAppMemBeg = 0x000000001000ull; static const uptr kAppMemBeg = 0x000000001000ull;
static const uptr kAppMemEnd = 0x00e000000000ull; static const uptr kAppMemEnd = 0x00e000000000ull;
}; };
// Indicates the runtime will define the memory regions at runtime. // Indicates the runtime will define the memory regions at runtime.
#define TSAN_RUNTIME_VMA 1 #define TSAN_RUNTIME_VMA 1
▲ Show 20 Lines • Show All 563 Lines • Show Last 20 Lines