This is an archive of the discontinued LLVM Phabricator instance.

Differential D106505

[asan] Modified ASAN_MEMORY_ACCESS_CALLBACK to use a function call to ReportGenericErrorWrapper.
ClosedPublic

Authored by kstoimenov on Jul 21 2021, 3:49 PM.

Details

Reviewers
vitalybuka
Commits
rG7de73da8dad3: [asan] Modified ASAN_MEMORY_ACCESS_CALLBACK to use a function call to…
Summary

This change eliminate the stack frame for the fast path and improves runtime performance.

Diff Detail

Event Timeline

kstoimenov requested review of this revision.Jul 21 2021, 3:49 PM
kstoimenov created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJul 21 2021, 3:49 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
Harbormaster completed remote builds in B115437: Diff 360629.Jul 21 2021, 5:11 PM
vitalybuka accepted this revision.Jul 21 2021, 5:15 PM
vitalybuka added inline comments.
compiler-rt/lib/asan/asan_rtl.cpp
92

does this pass check-asan and check-sanitizer?
it can break stack trace matchers in tests

This revision is now accepted and ready to land.Jul 21 2021, 5:15 PM
kstoimenov added a comment.Jul 22 2021, 1:53 PM

It passed both.

Closed by commit rG7de73da8dad3: [asan] Modified ASAN_MEMORY_ACCESS_CALLBACK to use a function call to… (authored by kstoimenov). · Explain WhyJul 22 2021, 2:20 PM
This revision was automatically updated to reflect the committed changes.
kstoimenov added a commit: rG7de73da8dad3: [asan] Modified ASAN_MEMORY_ACCESS_CALLBACK to use a function call to….

Revision Contents

PathSize
compiler-rt/
lib/
asan/
18 lines

Diff 360971

compiler-rt/lib/asan/asan_rtl.cpp

Show First 20 Lines • Show All 76 Lines • ▼ Show 20 Lines
#endif #endif
// -------------------------- Misc ---------------- {{{1 // -------------------------- Misc ---------------- {{{1
void ShowStatsAndAbort() { void ShowStatsAndAbort() {
__asan_print_accumulated_stats(); __asan_print_accumulated_stats();
Die(); Die();
} }
NOINLINE
static void ReportGenericErrorWrapper(uptr addr, bool is_write, int size,
int exp_arg, bool fatal) {
if (__asan_test_only_reported_buggy_pointer) {
*__asan_test_only_reported_buggy_pointer = addr;
} else {
GET_CALLER_PC_BP_SP;
ReportGenericError(pc, bp, sp, addr, is_write, size, exp_arg, fatal);
vitalybukaUnsubmitted
Not Done
ReplyInline Actions

does this pass check-asan and check-sanitizer?
it can break stack trace matchers in tests

vitalybuka: does this pass check-asan and check-sanitizer? it can break stack trace matchers in tests
}
}
// --------------- LowLevelAllocateCallbac ---------- {{{1 // --------------- LowLevelAllocateCallbac ---------- {{{1
static void OnLowLevelAllocate(uptr ptr, uptr size) { static void OnLowLevelAllocate(uptr ptr, uptr size) {
PoisonShadow(ptr, size, kAsanInternalHeapMagic); PoisonShadow(ptr, size, kAsanInternalHeapMagic);
} }
// -------------------------- Run-time entry ------------------- {{{1 // -------------------------- Run-time entry ------------------- {{{1
// exported functions // exported functions
#define ASAN_REPORT_ERROR(type, is_write, size) \ #define ASAN_REPORT_ERROR(type, is_write, size) \
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines
#define ASAN_MEMORY_ACCESS_CALLBACK_BODY(type, is_write, size, exp_arg, fatal) \ #define ASAN_MEMORY_ACCESS_CALLBACK_BODY(type, is_write, size, exp_arg, fatal) \
uptr sp = MEM_TO_SHADOW(addr); \ uptr sp = MEM_TO_SHADOW(addr); \
uptr s = size <= SHADOW_GRANULARITY ? *reinterpret_cast<u8 *>(sp) \ uptr s = size <= SHADOW_GRANULARITY ? *reinterpret_cast<u8 *>(sp) \
: *reinterpret_cast<u16 *>(sp); \ : *reinterpret_cast<u16 *>(sp); \
if (UNLIKELY(s)) { \ if (UNLIKELY(s)) { \
if (UNLIKELY(size >= SHADOW_GRANULARITY || \ if (UNLIKELY(size >= SHADOW_GRANULARITY || \
((s8)((addr & (SHADOW_GRANULARITY - 1)) + size - 1)) >= \ ((s8)((addr & (SHADOW_GRANULARITY - 1)) + size - 1)) >= \
(s8)s)) { \ (s8)s)) { \
if (__asan_test_only_reported_buggy_pointer) { \ ReportGenericErrorWrapper(addr, is_write, size, exp_arg, fatal); \
*__asan_test_only_reported_buggy_pointer = addr; \
} else { \
GET_CALLER_PC_BP_SP; \
ReportGenericError(pc, bp, sp, addr, is_write, size, exp_arg, fatal); \
} \
} \ } \
} }
#define ASAN_MEMORY_ACCESS_CALLBACK(type, is_write, size) \ #define ASAN_MEMORY_ACCESS_CALLBACK(type, is_write, size) \
extern "C" NOINLINE INTERFACE_ATTRIBUTE \ extern "C" NOINLINE INTERFACE_ATTRIBUTE \
void __asan_##type##size(uptr addr) { \ void __asan_##type##size(uptr addr) { \
ASAN_MEMORY_ACCESS_CALLBACK_BODY(type, is_write, size, 0, true) \ ASAN_MEMORY_ACCESS_CALLBACK_BODY(type, is_write, size, 0, true) \
} \ } \
▲ Show 20 Lines • Show All 470 Lines • Show Last 20 Lines