This is an archive of the discontinued LLVM Phabricator instance.

Differential D41023

Add NetBSD/x86_64 mapping in MSan
ClosedPublic

Authored by krytarowski on Dec 8 2017, 10:12 AM.

Details

Reviewers
joerg
vitalybuka
eugenis
Commits
rG9ecd4931293d: Add NetBSD/x86_64 mapping in MSan
rL320218: Add NetBSD/x86_64 mapping in MSan
rCRT320218: Add NetBSD/x86_64 mapping in MSan
Summary

Reuse the Linux new mapping as it is.

Sponsored by <The NetBSD Foundation>

Diff Detail

Event Timeline

krytarowski created this revision.Dec 8 2017, 10:12 AM
vitalybuka accepted this revision.Dec 8 2017, 3:48 PM
This revision is now accepted and ready to land.Dec 8 2017, 3:48 PM
Closed by commit rCRT320218: Add NetBSD/x86_64 mapping in MSan (authored by kamil). · Explain WhyDec 8 2017, 4:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lib/
msan/
2 lines
3 lines

Diff 126232

lib/msan/msan.h

Show First 20 Lines • Show All 197 Lines • ▼ Show 20 Lines
// Maps low and high app ranges to contiguous space with zero base: // Maps low and high app ranges to contiguous space with zero base:
// Low: 0000 0000 0000 - 00ff ffff ffff -> 2000 0000 0000 - 20ff ffff ffff // Low: 0000 0000 0000 - 00ff ffff ffff -> 2000 0000 0000 - 20ff ffff ffff
// High: 6000 0000 0000 - 7fff ffff ffff -> 0000 0000 0000 - 1fff ffff ffff // High: 6000 0000 0000 - 7fff ffff ffff -> 0000 0000 0000 - 1fff ffff ffff
#define LINEARIZE_MEM(mem) \ #define LINEARIZE_MEM(mem) \
(((uptr)(mem) & ~0xc00000000000ULL) ^ 0x200000000000ULL) (((uptr)(mem) & ~0xc00000000000ULL) ^ 0x200000000000ULL)
#define MEM_TO_SHADOW(mem) (LINEARIZE_MEM((mem)) + 0x100000000000ULL) #define MEM_TO_SHADOW(mem) (LINEARIZE_MEM((mem)) + 0x100000000000ULL)
#define SHADOW_TO_ORIGIN(shadow) (((uptr)(shadow)) + 0x280000000000) #define SHADOW_TO_ORIGIN(shadow) (((uptr)(shadow)) + 0x280000000000)
#elif SANITIZER_LINUX && SANITIZER_WORDSIZE == 64 #elif SANITIZER_NETBSD || (SANITIZER_LINUX && SANITIZER_WORDSIZE == 64)
#ifdef MSAN_LINUX_X86_64_OLD_MAPPING #ifdef MSAN_LINUX_X86_64_OLD_MAPPING
// Requries PIE binary and ASLR enabled. // Requries PIE binary and ASLR enabled.
// Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000). // Main thread stack and DSOs at 0x7f0000000000 (sometimes 0x7e0000000000).
// Heap at 0x600000000000. // Heap at 0x600000000000.
const MappingDesc kMemoryLayout[] = { const MappingDesc kMemoryLayout[] = {
{0x000000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"}, {0x000000000000ULL, 0x200000000000ULL, MappingDesc::INVALID, "invalid"},
{0x200000000000ULL, 0x400000000000ULL, MappingDesc::SHADOW, "shadow"}, {0x200000000000ULL, 0x400000000000ULL, MappingDesc::SHADOW, "shadow"},
▲ Show 20 Lines • Show All 188 Lines • Show Last 20 Lines

lib/msan/msan_allocator.cc

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines struct AP32 {
typedef __sanitizer::CompactSizeClassMap SizeClassMap; typedef __sanitizer::CompactSizeClassMap SizeClassMap;
static const uptr kRegionSizeLog = __msan::kRegionSizeLog; static const uptr kRegionSizeLog = __msan::kRegionSizeLog;
typedef __msan::ByteMap ByteMap; typedef __msan::ByteMap ByteMap;
typedef MsanMapUnmapCallback MapUnmapCallback; typedef MsanMapUnmapCallback MapUnmapCallback;
static const uptr kFlags = 0; static const uptr kFlags = 0;
}; };
typedef SizeClassAllocator32<AP32> PrimaryAllocator; typedef SizeClassAllocator32<AP32> PrimaryAllocator;
#elif defined(__x86_64__) #elif defined(__x86_64__)
#if SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING) #if SANITIZER_NETBSD || \
(SANITIZER_LINUX && !defined(MSAN_LINUX_X86_64_OLD_MAPPING))
static const uptr kAllocatorSpace = 0x700000000000ULL; static const uptr kAllocatorSpace = 0x700000000000ULL;
#else #else
static const uptr kAllocatorSpace = 0x600000000000ULL; static const uptr kAllocatorSpace = 0x600000000000ULL;
#endif #endif
static const uptr kMaxAllowedMallocSize = 8UL << 30; static const uptr kMaxAllowedMallocSize = 8UL << 30;
struct AP64 { // Allocator64 parameters. Deliberately using a short name. struct AP64 { // Allocator64 parameters. Deliberately using a short name.
static const uptr kSpaceBeg = kAllocatorSpace; static const uptr kSpaceBeg = kAllocatorSpace;
▲ Show 20 Lines • Show All 248 Lines • Show Last 20 Lines