This is an archive of the discontinued LLVM Phabricator instance.

Differential D105722

[scudo] Check if we use __clang_major__ >= 12
ClosedPublic

Authored by vitalybuka on Jul 9 2021, 12:27 PM.

Details

Reviewers
pcc
Commits
rGdb4c25822a1d: [scudo] Check if we use __clang_major__ >= 12
Summary

This makes sure we have support for MTE instructions.
Later the check can be extended to support MTE on other compilers.

Diff Detail

Event Timeline

vitalybuka created this revision.Jul 9 2021, 12:27 PM
Herald added a subscriber: cryptoad. · View Herald TranscriptJul 9 2021, 12:27 PM
vitalybuka requested review of this revision.Jul 9 2021, 12:27 PM
Herald added a project: Restricted Project. · View Herald TranscriptJul 9 2021, 12:27 PM
Herald added a subscriber: Restricted Project. · View Herald Transcript
vitalybuka edited the summary of this revision. (Show Details)Jul 9 2021, 12:28 PM
pcc added inline comments.Jul 9 2021, 12:33 PM
compiler-rt/lib/scudo/standalone/memtag.h
58

Don't you also need it here?

vitalybuka updated this revision to Diff 357602.Jul 9 2021, 12:40 PM
vitalybuka marked an inline comment as done.

fix

Harbormaster completed remote builds in B113264: Diff 357602.Jul 9 2021, 1:44 PM
pcc accepted this revision.Jul 9 2021, 4:33 PM

LGTM

compiler-rt/lib/scudo/standalone/memtag.h
21

#if (__clang_major__ >= 12 && defined(__aarch64__)) || defined(SCUDO_FUZZ)

This revision is now accepted and ready to land.Jul 9 2021, 4:33 PM
vitalybuka marked an inline comment as done.Jul 9 2021, 5:47 PM
vitalybuka updated this revision to Diff 357676.Jul 9 2021, 5:48 PM

SCUDO_FUZZ ignores clang_major

This revision was landed with ongoing or failed builds.Jul 9 2021, 5:48 PM
Closed by commit rGdb4c25822a1d: [scudo] Check if we use __clang_major__ >= 12 (authored by vitalybuka). · Explain Why
This revision was automatically updated to reflect the committed changes.
vitalybuka added a commit: rGdb4c25822a1d: [scudo] Check if we use __clang_major__ >= 12.
Harbormaster completed remote builds in B113325: Diff 357676.Jul 9 2021, 6:57 PM
• post.kadirselcuk added a parent revision: D105762: [X86] Teach X86FloatingPoint's handleCall to only erase the FP stack if there is a regmask operand that clobbers the FP stack..Jul 10 2021, 8:06 PM
craig.topper removed a parent revision: D105762: [X86] Teach X86FloatingPoint's handleCall to only erase the FP stack if there is a regmask operand that clobbers the FP stack..Jul 10 2021, 9:47 PM

Revision Contents

PathSize
compiler-rt/
lib/
scudo/
standalone/
4 lines

Diff 357677

compiler-rt/lib/scudo/standalone/memtag.h

Show All 12 Lines
#if SCUDO_LINUX #if SCUDO_LINUX
#include <sys/auxv.h> #include <sys/auxv.h>
#include <sys/prctl.h> #include <sys/prctl.h>
#endif #endif
namespace scudo { namespace scudo {
#if defined(__aarch64__) || defined(SCUDO_FUZZ) #if (__clang_major__ >= 12 && defined(__aarch64__)) || defined(SCUDO_FUZZ)
pccUnsubmitted
Done
ReplyInline Actions

#if (__clang_major__ >= 12 && defined(__aarch64__)) || defined(SCUDO_FUZZ)

pcc: `#if (__clang_major__ >= 12 && defined(__aarch64__)) || defined(SCUDO_FUZZ)`
// We assume that Top-Byte Ignore is enabled if the architecture supports memory // We assume that Top-Byte Ignore is enabled if the architecture supports memory
// tagging. Not all operating systems enable TBI, so we only claim architectural // tagging. Not all operating systems enable TBI, so we only claim architectural
// support for memory tagging if the operating system enables TBI. // support for memory tagging if the operating system enables TBI.
#if SCUDO_LINUX && !defined(SCUDO_DISABLE_TBI) #if SCUDO_LINUX && !defined(SCUDO_DISABLE_TBI)
inline constexpr bool archSupportsMemoryTagging() { return true; } inline constexpr bool archSupportsMemoryTagging() { return true; }
#else #else
inline constexpr bool archSupportsMemoryTagging() { return false; } inline constexpr bool archSupportsMemoryTagging() { return false; }
Show All 20 Lines
inline uint8_t extractTag(uptr Ptr) { inline uint8_t extractTag(uptr Ptr) {
(void)Ptr; (void)Ptr;
UNREACHABLE("memory tagging not supported"); UNREACHABLE("memory tagging not supported");
} }
#endif #endif
#if defined(__aarch64__) #if __clang_major__ >= 12 && defined(__aarch64__)
pccUnsubmitted
Done
ReplyInline Actions

Don't you also need it here?

pcc: Don't you also need it here?
#if SCUDO_LINUX #if SCUDO_LINUX
inline bool systemSupportsMemoryTagging() { inline bool systemSupportsMemoryTagging() {
#ifndef HWCAP2_MTE #ifndef HWCAP2_MTE
#define HWCAP2_MTE (1 << 18) #define HWCAP2_MTE (1 << 18)
#endif #endif
return getauxval(AT_HWCAP2) & HWCAP2_MTE; return getauxval(AT_HWCAP2) & HWCAP2_MTE;
▲ Show 20 Lines • Show All 261 Lines • Show Last 20 Lines