This is an archive of the discontinued LLVM Phabricator instance.

Differential D115214

[ASan] Replaced constants for SHADOW_OFFSET with defines.
ClosedPublic

Authored by kstoimenov on Dec 6 2021, 7:22 PM.

Details

Reviewers
vitalybuka
Commits
rG84dbfe16426f: [ASan] Replaced constants for SHADOW_OFFSET with defines.

Diff Detail

Event Timeline

kstoimenov created this revision.Dec 6 2021, 7:22 PM
Herald added subscribers: luke957, s.egerton, simoncook, fedor.sergeev. · View Herald TranscriptDec 6 2021, 7:22 PM
kstoimenov requested review of this revision.Dec 6 2021, 7:22 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2021, 7:22 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
kstoimenov retitled this revision from [ASan] Removed constants for SHADOW_OFFSET with defines. to [ASan] Replaced constants for SHADOW_OFFSET with defines..Dec 6 2021, 7:23 PM
Harbormaster completed remote builds in B137807: Diff 392262.Dec 6 2021, 7:23 PM
kstoimenov added a parent revision: D115213: [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST..Dec 6 2021, 7:23 PM
kstoimenov added a reviewer: vitalybuka.Dec 6 2021, 7:29 PM
vitalybuka added inline comments.Dec 6 2021, 7:52 PM
compiler-rt/lib/asan/asan_mapping.h
164

would you like to add leading zeroes to align 32bit pointest to 4 bytes and 64bit to 8?

kstoimenov updated this revision to Diff 392452.Dec 7 2021, 10:13 AM

After rebase.

Harbormaster completed remote builds in B137943: Diff 392452.Dec 7 2021, 10:14 AM
kstoimenov removed a parent revision: D115213: [ASan] Refactored SHADOW_OFFSET implementation to use SHADOW_OFFSET_CONST..Dec 7 2021, 10:14 AM
kstoimenov updated this revision to Diff 392458.Dec 7 2021, 10:26 AM

After rebase.

kstoimenov updated this revision to Diff 392460.Dec 7 2021, 10:34 AM

Alligned consts.

vitalybuka accepted this revision.Dec 7 2021, 10:59 AM
vitalybuka added inline comments.
compiler-rt/lib/asan/asan_mapping.h
216–218

if you defined SHADOW_OFFSET_DYNAMIC
then

#elseif defined(SHADOW_OFFSET_DYNAMIC)
#  define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
#else
#error blablabla
#endif
This revision is now accepted and ready to land.Dec 7 2021, 10:59 AM
Harbormaster completed remote builds in B137949: Diff 392460.Dec 7 2021, 10:59 AM
kstoimenov updated this revision to Diff 392487.Dec 7 2021, 11:18 AM

Address comments.

This revision was landed with ongoing or failed builds.Dec 7 2021, 11:34 AM
Closed by commit rG84dbfe16426f: [ASan] Replaced constants for SHADOW_OFFSET with defines. (authored by kstoimenov). · Explain Why
This revision was automatically updated to reflect the committed changes.
kstoimenov added a commit: rG84dbfe16426f: [ASan] Replaced constants for SHADOW_OFFSET with defines..
Harbormaster completed remote builds in B137961: Diff 392487.Dec 7 2021, 11:42 AM

Revision Contents

PathSize
compiler-rt/
lib/
asan/
52 lines

Diff 392491

compiler-rt/lib/asan/asan_mapping.h

Show First 20 Lines • Show All 151 Lines • ▼ Show 20 Lines
// || `[0x00000000, 0x2fffffff]` || LowMem || // || `[0x00000000, 0x2fffffff]` || LowMem ||
#if defined(ASAN_SHADOW_SCALE) #if defined(ASAN_SHADOW_SCALE)
static const u64 kDefaultShadowScale = ASAN_SHADOW_SCALE; static const u64 kDefaultShadowScale = ASAN_SHADOW_SCALE;
#else #else
static const u64 kDefaultShadowScale = 3; static const u64 kDefaultShadowScale = 3;
#endif #endif
static const u64 kDefaultShadowSentinel = ~(uptr)0; static const u64 kDefaultShadowSentinel = ~(uptr)0;
static const u64 kDefaultShadowOffset32 = 1ULL << 29; // 0x20000000
static const u64 kDefaultShadowOffset64 = 1ULL << 44; // 0x100000000000
static const u64 kDefaultShort64bitShadowOffset =
0x7FFFFFFF & (~0xFFFULL << kDefaultShadowScale); // < 2G.
static const u64 kAArch64_ShadowOffset64 = 1ULL << 36; // 0x1000000000
static const u64 kRiscv64_ShadowOffset64 = 0xd55550000;
static const u64 kMIPS32_ShadowOffset32 = 0x0aaa0000;
static const u64 kMIPS64_ShadowOffset64 = 1ULL << 37; // 0x2000000000
static const u64 kPPC64_ShadowOffset64 = 1ULL << 44; // 0x100000000000
static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52; // 0x10000000000000
static const u64 kSPARC64_ShadowOffset64 = 1ULL << 43; // 0x80000000000
static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kNetBSD_ShadowOffset32 = 1ULL << 30; // 0x40000000
static const u64 kNetBSD_ShadowOffset64 = 1ULL << 46; // 0x400000000000
static const u64 kWindowsShadowOffset32 = 3ULL << 28; // 0x30000000
#define SHADOW_SCALE kDefaultShadowScale #define SHADOW_SCALE kDefaultShadowScale
#if SANITIZER_FUCHSIA #if SANITIZER_FUCHSIA
# define SHADOW_OFFSET_CONST (0) # define SHADOW_OFFSET_CONST (0)
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

would you like to add leading zeroes to align 32bit pointest to 4 bytes and 64bit to 8?

vitalybuka: would you like to add leading zeroes to align 32bit pointest to 4 bytes and 64bit to 8?
#elif SANITIZER_WORDSIZE == 32 #elif SANITIZER_WORDSIZE == 32
# if SANITIZER_ANDROID # if SANITIZER_ANDROID
# define SHADOW_OFFSET_DYNAMIC # define SHADOW_OFFSET_DYNAMIC
# elif defined(__mips__) # elif defined(__mips__)
# define SHADOW_OFFSET_CONST kMIPS32_ShadowOffset32 # define SHADOW_OFFSET_CONST 0x0aaa0000
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET_CONST kFreeBSD_ShadowOffset32 # define SHADOW_OFFSET_CONST 0x40000000
# elif SANITIZER_NETBSD # elif SANITIZER_NETBSD
# define SHADOW_OFFSET_CONST kNetBSD_ShadowOffset32 # define SHADOW_OFFSET_CONST 0x40000000
# elif SANITIZER_WINDOWS # elif SANITIZER_WINDOWS
# define SHADOW_OFFSET_CONST kWindowsShadowOffset32 # define SHADOW_OFFSET_CONST 0x30000000
# elif SANITIZER_IOS # elif SANITIZER_IOS
# define SHADOW_OFFSET_DYNAMIC # define SHADOW_OFFSET_DYNAMIC
# else # else
# define SHADOW_OFFSET_CONST kDefaultShadowOffset32 # define SHADOW_OFFSET_CONST 0x20000000
# endif # endif
#else #else
# if SANITIZER_IOS # if SANITIZER_IOS
# define SHADOW_OFFSET_DYNAMIC # define SHADOW_OFFSET_DYNAMIC
# elif SANITIZER_MAC && defined(__aarch64__) # elif SANITIZER_MAC && defined(__aarch64__)
# define SHADOW_OFFSET_DYNAMIC # define SHADOW_OFFSET_DYNAMIC
# elif SANITIZER_RISCV64 # elif SANITIZER_RISCV64
# define SHADOW_OFFSET_CONST kRiscv64_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000000d55550000
# elif defined(__aarch64__) # elif defined(__aarch64__)
# define SHADOW_OFFSET_CONST kAArch64_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000001000000000
# elif defined(__powerpc64__) # elif defined(__powerpc64__)
# define SHADOW_OFFSET_CONST kPPC64_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000100000000000
# elif defined(__s390x__) # elif defined(__s390x__)
# define SHADOW_OFFSET_CONST kSystemZ_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0010000000000000
# elif SANITIZER_FREEBSD # elif SANITIZER_FREEBSD
# define SHADOW_OFFSET_CONST kFreeBSD_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000400000000000
# elif SANITIZER_NETBSD # elif SANITIZER_NETBSD
# define SHADOW_OFFSET_CONST kNetBSD_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000400000000000
# elif SANITIZER_MAC # elif SANITIZER_MAC
# define SHADOW_OFFSET_CONST kDefaultShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000100000000000
# elif defined(__mips64) # elif defined(__mips64)
# define SHADOW_OFFSET_CONST kMIPS64_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000002000000000
# elif defined(__sparc__) # elif defined(__sparc__)
# define SHADOW_OFFSET_CONST kSPARC64_ShadowOffset64 # define SHADOW_OFFSET_CONST 0x0000080000000000
# elif SANITIZER_WINDOWS64 # elif SANITIZER_WINDOWS64
# define SHADOW_OFFSET_DYNAMIC # define SHADOW_OFFSET_DYNAMIC
# else # else
# define SHADOW_OFFSET_CONST kDefaultShort64bitShadowOffset # define SHADOW_OFFSET_CONST \
0x000000007FFFFFFF & (~0xFFFULL << kDefaultShadowScale)
# endif # endif
#endif #endif
#if defined(SHADOW_OFFSET_CONST) #if defined(SHADOW_OFFSET_CONST)
# define SHADOW_OFFSET SHADOW_OFFSET_CONST static const u64 kConstShadowOffset = SHADOW_OFFSET_CONST;
# define SHADOW_OFFSET kConstShadowOffset
#elif defined(SHADOW_OFFSET_DYNAMIC) #elif defined(SHADOW_OFFSET_DYNAMIC)
# define SHADOW_OFFSET __asan_shadow_memory_dynamic_address # define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
#else
# error "SHADOW_OFFSET can't be determined."
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

if you defined SHADOW_OFFSET_DYNAMIC
then

#elseif defined(SHADOW_OFFSET_DYNAMIC)
#  define SHADOW_OFFSET __asan_shadow_memory_dynamic_address
#else
#error blablabla
#endif
vitalybuka: if you defined SHADOW_OFFSET_DYNAMIC then ``` #elseif defined(SHADOW_OFFSET_DYNAMIC) #…
#endif #endif
#if SANITIZER_ANDROID && defined(__arm__) #if SANITIZER_ANDROID && defined(__arm__)
# define ASAN_PREMAP_SHADOW 1 # define ASAN_PREMAP_SHADOW 1
#else #else
# define ASAN_PREMAP_SHADOW 0 # define ASAN_PREMAP_SHADOW 0
#endif #endif
▲ Show 20 Lines • Show All 161 Lines • Show Last 20 Lines