Index: include/llvm/MC/MCTargetAsmParser.h =================================================================== --- include/llvm/MC/MCTargetAsmParser.h +++ include/llvm/MC/MCTargetAsmParser.h @@ -14,12 +14,13 @@ #include "llvm/MC/MCParser/MCAsmParserExtension.h" namespace llvm { -class MCStreamer; -class StringRef; -class SMLoc; class AsmToken; -class MCParsedAsmOperand; class MCInst; +class MCParsedAsmOperand; +class MCStreamer; +class MachineFunction; +class SMLoc; +class StringRef; template class SmallVectorImpl; enum AsmRewriteKind { @@ -97,6 +98,9 @@ /// ms-style inline assembly. MCAsmParserSemaCallback *SemaCallback; + /// Current MachineFunction. + const MachineFunction *MF; + public: virtual ~MCTargetAsmParser(); @@ -110,6 +114,13 @@ SemaCallback = Callback; } + void setMachineFunction(const MachineFunction *MF) { + this->MF = MF; + onMachineFunctionSet(); + } + + virtual void onMachineFunctionSet() {} + virtual bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) = 0; Index: include/llvm/Transforms/Utils/SpecialCaseList.h =================================================================== --- include/llvm/Transforms/Utils/SpecialCaseList.h +++ include/llvm/Transforms/Utils/SpecialCaseList.h @@ -94,6 +94,8 @@ /// omitted to search the empty category. bool isIn(const Module &M, const StringRef Category = StringRef()) const; + bool isFileNameIn(const StringRef FileName) const; + private: SpecialCaseList(SpecialCaseList const &) LLVM_DELETED_FUNCTION; SpecialCaseList &operator=(SpecialCaseList const &) LLVM_DELETED_FUNCTION; Index: lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp =================================================================== --- lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp +++ lib/CodeGen/AsmPrinter/AsmPrinterInlineAsm.cpp @@ -139,6 +139,7 @@ if (!TAP) report_fatal_error("Inline asm not supported by this streamer because" " we don't have an asm parser for this target\n"); + TAP->setMachineFunction(MF); Parser->setAssemblerDialect(Dialect); Parser->setTargetParser(*TAP.get()); Index: lib/MC/MCParser/MCTargetAsmParser.cpp =================================================================== --- lib/MC/MCParser/MCTargetAsmParser.cpp +++ lib/MC/MCParser/MCTargetAsmParser.cpp @@ -11,7 +11,7 @@ using namespace llvm; MCTargetAsmParser::MCTargetAsmParser() - : AvailableFeatures(0), ParsingInlineAsm(false) + : AvailableFeatures(0), ParsingInlineAsm(false), MF(NULL) { } Index: lib/Target/X86/AsmParser/X86AsmInstrumentation.h =================================================================== --- lib/Target/X86/AsmParser/X86AsmInstrumentation.h +++ lib/Target/X86/AsmParser/X86AsmInstrumentation.h @@ -11,9 +11,11 @@ #define X86_ASM_INSTRUMENTATION_H #include "llvm/ADT/SmallVector.h" +#include "llvm/Support/Compiler.h" namespace llvm { +class MachineFunction; class MCContext; class MCInst; class MCParsedAsmOperand; @@ -22,9 +24,15 @@ class X86AsmInstrumentation; -X86AsmInstrumentation *CreateX86AsmInstrumentation(MCSubtargetInfo &STI); +X86AsmInstrumentation * +CreateX86AsmInstrumentation(const MachineFunction *MF, const MCContext &Ctx, + const MCSubtargetInfo &STI); class X86AsmInstrumentation { +private: + X86AsmInstrumentation(const X86AsmInstrumentation &) LLVM_DELETED_FUNCTION; + void operator=(const X86AsmInstrumentation &)LLVM_DELETED_FUNCTION; + public: virtual ~X86AsmInstrumentation(); @@ -36,11 +44,12 @@ protected: friend X86AsmInstrumentation * - CreateX86AsmInstrumentation(MCSubtargetInfo &STI); + CreateX86AsmInstrumentation(const MachineFunction *MF, const MCContext &Ctx, + const MCSubtargetInfo &STI); X86AsmInstrumentation(); }; -} // End llvm namespace +} // End llvm namespace -#endif // X86_ASM_INSTRUMENTATION_H +#endif // X86_ASM_INSTRUMENTATION_H Index: lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp =================================================================== --- lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp +++ lib/Target/X86/AsmParser/X86AsmInstrumentation.cpp @@ -11,14 +11,19 @@ #include "X86AsmInstrumentation.h" #include "X86Operand.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/IR/Attributes.h" +#include "llvm/IR/Function.h" #include "llvm/MC/MCContext.h" #include "llvm/MC/MCInst.h" #include "llvm/MC/MCInstBuilder.h" +#include "llvm/MC/MCParser/MCParsedAsmOperand.h" #include "llvm/MC/MCStreamer.h" #include "llvm/MC/MCSubtargetInfo.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/Compiler.h" -#include "llvm/MC/MCParser/MCParsedAsmOperand.h" +#include "llvm/Transforms/Utils/SpecialCaseList.h" +#include namespace llvm { namespace { @@ -27,6 +32,12 @@ "asan-instrument-inline-assembly", cl::desc("instrument inline assembly"), cl::Hidden, cl::init(false)); +static cl::opt +ClAsanAsmBlacklist("asan-asm-blacklist", + cl::desc("File containing the list of objects to ignore " + "during asan instrumentation"), + cl::Hidden); + bool IsStackReg(unsigned Reg) { return Reg == X86::RSP || Reg == X86::ESP || Reg == X86::SP; } @@ -38,7 +49,7 @@ class X86AddressSanitizer : public X86AsmInstrumentation { public: - X86AddressSanitizer(MCSubtargetInfo &sti) : STI(sti) {} + X86AddressSanitizer(const MCSubtargetInfo &STI) : STI(STI) {} virtual ~X86AddressSanitizer() {} // X86AsmInstrumentation implementation: @@ -63,7 +74,7 @@ } protected: - MCSubtargetInfo &STI; + const MCSubtargetInfo &STI; }; void X86AddressSanitizer::InstrumentMemOperand( @@ -144,7 +155,8 @@ class X86AddressSanitizer32 : public X86AddressSanitizer { public: - X86AddressSanitizer32(MCSubtargetInfo &sti) : X86AddressSanitizer(sti) {} + X86AddressSanitizer32(const MCSubtargetInfo &STI) + : X86AddressSanitizer(STI) {} virtual ~X86AddressSanitizer32() {} virtual void InstrumentMemOperandImpl(X86Operand *Op, unsigned AccessSize, @@ -179,7 +191,8 @@ class X86AddressSanitizer64 : public X86AddressSanitizer { public: - X86AddressSanitizer64(MCSubtargetInfo &sti) : X86AddressSanitizer(sti) {} + X86AddressSanitizer64(const MCSubtargetInfo &STI) + : X86AddressSanitizer(STI) {} virtual ~X86AddressSanitizer64() {} virtual void InstrumentMemOperandImpl(X86Operand *Op, unsigned AccessSize, @@ -223,12 +236,24 @@ const MCInst &Inst, SmallVectorImpl &Operands, MCContext &Ctx, MCStreamer &Out) {} -X86AsmInstrumentation *CreateX86AsmInstrumentation(MCSubtargetInfo &STI) { - if (ClAsanInstrumentInlineAssembly) { - if ((STI.getFeatureBits() & X86::Mode32Bit) != 0) - return new X86AddressSanitizer32(STI); - if ((STI.getFeatureBits() & X86::Mode64Bit) != 0) - return new X86AddressSanitizer64(STI); +X86AsmInstrumentation * +CreateX86AsmInstrumentation(const MachineFunction *MF, const MCContext &Ctx, + const MCSubtargetInfo &STI) { + const Function *F = MF ? MF->getFunction() : 0; + if ((!F || F->hasFnAttribute(Attribute::SanitizeAddress)) && + ClAsanInstrumentInlineAssembly) { + std::unique_ptr BL( + SpecialCaseList::createOrDie(ClAsanAsmBlacklist)); + if (BL->isFileNameIn(Ctx.getMainFileName())) + ; + else if (F && BL->isIn(*F)) + ; + else { + if ((STI.getFeatureBits() & X86::Mode32Bit) != 0) + return new X86AddressSanitizer32(STI); + if ((STI.getFeatureBits() & X86::Mode64Bit) != 0) + return new X86AddressSanitizer64(STI); + } } return new X86AsmInstrumentation(); } Index: lib/Target/X86/AsmParser/X86AsmParser.cpp =================================================================== --- lib/Target/X86/AsmParser/X86AsmParser.cpp +++ lib/Target/X86/AsmParser/X86AsmParser.cpp @@ -715,8 +715,14 @@ // Initialize the set of available features. setAvailableFeatures(ComputeAvailableFeatures(STI.getFeatureBits())); - Instrumentation.reset(CreateX86AsmInstrumentation(STI)); + Instrumentation.reset( + CreateX86AsmInstrumentation(MF, Parser.getContext(), STI)); } + + void onMachineFunctionSet() override { + Instrumentation.reset(CreateX86AsmInstrumentation(MF, Parser.getContext(), STI)); + } + bool ParseRegister(unsigned &RegNo, SMLoc &StartLoc, SMLoc &EndLoc) override; bool Index: lib/Transforms/Utils/SpecialCaseList.cpp =================================================================== --- lib/Transforms/Utils/SpecialCaseList.cpp +++ lib/Transforms/Utils/SpecialCaseList.cpp @@ -207,6 +207,10 @@ return inSectionCategory("src", M.getModuleIdentifier(), Category); } +bool SpecialCaseList::isFileNameIn(const StringRef FileName) const { + return inSectionCategory("src", FileName, StringRef()); +} + bool SpecialCaseList::inSectionCategory(const StringRef Section, const StringRef Query, const StringRef Category) const { Index: test/Instrumentation/AddressSanitizer/X86/asm_attr.ll =================================================================== --- /dev/null +++ test/Instrumentation/AddressSanitizer/X86/asm_attr.ll @@ -0,0 +1,29 @@ +; RUN: llc < %s -mtriple=x86_64-unknown-linux-gnu -mcpu=corei7 -mattr=+sse2 -asan-instrument-inline-assembly -asan-asm-blacklist=%s.blacklist | FileCheck %s + +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +; CHECK-LABEL: mov_no_attr +; CHECK-NOT: callq __sanitizer_sanitize_load8@PLT +; CHECK-NOT: callq __sanitizer_sanitize_store8@PLT +define void @mov_no_attr(i64* %dst, i64* %src) { + tail call void asm sideeffect "movq ($1), %rax \0A\09movq %rax, ($0) \0A\09", "r,r,~{memory},~{rax},~{dirflag},~{fpsr},~{flags}"(i64* %dst, i64* %src) + ret void +} + +; CHECK-LABEL: mov_blacklist +; CHECK-NOT: callq __sanitizer_sanitize_load8@PLT +; CHECK-NOT: callq __sanitizer_sanitize_store8@PLT +define void @mov_blacklist(i64* %dst, i64* %src) sanitize_address { + tail call void asm sideeffect "movq ($1), %rax \0A\09movq %rax, ($0) \0A\09", "r,r,~{memory},~{rax},~{dirflag},~{fpsr},~{flags}"(i64* %dst, i64* %src) + ret void +} + +; CHECK-LABEL: mov_sanitize +; CHECK: callq __sanitizer_sanitize_load8@PLT +; CHECK: callq __sanitizer_sanitize_store8@PLT +define void @mov_sanitize(i64* %dst, i64* %src) sanitize_address { + tail call void asm sideeffect "movq ($1), %rax \0A\09movq %rax, ($0) \0A\09", "r,r,~{memory},~{rax},~{dirflag},~{fpsr},~{flags}"(i64* %dst, i64* %src) + ret void +} + Index: test/Instrumentation/AddressSanitizer/X86/asm_attr.ll.blacklist =================================================================== --- /dev/null +++ test/Instrumentation/AddressSanitizer/X86/asm_attr.ll.blacklist @@ -0,0 +1 @@ +fun:*_blacklist Index: test/Instrumentation/AddressSanitizer/X86/asm_blacklisted.s =================================================================== --- test/Instrumentation/AddressSanitizer/X86/asm_blacklisted.s +++ test/Instrumentation/AddressSanitizer/X86/asm_blacklisted.s @@ -1,4 +1,4 @@ -# RUN: llvm-mc %s -triple=x86_64-unknown-linux-gnu -mcpu=corei7 -mattr=+sse2 | FileCheck %s +# RUN: llvm-mc %s -triple=x86_64-unknown-linux-gnu -mcpu=corei7 -mattr=+sse2 -asan-instrument-inline-assembly -asan-asm-blacklist=%s.blacklist | FileCheck %s .text .globl mov1b @@ -20,25 +20,5 @@ .size mov1b, .Ltmp0-mov1b .cfi_endproc - .globl mov16b - .align 16, 0x90 - .type mov16b,@function -# CHECK-LABEL: mov16b -# CHECK-NOT: callq __sanitizer_sanitize_load16@PLT -# CHECK-NOT: callq __sanitizer_sanitize_store16@PLT -mov16b: # @mov16b - .cfi_startproc -# BB#0: - #APP - movaps (%rsi), %xmm0 - movaps %xmm0, (%rdi) - - #NO_APP - retq -.Ltmp1: - .size mov16b, .Ltmp1-mov16b - .cfi_endproc - - .ident "clang version 3.5 " .section ".note.GNU-stack","",@progbits Index: test/Instrumentation/AddressSanitizer/X86/asm_blacklisted.s.blacklist =================================================================== --- /dev/null +++ test/Instrumentation/AddressSanitizer/X86/asm_blacklisted.s.blacklist @@ -0,0 +1 @@ +src:*_blacklisted.s Index: test/Instrumentation/AddressSanitizer/X86/asm_mov.ll =================================================================== --- test/Instrumentation/AddressSanitizer/X86/asm_mov.ll +++ test/Instrumentation/AddressSanitizer/X86/asm_mov.ll @@ -113,7 +113,7 @@ ret void } -attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-frame-pointer-elim-non-leaf"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #0 = { nounwind uwtable sanitize_address "less-precise-fpmad"="false" "no-frame-pointer-elim"="false" "no-frame-pointer-elim-non-leaf"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "unsafe-fp-math"="false" "use-soft-float"="false" } attributes #1 = { nounwind } !0 = metadata !{i32 98, i32 122, i32 160} Index: test/Instrumentation/AddressSanitizer/X86/asm_mov_no_instrumentation.s =================================================================== --- test/Instrumentation/AddressSanitizer/X86/asm_mov_no_instrumentation.s +++ test/Instrumentation/AddressSanitizer/X86/asm_mov_no_instrumentation.s @@ -20,25 +20,5 @@ .size mov1b, .Ltmp0-mov1b .cfi_endproc - .globl mov16b - .align 16, 0x90 - .type mov16b,@function -# CHECK-LABEL: mov16b -# CHECK-NOT: callq __sanitizer_sanitize_load16@PLT -# CHECK-NOT: callq __sanitizer_sanitize_store16@PLT -mov16b: # @mov16b - .cfi_startproc -# BB#0: - #APP - movaps (%rsi), %xmm0 - movaps %xmm0, (%rdi) - - #NO_APP - retq -.Ltmp1: - .size mov16b, .Ltmp1-mov16b - .cfi_endproc - - .ident "clang version 3.5 " .section ".note.GNU-stack","",@progbits