Skip to content

Commit 681db06

Browse files
authored
[TSan] Make Shadow/Meta region inclusive-exclusive (#144647)
This commit changes the interval shadow/meta address check from inclusive-inclusive ( $[\mathrm{start}, \mathrm{end}]$ ) to inclusive-exclusive ( $[\mathrm{start}, \mathrm{end})$ ), to resolve the ambiguity of the end point address. This also aligns the logic with the check for `isAppMem` (i.e., inclusive-exclusive), ensuring consistent behavior across all memory classifications. 1. The `isShadowMem` and `isMetaMem` checks previously used an inclusive-inclusive interval, i.e., $[\mathrm{start}, \mathrm{end}]$, which could lead to a boundary address being incorrectly classified as both Shadow and Meta memory, e.g., 0x3000_0000_0000 in `Mapping48AddressSpace`. - What's more, even when Shadow doesn't border Meta, `ShadowMem::end` cannot be considered a legal shadow address, as TSan protects the gap, i.e., `ProtectRange(ShadowEnd(), MetaShadowBeg());` 2. `ShadowMem`/`MetaMem` addresses are derived from `AppMem` using an affine-like transformation (`* factor + bias`). This transformation includes two extra modifications: high- and low-order bits are masked out, and for Shadow Memory, an optional XOR operation may be applied to prevent conflicts with certain AppMem regions. - Given that all AppMem regions are defined as inclusive-exclusive intervals, $[\mathrm{start}, \mathrm{end})$, the resulting Shadow/Meta regions should logically also be inclusive-exclusive. Note: This change is purely for improving code consistency and should have no functional impact. In practice, the exact endpoint addresses of the Shadow/Meta regions are generally not reached.
1 parent 8f82c02 commit 681db06

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

compiler-rt/lib/tsan/rtl/tsan_platform.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ bool IsAppMem(uptr mem) { return SelectMapping<IsAppMemImpl>(mem); }
931931
struct IsShadowMemImpl {
932932
template <typename Mapping>
933933
static bool Apply(uptr mem) {
934-
return mem >= Mapping::kShadowBeg && mem <= Mapping::kShadowEnd;
934+
return mem >= Mapping::kShadowBeg && mem < Mapping::kShadowEnd;
935935
}
936936
};
937937

@@ -943,7 +943,7 @@ bool IsShadowMem(RawShadow *p) {
943943
struct IsMetaMemImpl {
944944
template <typename Mapping>
945945
static bool Apply(uptr mem) {
946-
return mem >= Mapping::kMetaShadowBeg && mem <= Mapping::kMetaShadowEnd;
946+
return mem >= Mapping::kMetaShadowBeg && mem < Mapping::kMetaShadowEnd;
947947
}
948948
};
949949

compiler-rt/lib/tsan/rtl/tsan_rtl_access.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ ALWAYS_INLINE USED void UnalignedMemoryAccess(ThreadState* thr, uptr pc,
525525
void ShadowSet(RawShadow* p, RawShadow* end, RawShadow v) {
526526
DCHECK_LE(p, end);
527527
DCHECK(IsShadowMem(p));
528-
DCHECK(IsShadowMem(end));
528+
DCHECK(p == end || IsShadowMem(end - 1));
529529
UNUSED const uptr kAlign = kShadowCnt * kShadowSize;
530530
DCHECK_EQ(reinterpret_cast<uptr>(p) % kAlign, 0);
531531
DCHECK_EQ(reinterpret_cast<uptr>(end) % kAlign, 0);
@@ -669,7 +669,7 @@ void MemoryAccessRangeT(ThreadState* thr, uptr pc, uptr addr, uptr size) {
669669
RawShadow* shadow_mem = MemToShadow(addr);
670670
DPrintf2("#%d: MemoryAccessRange: @%p %p size=%d is_read=%d\n", thr->tid,
671671
(void*)pc, (void*)addr, (int)size, is_read);
672-
672+
DCHECK_NE(size, 0);
673673
#if SANITIZER_DEBUG
674674
if (!IsAppMem(addr)) {
675675
Printf("Access to non app mem start: %p\n", (void*)addr);

0 commit comments

Comments
 (0)