Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions bolt/include/bolt/Rewrite/MetadataRewriters.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,14 @@ class BinaryContext;

// The list of rewriter build functions.

std::unique_ptr<MetadataRewriter> createLinuxKernelRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createBuildIDRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createLinuxKernelRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createPseudoProbeRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createRSeqRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createSDTRewriter(BinaryContext &);

std::unique_ptr<MetadataRewriter> createGNUPropertyRewriter(BinaryContext &);
Expand Down
1 change: 1 addition & 0 deletions bolt/lib/Rewrite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ add_llvm_library(LLVMBOLTRewrite
BuildIDRewriter.cpp
PseudoProbeRewriter.cpp
RewriteInstance.cpp
RSeqRewriter.cpp
SDTRewriter.cpp
GNUPropertyRewriter.cpp

Expand Down
72 changes: 72 additions & 0 deletions bolt/lib/Rewrite/RSeqRewriter.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
//===- bolt/Rewrite/RSeqRewriter.cpp --------------------------------------===//
//
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
//
//===----------------------------------------------------------------------===//
//
// Basic support for restartable sequences used by tcmalloc. Prevent critical
// section overrides by ignoring optimizations in containing functions.
//
// References:
// * https://google.github.io/tcmalloc/rseq.html
// * tcmalloc/internal/percpu_rseq_x86_64.S
//
//===----------------------------------------------------------------------===//

#include "bolt/Core/BinaryFunction.h"
#include "bolt/Rewrite/MetadataRewriter.h"
#include "bolt/Rewrite/MetadataRewriters.h"
#include "llvm/Support/Errc.h"

using namespace llvm;
using namespace bolt;

namespace {

class RSeqRewriter final : public MetadataRewriter {
public:
RSeqRewriter(StringRef Name, BinaryContext &BC)
: MetadataRewriter(Name, BC) {}

Error preCFGInitializer() override {
for (const BinarySection &Section : BC.allocatableSections()) {
if (Section.getName() != "__rseq_cs")
continue;

auto handleRelocation = [&](const Relocation &Rel, bool IsDynamic) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it need to be defined in this and not outer scope?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the review.

Doesn't have to be, but I selected the minimal scope for handleRelocation().

BinaryFunction *BF = nullptr;
if (Rel.Symbol)
BF = BC.getFunctionForSymbol(Rel.Symbol);
else if (Relocation::isRelative(Rel.Type))
BF = BC.getBinaryFunctionContainingAddress(Rel.Addend);

if (!BF) {
BC.errs() << "BOLT-WARNING: no function found matching "
<< (IsDynamic ? "dynamic " : "")
<< "relocation in __rseq_cs\n";
} else if (!BF->isIgnored()) {
BC.outs() << "BOLT-INFO: restartable sequence reference detected in "
<< *BF << ". Function will not be optimized\n";
BF->setIgnored();
}
};

for (const Relocation &Rel : Section.dynamicRelocations())
handleRelocation(Rel, /*IsDynamic*/ true);

for (const Relocation &Rel : Section.relocations())
handleRelocation(Rel, /*IsDynamic*/ false);
}

return Error::success();
}
};

} // namespace

std::unique_ptr<MetadataRewriter>
llvm::bolt::createRSeqRewriter(BinaryContext &BC) {
return std::make_unique<RSeqRewriter>("rseq-cs-rewriter", BC);
}
2 changes: 2 additions & 0 deletions bolt/lib/Rewrite/RewriteInstance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3346,6 +3346,8 @@ void RewriteInstance::initializeMetadataManager() {

MetadataManager.registerRewriter(createPseudoProbeRewriter(*BC));

MetadataManager.registerRewriter(createRSeqRewriter(*BC));

MetadataManager.registerRewriter(createSDTRewriter(*BC));

MetadataManager.registerRewriter(createGNUPropertyRewriter(*BC));
Expand Down
38 changes: 38 additions & 0 deletions bolt/test/X86/rseq.s
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
## Check that llvm-bolt avoids optimization of functions referenced from
## __rseq_cs section, i.e. containing critical sections and abort handlers used
## by restartable sequences in tcmalloc.

# RUN: %clang %cflags %s -o %t -nostdlib -no-pie -Wl,-q
# RUN: llvm-bolt %t -o %t.bolt --print-cfg 2>&1 | FileCheck %s
# RUN: %clang %cflags %s -o %t.pie -nostdlib -pie -Wl,-q
# RUN: llvm-bolt %t.pie -o %t.pie.bolt 2>&1 | FileCheck %s

# CHECK: restartable sequence reference detected in _start
# CHECK: restartable sequence reference detected in __rseq_abort

## Force relocations against .text
.text
.reloc 0, R_X86_64_NONE

.global _start
.type _start, %function
_start:
pushq %rbp
mov %rsp, %rbp
.L1:
pop %rbp
.L2:
retq
.size _start, .-_start

.section __rseq_abort, "ax"
## Signature for rseq abort IP. Unmarked in the symbol table.
.byte 0x0f, 0x1f, 0x05
.long 0x42424242
.L3:
jmp .L2

.section __rseq_cs, "aw"
.balign 32
.quad .L1
.quad .L3
Loading