This is an archive of the discontinued LLVM Phabricator instance.

Differential D125883

[msan] Add the FreeBSD AArch64 memory layout
ClosedPublic

Authored by andrew on May 18 2022, 6:30 AM.

Details

Reviewers
vitalybuka
Group Reviewers
Restricted Project
Commits
rGb850762b62f2: 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 18 2022, 6:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 18 2022, 6:30 AM
Herald added subscribers: pengfei, hiraditya, kristof.beyls and 2 others. · View Herald Transcript
andrew requested review of this revision.May 18 2022, 6:30 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 18 2022, 6:30 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
andrew added a parent revision: D125758: [msan] Add the FreeBSD AArch64 memory layout.May 18 2022, 6:30 AM
Harbormaster completed remote builds in B165106: Diff 430356.May 18 2022, 7:04 AM
andrew added a reviewer: vitalybuka.Jun 9 2022, 4:28 AM
Herald added subscribers: jsji, Enna1. · View Herald TranscriptJun 9 2022, 4:28 AM
vitalybuka accepted this revision.Jul 11 2022, 11:37 AM
This revision is now accepted and ready to land.Jul 11 2022, 11:37 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 rGb850762b62f2: 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: rGb850762b62f2: 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
llvm/
lib/
Transforms/
Instrumentation/
16 lines

Diff 445806

llvm/lib/Transforms/Instrumentation/MemorySanitizer.cpp

Show First 20 Lines • Show All 411 Lines • ▼ Show 20 Lines
// aarch64 Linux // aarch64 Linux
static const MemoryMapParams Linux_AArch64_MemoryMapParams = { static const MemoryMapParams Linux_AArch64_MemoryMapParams = {
0, // AndMask (not used) 0, // AndMask (not used)
0x06000000000, // XorMask 0x06000000000, // XorMask
0, // ShadowBase (not used) 0, // ShadowBase (not used)
0x01000000000, // OriginBase 0x01000000000, // OriginBase
}; };
// aarch64 FreeBSD
static const MemoryMapParams FreeBSD_AArch64_MemoryMapParams = {
0x1800000000000, // AndMask
0x0400000000000, // XorMask
0x0200000000000, // ShadowBase
0x0700000000000, // OriginBase
};
// i386 FreeBSD // i386 FreeBSD
static const MemoryMapParams FreeBSD_I386_MemoryMapParams = { static const MemoryMapParams FreeBSD_I386_MemoryMapParams = {
0x000180000000, // AndMask 0x000180000000, // AndMask
0x000040000000, // XorMask 0x000040000000, // XorMask
0x000020000000, // ShadowBase 0x000020000000, // ShadowBase
0x000700000000, // OriginBase 0x000700000000, // OriginBase
}; };
Show All 33 Linesstatic const PlatformMemoryMapParams Linux_S390_MemoryMapParams = {
&Linux_S390X_MemoryMapParams, &Linux_S390X_MemoryMapParams,
}; };
static const PlatformMemoryMapParams Linux_ARM_MemoryMapParams = { static const PlatformMemoryMapParams Linux_ARM_MemoryMapParams = {
nullptr, nullptr,
&Linux_AArch64_MemoryMapParams, &Linux_AArch64_MemoryMapParams,
}; };
static const PlatformMemoryMapParams FreeBSD_ARM_MemoryMapParams = {
nullptr,
&FreeBSD_AArch64_MemoryMapParams,
};
static const PlatformMemoryMapParams FreeBSD_X86_MemoryMapParams = { static const PlatformMemoryMapParams FreeBSD_X86_MemoryMapParams = {
&FreeBSD_I386_MemoryMapParams, &FreeBSD_I386_MemoryMapParams,
&FreeBSD_X86_64_MemoryMapParams, &FreeBSD_X86_64_MemoryMapParams,
}; };
static const PlatformMemoryMapParams NetBSD_X86_MemoryMapParams = { static const PlatformMemoryMapParams NetBSD_X86_MemoryMapParams = {
nullptr, nullptr,
&NetBSD_X86_64_MemoryMapParams, &NetBSD_X86_64_MemoryMapParams,
▲ Show 20 Lines • Show All 412 Lines • ▼ Show 20 Lines if (ShadowPassed || OriginPassed) {
CustomMapParams.ShadowBase = ClShadowBase; CustomMapParams.ShadowBase = ClShadowBase;
CustomMapParams.OriginBase = ClOriginBase; CustomMapParams.OriginBase = ClOriginBase;
MapParams = &CustomMapParams; MapParams = &CustomMapParams;
} else { } else {
Triple TargetTriple(M.getTargetTriple()); Triple TargetTriple(M.getTargetTriple());
switch (TargetTriple.getOS()) { switch (TargetTriple.getOS()) {
case Triple::FreeBSD: case Triple::FreeBSD:
switch (TargetTriple.getArch()) { switch (TargetTriple.getArch()) {
case Triple::aarch64:
MapParams = FreeBSD_ARM_MemoryMapParams.bits64;
break;
case Triple::x86_64: case Triple::x86_64:
MapParams = FreeBSD_X86_MemoryMapParams.bits64; MapParams = FreeBSD_X86_MemoryMapParams.bits64;
break; break;
case Triple::x86: case Triple::x86:
MapParams = FreeBSD_X86_MemoryMapParams.bits32; MapParams = FreeBSD_X86_MemoryMapParams.bits32;
break; break;
default: default:
report_fatal_error("unsupported architecture"); report_fatal_error("unsupported architecture");
▲ Show 20 Lines • Show All 4,450 Lines • Show Last 20 Lines