This is an archive of the discontinued LLVM Phabricator instance.

Differential D125758

[msan] Add the FreeBSD AArch64 memory layout
ClosedPublic

Authored by andrew on May 17 2022, 3:30 AM.

Details

Reviewers
vitalybuka
Group Reviewers
Restricted Project
Commits
rG1b2fa907d737: Add the FreeBSD AArch64 memory layout
Summary

Use the FreeBSD AArch64 memory layout values when building for it.
These are based on the x86_64 values, scaled to take into account the
larger address space on AArch64.

Diff Detail

Event Timeline

andrew created this revision.May 17 2022, 3:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2022, 3:30 AM
Herald added subscribers: kristof.beyls, krytarowski. · View Herald Transcript
andrew requested review of this revision.May 17 2022, 3:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 17 2022, 3:30 AM
andrew mentioned this in D74765: [compiler-rt] Addd FreeBSD arm64 sanitizer support.May 17 2022, 3:32 AM
andrew added a parent revision: D125756: [sanitizer] Add the common FreeBSD AArch64 support.May 17 2022, 3:42 AM
Harbormaster completed remote builds in B164835: Diff 429988.May 17 2022, 3:51 AM
andrew edited the summary of this revision. (Show Details)May 18 2022, 6:26 AM
Herald added subscribers: pengfei, arichardson. · View Herald TranscriptMay 18 2022, 6:26 AM
andrew added a child revision: D125883: [msan] Add the FreeBSD AArch64 memory layout.May 18 2022, 6:30 AM
andrew added a reviewer: vitalybuka.Jun 9 2022, 4:27 AM
Herald added subscribers: jsji, Enna1. · View Herald TranscriptJun 9 2022, 4:27 AM
vitalybuka accepted this revision.Jul 11 2022, 11:38 AM
This revision is now accepted and ready to land.Jul 11 2022, 11:38 AM
andrew mentioned this in D130063: [Driver] Enable sanitizers on FreeBSD AArch64.Jul 19 2022, 2:14 AM
This revision was landed with ongoing or failed builds.Jul 19 2022, 6:59 AM
Closed by commit rG1b2fa907d737: Add the FreeBSD AArch64 memory layout (authored by andrew, committed by emaste). · Explain Why
This revision was automatically updated to reflect the committed changes.
emaste added a commit: rG1b2fa907d737: Add the FreeBSD AArch64 memory layout.
MaskRay mentioned this in rG92df59c83d0d: [Driver] Enable some sanitizers on FreeBSD AArch64.Jul 24 2022, 10:41 AM

Revision Contents

PathSize
compiler-rt/
lib/
msan/
21 lines

Diff 445804

compiler-rt/lib/msan/msan.h

Show First 20 Lines • Show All 189 Lines • ▼ Show 20 Linesconst MappingDesc kMemoryLayout[] = {
{0x1C0000000000ULL, 0x2C0000000000ULL, MappingDesc::ORIGIN, "origin"}, {0x1C0000000000ULL, 0x2C0000000000ULL, MappingDesc::ORIGIN, "origin"},
{0x2C0000000000ULL, 0x440000000000ULL, MappingDesc::INVALID, "invalid"}, {0x2C0000000000ULL, 0x440000000000ULL, MappingDesc::INVALID, "invalid"},
{0x440000000000ULL, 0x500000000000ULL, MappingDesc::APP, "high memory"}}; {0x440000000000ULL, 0x500000000000ULL, MappingDesc::APP, "high memory"}};
#define MEM_TO_SHADOW(mem) \ #define MEM_TO_SHADOW(mem) \
((((uptr)(mem)) & ~0xC00000000000ULL) + 0x080000000000ULL) ((((uptr)(mem)) & ~0xC00000000000ULL) + 0x080000000000ULL)
#define SHADOW_TO_ORIGIN(shadow) (((uptr)(shadow)) + 0x140000000000ULL) #define SHADOW_TO_ORIGIN(shadow) (((uptr)(shadow)) + 0x140000000000ULL)
#elif SANITIZER_FREEBSD && defined(__aarch64__)
// Low memory: main binary, MAP_32BIT mappings and modules
// High memory: heap, modules and main thread stack
const MappingDesc kMemoryLayout[] = {
{0x000000000000ULL, 0x020000000000ULL, MappingDesc::APP, "low memory"},
{0x020000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"},
{0x200000000000ULL, 0x620000000000ULL, MappingDesc::SHADOW, "shadow"},
{0x620000000000ULL, 0x700000000000ULL, MappingDesc::INVALID, "invalid"},
{0x700000000000ULL, 0xb20000000000ULL, MappingDesc::ORIGIN, "origin"},
{0xb20000000000ULL, 0xc00000000000ULL, MappingDesc::INVALID, "invalid"},
{0xc00000000000ULL, 0x1000000000000ULL, MappingDesc::APP, "high memory"}};
// Maps low and high app ranges to contiguous space with zero base:
// Low: 0000 0000 0000 - 01ff ffff ffff -> 4000 0000 0000 - 41ff ffff ffff
// High: c000 0000 0000 - ffff ffff ffff -> 0000 0000 0000 - 3fff ffff ffff
#define LINEARIZE_MEM(mem) \
(((uptr)(mem) & ~0x1800000000000ULL) ^ 0x400000000000ULL)
#define MEM_TO_SHADOW(mem) (LINEARIZE_MEM((mem)) + 0x200000000000ULL)
#define SHADOW_TO_ORIGIN(shadow) (((uptr)(shadow)) + 0x500000000000)
#elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64 #elif SANITIZER_FREEBSD && SANITIZER_WORDSIZE == 64
// Low memory: main binary, MAP_32BIT mappings and modules // Low memory: main binary, MAP_32BIT mappings and modules
// High memory: heap, modules and main thread stack // High memory: heap, modules and main thread stack
const MappingDesc kMemoryLayout[] = { const MappingDesc kMemoryLayout[] = {
{0x000000000000ULL, 0x010000000000ULL, MappingDesc::APP, "low memory"}, {0x000000000000ULL, 0x010000000000ULL, MappingDesc::APP, "low memory"},
{0x010000000000ULL, 0x100000000000ULL, MappingDesc::INVALID, "invalid"}, {0x010000000000ULL, 0x100000000000ULL, MappingDesc::INVALID, "invalid"},
{0x100000000000ULL, 0x310000000000ULL, MappingDesc::SHADOW, "shadow"}, {0x100000000000ULL, 0x310000000000ULL, MappingDesc::SHADOW, "shadow"},
▲ Show 20 Lines • Show All 173 Lines • Show Last 20 Lines