Skip to content

Commit

Permalink
[lldb/MemoryHistoryAsan] Fix address resolution for recorded backtraces
Browse files Browse the repository at this point in the history
Summary:
The memory history plugin for Asan creates a HistoryThread with the
recorded PC values provided by the Asan runtime. In other cases,
thoses PCs are gathered by LLDB directly.

The PCs returned by the Asan runtime are the PCs of the calls in the
backtrace, not the return addresses you would normally get when
unwinding the stack (look for a call to GetPreviousIntructionPc in
AsanGetStack).

When the above addresses are passed to the unwinder, it will subtract
1 from each address of the non zero frames because it treats them as
return addresses. This can lead to the final report referencing the
wrong line.

This patch fixes this issue by threading a flag through HistoryThread
and HistoryUnwinder that tells them to treat every frame like the
first one. The Asan MemoryHistory plugin can then use this flag.

This fixes running TestMemoryHistory on arm64 devices, although it's
hard to guarantee that the test will continue to exhibit the boundary
condition that triggers this bug.

Reviewers: jasonmolenda, kubamracek

Subscribers: kristof.beyls, danielkiss, lldb-commits

Tags: #lldb

Differential Revision: https://reviews.llvm.org/D76341
  • Loading branch information
fredriss committed Mar 18, 2020
1 parent 4be504a commit b40ee7f
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 8 deletions.
7 changes: 6 additions & 1 deletion lldb/source/Plugins/MemoryHistory/asan/MemoryHistoryASan.cpp
Expand Up @@ -138,7 +138,12 @@ static void CreateHistoryThreadFromValueObject(ProcessSP process_sp,
pcs.push_back(pc);
}

HistoryThread *history_thread = new HistoryThread(*process_sp, tid, pcs);
// The ASAN runtime already massages the return addresses into call
// addresses, we don't want LLDB's unwinder to try to locate the previous
// instruction again as this might lead to us reporting a different line.
bool pcs_are_call_addresses = true;
HistoryThread *history_thread =
new HistoryThread(*process_sp, tid, pcs, pcs_are_call_addresses);
ThreadSP new_thread_sp(history_thread);
std::ostringstream thread_name_with_number;
thread_name_with_number << thread_name << " Thread " << tid;
Expand Down
5 changes: 3 additions & 2 deletions lldb/source/Plugins/Process/Utility/HistoryThread.cpp
Expand Up @@ -25,12 +25,13 @@ using namespace lldb_private;
// Constructor

HistoryThread::HistoryThread(lldb_private::Process &process, lldb::tid_t tid,
std::vector<lldb::addr_t> pcs)
std::vector<lldb::addr_t> pcs,
bool pcs_are_call_addresses)
: Thread(process, tid, true), m_framelist_mutex(), m_framelist(),
m_pcs(pcs), m_extended_unwind_token(LLDB_INVALID_ADDRESS), m_queue_name(),
m_thread_name(), m_originating_unique_thread_id(tid),
m_queue_id(LLDB_INVALID_QUEUE_ID) {
m_unwinder_up.reset(new HistoryUnwind(*this, pcs));
m_unwinder_up.reset(new HistoryUnwind(*this, pcs, pcs_are_call_addresses));
Log *log(lldb_private::GetLogIfAllCategoriesSet(LIBLLDB_LOG_OBJECT));
LLDB_LOGF(log, "%p HistoryThread::HistoryThread", static_cast<void *>(this));
}
Expand Down
3 changes: 2 additions & 1 deletion lldb/source/Plugins/Process/Utility/HistoryThread.h
Expand Up @@ -33,7 +33,8 @@ namespace lldb_private {
class HistoryThread : public lldb_private::Thread {
public:
HistoryThread(lldb_private::Process &process, lldb::tid_t tid,
std::vector<lldb::addr_t> pcs);
std::vector<lldb::addr_t> pcs,
bool pcs_are_call_addresses = false);

~HistoryThread() override;

Expand Down
11 changes: 8 additions & 3 deletions lldb/source/Plugins/Process/Utility/HistoryUnwind.cpp
Expand Up @@ -23,8 +23,10 @@ using namespace lldb_private;

// Constructor

HistoryUnwind::HistoryUnwind(Thread &thread, std::vector<lldb::addr_t> pcs)
: Unwind(thread), m_pcs(pcs) {}
HistoryUnwind::HistoryUnwind(Thread &thread, std::vector<lldb::addr_t> pcs,
bool pcs_are_call_addresses)
: Unwind(thread), m_pcs(pcs),
m_pcs_are_call_addresses(pcs_are_call_addresses) {}

// Destructor

Expand Down Expand Up @@ -59,7 +61,10 @@ bool HistoryUnwind::DoGetFrameInfoAtIndex(uint32_t frame_idx, lldb::addr_t &cfa,
if (frame_idx < m_pcs.size()) {
cfa = frame_idx;
pc = m_pcs[frame_idx];
behaves_like_zeroth_frame = (frame_idx == 0);
if (m_pcs_are_call_addresses)
behaves_like_zeroth_frame = true;
else
behaves_like_zeroth_frame = (frame_idx == 0);
return true;
}
return false;
Expand Down
6 changes: 5 additions & 1 deletion lldb/source/Plugins/Process/Utility/HistoryUnwind.h
Expand Up @@ -18,7 +18,8 @@ namespace lldb_private {

class HistoryUnwind : public lldb_private::Unwind {
public:
HistoryUnwind(Thread &thread, std::vector<lldb::addr_t> pcs);
HistoryUnwind(Thread &thread, std::vector<lldb::addr_t> pcs,
bool pcs_are_call_addresses = false);

~HistoryUnwind() override;

Expand All @@ -35,6 +36,9 @@ class HistoryUnwind : public lldb_private::Unwind {

private:
std::vector<lldb::addr_t> m_pcs;
/// This boolean indicates that the PCs in the non-0 frames are call
/// addresses and not return addresses.
bool m_pcs_are_call_addresses;
};

} // namespace lldb_private
Expand Down

0 comments on commit b40ee7f

Please sign in to comment.