This is an archive of the discontinued LLVM Phabricator instance.

Differential D139033

msan: update tests for new memory mappings on aarch64
ClosedPublic

Authored by thurston on Nov 30 2022, 10:19 AM.

Details

Reviewers
vitalybuka
Commits
rGb647d8f95d19: msan: update tests for new memory mappings on aarch64
Summary

D137666 changed the memory mappings for msan on aarch64.
This patch updates two more tests to match the new
mappings.

Diff Detail

Event Timeline

thurston created this revision.Nov 30 2022, 10:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 30 2022, 10:19 AM
Herald added subscribers: Enna1, kristof.beyls. · View Herald Transcript
thurston requested review of this revision.Nov 30 2022, 10:19 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 30 2022, 10:19 AM
Herald added a subscriber: Restricted Project. · View Herald Transcript
This revision was not accepted when it landed; it landed in state Needs Review.Nov 30 2022, 10:20 AM
This revision was landed with ongoing or failed builds.
Closed by commit rGb647d8f95d19: msan: update tests for new memory mappings on aarch64 (authored by thurston). · Explain Why
This revision was automatically updated to reflect the committed changes.
thurston added a commit: rGb647d8f95d19: msan: update tests for new memory mappings on aarch64.
Harbormaster completed remote builds in B200318: Diff 479009.Nov 30 2022, 10:43 AM
vitalybuka reopened this revision.Dec 6 2022, 2:03 PM
vitalybuka accepted this revision.
This revision is now accepted and ready to land.Dec 6 2022, 2:03 PM
vitalybuka closed this revision.Dec 6 2022, 2:04 PM

Revision Contents

PathSize
compiler-rt/
test/
msan/
19 lines
5 lines

Diff 479010

compiler-rt/test/msan/mmap.cpp

Show All 27 Lines#elif defined(__s390x__)
return addr < 0x040000000000ULL || return addr < 0x040000000000ULL ||
(addr >= 0x440000000000ULL && addr < 0x500000000000); (addr >= 0x440000000000ULL && addr < 0x500000000000);
#elif defined(__aarch64__) #elif defined(__aarch64__)
struct AddrMapping { struct AddrMapping {
uintptr_t start; uintptr_t start;
uintptr_t end; uintptr_t end;
} mappings[] = { } mappings[] = {
{0x05000000000ULL, 0x06000000000ULL}, {0x0000000000000ULL, 0x0100000000000ULL},
{0x07000000000ULL, 0x08000000000ULL}, {0x0A00000000000ULL, 0x0B00000000000ULL},
{0x0F000000000ULL, 0x10000000000ULL}, {0x0E00000000000ULL, 0x0F00000000000ULL},
{0x11000000000ULL, 0x12000000000ULL}, {0x0F00000000000ULL, 0x1000000000000ULL},
{0x20000000000ULL, 0x21000000000ULL},
{0x2A000000000ULL, 0x2B000000000ULL},
{0x2E000000000ULL, 0x2F000000000ULL},
{0x3B000000000ULL, 0x3C000000000ULL},
{0x3F000000000ULL, 0x40000000000ULL},
{0x0041000000000ULL, 0x0042000000000ULL},
{0x0050000000000ULL, 0x0051000000000ULL},
{0x0058000000000ULL, 0x0059000000000ULL},
{0x0061000000000ULL, 0x0062000000000ULL},
{0x0AAAAA0000000ULL, 0x0AAAB00000000ULL},
{0x0FFFF00000000ULL, 0x1000000000000ULL},
}; };
const size_t mappingsSize = sizeof (mappings) / sizeof (mappings[0]); const size_t mappingsSize = sizeof (mappings) / sizeof (mappings[0]);
for (int i=0; i<mappingsSize; ++i) for (int i=0; i<mappingsSize; ++i)
if (addr >= mappings[i].start && addr < mappings[i].end) if (addr >= mappings[i].start && addr < mappings[i].end)
return true; return true;
return false; return false;
#endif #endif
Show All 28 Lines

compiler-rt/test/msan/mmap_below_shadow.cpp

Show All 25 Lines#elif defined (__mips64)
const uintptr_t app_start = 0x6000000000ULL; const uintptr_t app_start = 0x6000000000ULL;
#elif defined (__powerpc64__) #elif defined (__powerpc64__)
uintptr_t hint = 0x2f0000000000ULL; uintptr_t hint = 0x2f0000000000ULL;
const uintptr_t app_start = 0x300000000000ULL; const uintptr_t app_start = 0x300000000000ULL;
#elif defined(__s390x__) #elif defined(__s390x__)
uintptr_t hint = 0x07f000000000ULL; uintptr_t hint = 0x07f000000000ULL;
const uintptr_t app_start = 0x020000000000ULL; const uintptr_t app_start = 0x020000000000ULL;
#elif defined (__aarch64__) #elif defined (__aarch64__)
uintptr_t hint = 0x4f0000000ULL; uintptr_t hint = 0X0110000000000;
const uintptr_t app_start = 0x7000000000ULL; // Unfortunately we don't have a stronger condition for this
const uintptr_t app_start = 0x0ULL;
#endif #endif
uintptr_t p = (uintptr_t)mmap( uintptr_t p = (uintptr_t)mmap(
(void *)hint, 4096, PROT_WRITE, (void *)hint, 4096, PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS | (FIXED ? MAP_FIXED : 0), -1, 0); MAP_PRIVATE | MAP_ANONYMOUS | (FIXED ? MAP_FIXED : 0), -1, 0);
if (FIXED) if (FIXED)
assert(p == (uintptr_t)-1 && errno == EINVAL); assert(p == (uintptr_t)-1 && errno == EINVAL);
else else
assert(p >= app_start); assert(p >= app_start);
return 0; return 0;
} }