This is an archive of the discontinued LLVM Phabricator instance.

Differential D127096

[MIPS][AddressSanitizer] Fix the shadow offset hook for the n32 ABI
ClosedPublic

Authored by dmilosevic141 on Jun 6 2022, 3:27 AM.

Details

Reviewers
djtodoro
Commits
rG9f492a9ae5cf: [MIPS] Fix the ASAN shadow offset hook for the N32 ABI
Summary

Currently, LLVM doesn't have the correct shadow offset mapping for the n32 ABI.
This patch introduces the correct shadow offset value for the n32 ABI - 1ULL << 29.

Diff Detail

Event Timeline

dmilosevic141 created this revision.Jun 6 2022, 3:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 6 2022, 3:27 AM
Herald added subscribers: Enna1, atanasyan, hiraditya and 2 others. · View Herald Transcript
dmilosevic141 requested review of this revision.Jun 6 2022, 3:27 AM
Herald added a project: Restricted Project. · View Herald TranscriptJun 6 2022, 3:27 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B168007: Diff 434416.Jun 6 2022, 4:36 AM
xry111 added a subscriber: xry111.Jun 7 2022, 1:15 AM
djtodoro added a comment.Jun 7 2022, 2:52 AM

Thanks for this.

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
546

Is this even possible?

dmilosevic141 updated this revision to Diff 434753.Jun 7 2022, 3:02 AM

Removed the unnecessary check for the N32 ABI if LongSize is equal to 64.

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
546

Indeed, the N32 ABI has 32-bit longs. Thanks!

Harbormaster completed remote builds in B168257: Diff 434753.Jun 7 2022, 3:51 AM
djtodoro accepted this revision.Jun 23 2022, 8:04 AM

lgtm

This revision is now accepted and ready to land.Jun 23 2022, 8:04 AM
This revision was landed with ongoing or failed builds.Jul 6 2022, 3:45 AM
Closed by commit rG9f492a9ae5cf: [MIPS] Fix the ASAN shadow offset hook for the N32 ABI (authored by dmilosevic141, committed by djtodoro). · Explain Why
This revision was automatically updated to reflect the committed changes.
djtodoro added a commit: rG9f492a9ae5cf: [MIPS] Fix the ASAN shadow offset hook for the N32 ABI.

Revision Contents

PathSize
llvm/
lib/
Transforms/
Instrumentation/
4 lines

