This is an archive of the discontinued LLVM Phabricator instance.

Differential D139480

[BOLT] Handle access errors while reading profile
ClosedPublic

Authored by maksfb on Dec 6 2022, 3:56 PM.

Details

Reviewers
yota9
Amir
ayermolo
rafauler
yavtuk
treapster
Commits
rG0f915826cc86: [BOLT] Handle access errors while reading profile
Summary

When the user does not have permissions to access the profile, consume
the error contained in Expected<> to avoid dumping stack to the user.

Diff Detail

Event Timeline

maksfb created this revision.Dec 6 2022, 3:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2022, 3:56 PM
maksfb requested review of this revision.Dec 6 2022, 3:56 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 6 2022, 3:56 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B201522: Diff 480665.Dec 6 2022, 3:57 PM
maksfb updated this revision to Diff 481108.Dec 7 2022, 4:37 PM

Rebase.

Harbormaster completed remote builds in B201848: Diff 481108.Dec 7 2022, 4:51 PM
yavtuk added a comment.Dec 7 2022, 5:01 PM

LGTM

This revision was not accepted when it landed; it landed in state Needs Review.Dec 7 2022, 5:12 PM
Closed by commit rG0f915826cc86: [BOLT] Handle access errors while reading profile (authored by maksfb). · Explain Why
This revision was automatically updated to reflect the committed changes.
maksfb added a commit: rG0f915826cc86: [BOLT] Handle access errors while reading profile.

Revision Contents

PathSize
bolt/
lib/
Profile/
11 lines
test/
13 lines

Diff 481114

bolt/lib/Profile/DataAggregator.cpp

Show First 20 Lines • Show All 321 Lines • ▼ Show 20 Linesvoid DataAggregator::processFileBuildID(StringRef FileBuildID) {
} }
} }
bool DataAggregator::checkPerfDataMagic(StringRef FileName) { bool DataAggregator::checkPerfDataMagic(StringRef FileName) {
if (opts::ReadPreAggregated) if (opts::ReadPreAggregated)
return true; return true;
Expected<sys::fs::file_t> FD = sys::fs::openNativeFileForRead(FileName); Expected<sys::fs::file_t> FD = sys::fs::openNativeFileForRead(FileName);
if (!FD) if (!FD) {
consumeError(FD.takeError());
return false; return false;
}
char Buf[7] = {0, 0, 0, 0, 0, 0, 0}; char Buf[7] = {0, 0, 0, 0, 0, 0, 0};
auto Close = make_scope_exit([&] { sys::fs::closeFile(*FD); }); auto Close = make_scope_exit([&] { sys::fs::closeFile(*FD); });
Expected<size_t> BytesRead = sys::fs::readNativeFileSlice( Expected<size_t> BytesRead = sys::fs::readNativeFileSlice(
*FD, makeMutableArrayRef(Buf, sizeof(Buf)), 0); *FD, makeMutableArrayRef(Buf, sizeof(Buf)), 0);
if (!BytesRead || *BytesRead != 7) if (!BytesRead) {
consumeError(BytesRead.takeError());
return false;
}
if (*BytesRead != 7)
return false; return false;
if (strncmp(Buf, "PERFILE", 7) == 0) if (strncmp(Buf, "PERFILE", 7) == 0)
return true; return true;
return false; return false;
} }
void DataAggregator::parsePreAggregated() { void DataAggregator::parsePreAggregated() {
▲ Show 20 Lines • Show All 1,955 Lines • Show Last 20 Lines

bolt/test/unreadable-profile.test

  • This file was added.
REQUIRES: system-linux
RUN: touch %t.profile && chmod 000 %t.profile
RUN: %clang %S/Inputs/hello.c -o %t
RUN: not llvm-bolt %t -o %t.bolt --data %t.profile 2>&1 \
RUN: | FileCheck %s --check-prefix CHECK-NOPERM
RUN: not llvm-bolt %t -o %t.bolt --data %t.fake.profile 2>&1 \
RUN: | FileCheck %s --check-prefix CHECK-FAKE
## Check that llvm-bolt gracefully handles errors accessing profile data.
CHECK-NOPERM: Permission denied
CHECK-FAKE: No such file or directory