Diff 442501

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Lines
static const uint64_t kDefaultShadowOffset64 = 1ULL << 44; static const uint64_t kDefaultShadowOffset64 = 1ULL << 44;
static const uint64_t kDynamicShadowSentinel = static const uint64_t kDynamicShadowSentinel =
std::numeric_limits<uint64_t>::max(); std::numeric_limits<uint64_t>::max();
static const uint64_t kSmallX86_64ShadowOffsetBase = 0x7FFFFFFF; // < 2G. static const uint64_t kSmallX86_64ShadowOffsetBase = 0x7FFFFFFF; // < 2G.
static const uint64_t kSmallX86_64ShadowOffsetAlignMask = ~0xFFFULL; static const uint64_t kSmallX86_64ShadowOffsetAlignMask = ~0xFFFULL;
static const uint64_t kLinuxKasan_ShadowOffset64 = 0xdffffc0000000000; static const uint64_t kLinuxKasan_ShadowOffset64 = 0xdffffc0000000000;
static const uint64_t kPPC64_ShadowOffset64 = 1ULL << 44; static const uint64_t kPPC64_ShadowOffset64 = 1ULL << 44;
static const uint64_t kSystemZ_ShadowOffset64 = 1ULL << 52; static const uint64_t kSystemZ_ShadowOffset64 = 1ULL << 52;
static const uint64_t kMIPS_ShadowOffsetN32 = 1ULL << 29;
static const uint64_t kMIPS32_ShadowOffset32 = 0x0aaa0000; static const uint64_t kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const uint64_t kMIPS64_ShadowOffset64 = 1ULL << 37; static const uint64_t kMIPS64_ShadowOffset64 = 1ULL << 37;
static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36; static const uint64_t kAArch64_ShadowOffset64 = 1ULL << 36;
static const uint64_t kRISCV64_ShadowOffset64 = 0xd55550000; static const uint64_t kRISCV64_ShadowOffset64 = 0xd55550000;
static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30; static const uint64_t kFreeBSD_ShadowOffset32 = 1ULL << 30;
static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46; static const uint64_t kFreeBSD_ShadowOffset64 = 1ULL << 46;
static const uint64_t kFreeBSDKasan_ShadowOffset64 = 0xdffff7c000000000; static const uint64_t kFreeBSDKasan_ShadowOffset64 = 0xdffff7c000000000;
static const uint64_t kNetBSD_ShadowOffset32 = 1ULL << 30; static const uint64_t kNetBSD_ShadowOffset32 = 1ULL << 30;
▲ Show 20 Lines • Show All 359 Lines • ▼ Show 20 Linesstatic ShadowMapping getShadowMapping(const Triple &TargetTriple, int LongSize,
bool IsFreeBSD = TargetTriple.isOSFreeBSD(); bool IsFreeBSD = TargetTriple.isOSFreeBSD();
bool IsNetBSD = TargetTriple.isOSNetBSD(); bool IsNetBSD = TargetTriple.isOSNetBSD();
bool IsPS = TargetTriple.isPS(); bool IsPS = TargetTriple.isPS();
bool IsLinux = TargetTriple.isOSLinux(); bool IsLinux = TargetTriple.isOSLinux();
bool IsPPC64 = TargetTriple.getArch() == Triple::ppc64 || bool IsPPC64 = TargetTriple.getArch() == Triple::ppc64 ||
TargetTriple.getArch() == Triple::ppc64le; TargetTriple.getArch() == Triple::ppc64le;
bool IsSystemZ = TargetTriple.getArch() == Triple::systemz; bool IsSystemZ = TargetTriple.getArch() == Triple::systemz;
bool IsX86_64 = TargetTriple.getArch() == Triple::x86_64; bool IsX86_64 = TargetTriple.getArch() == Triple::x86_64;
bool IsMIPSN32ABI = TargetTriple.getEnvironment() == Triple::GNUABIN32;
bool IsMIPS32 = TargetTriple.isMIPS32(); bool IsMIPS32 = TargetTriple.isMIPS32();
bool IsMIPS64 = TargetTriple.isMIPS64(); bool IsMIPS64 = TargetTriple.isMIPS64();
bool IsArmOrThumb = TargetTriple.isARM() || TargetTriple.isThumb(); bool IsArmOrThumb = TargetTriple.isARM() || TargetTriple.isThumb();
bool IsAArch64 = TargetTriple.getArch() == Triple::aarch64; bool IsAArch64 = TargetTriple.getArch() == Triple::aarch64;
bool IsRISCV64 = TargetTriple.getArch() == Triple::riscv64; bool IsRISCV64 = TargetTriple.getArch() == Triple::riscv64;
bool IsWindows = TargetTriple.isOSWindows(); bool IsWindows = TargetTriple.isOSWindows();
bool IsFuchsia = TargetTriple.isOSFuchsia(); bool IsFuchsia = TargetTriple.isOSFuchsia();
bool IsEmscripten = TargetTriple.isOSEmscripten(); bool IsEmscripten = TargetTriple.isOSEmscripten();
bool IsAMDGPU = TargetTriple.isAMDGPU(); bool IsAMDGPU = TargetTriple.isAMDGPU();
ShadowMapping Mapping; ShadowMapping Mapping;
Mapping.Scale = kDefaultShadowScale; Mapping.Scale = kDefaultShadowScale;
if (ClMappingScale.getNumOccurrences() > 0) { if (ClMappingScale.getNumOccurrences() > 0) {
Mapping.Scale = ClMappingScale; Mapping.Scale = ClMappingScale;
} }
if (LongSize == 32) { if (LongSize == 32) {
if (IsAndroid) if (IsAndroid)
Mapping.Offset = kDynamicShadowSentinel; Mapping.Offset = kDynamicShadowSentinel;
else if (IsMIPSN32ABI)
Mapping.Offset = kMIPS_ShadowOffsetN32;
else if (IsMIPS32) else if (IsMIPS32)
Mapping.Offset = kMIPS32_ShadowOffset32; Mapping.Offset = kMIPS32_ShadowOffset32;
else if (IsFreeBSD) else if (IsFreeBSD)
Mapping.Offset = kFreeBSD_ShadowOffset32; Mapping.Offset = kFreeBSD_ShadowOffset32;
else if (IsNetBSD) else if (IsNetBSD)
Mapping.Offset = kNetBSD_ShadowOffset32; Mapping.Offset = kNetBSD_ShadowOffset32;
else if (IsIOS) else if (IsIOS)
Mapping.Offset = kDynamicShadowSentinel; Mapping.Offset = kDynamicShadowSentinel;
Show All 27 Lines if (LongSize == 32) {
else if (IsLinux && IsX86_64) { else if (IsLinux && IsX86_64) {
if (IsKasan) if (IsKasan)
Mapping.Offset = kLinuxKasan_ShadowOffset64; Mapping.Offset = kLinuxKasan_ShadowOffset64;
else else
Mapping.Offset = (kSmallX86_64ShadowOffsetBase & Mapping.Offset = (kSmallX86_64ShadowOffsetBase &
(kSmallX86_64ShadowOffsetAlignMask << Mapping.Scale)); (kSmallX86_64ShadowOffsetAlignMask << Mapping.Scale));
} else if (IsWindows && IsX86_64) { } else if (IsWindows && IsX86_64) {
Mapping.Offset = kWindowsShadowOffset64; Mapping.Offset = kWindowsShadowOffset64;
} else if (IsMIPS64) } else if (IsMIPS64)
djtodoroUnsubmitted
Not Done
ReplyInline Actions

Is this even possible?

djtodoro: Is this even possible?
dmilosevic141AuthorUnsubmitted
Done
ReplyInline Actions

Indeed, the N32 ABI has 32-bit longs. Thanks!

dmilosevic141: Indeed, the //N32 ABI// has 32-bit `long`s. Thanks!
Mapping.Offset = kMIPS64_ShadowOffset64; Mapping.Offset = kMIPS64_ShadowOffset64;
else if (IsIOS) else if (IsIOS)
Mapping.Offset = kDynamicShadowSentinel; Mapping.Offset = kDynamicShadowSentinel;
else if (IsMacOS && IsAArch64) else if (IsMacOS && IsAArch64)
Mapping.Offset = kDynamicShadowSentinel; Mapping.Offset = kDynamicShadowSentinel;
else if (IsAArch64) else if (IsAArch64)
Mapping.Offset = kAArch64_ShadowOffset64; Mapping.Offset = kAArch64_ShadowOffset64;
else if (IsRISCV64) else if (IsRISCV64)
▲ Show 20 Lines • Show All 2,886 Lines • Show Last 20 Lines