Merge changes from topic "revert-3081452-revert-3062926-CJGHTRPCBP-GUVWVZQSHP" into main am: 4f88e4b79a
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3080066 Change-Id: Ic447425ad46bb3b560941cf035ec07108f3c9a48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sijie Chen
Automerger Merge Worker
commit
4826151723
8 changed files with 237 additions and 15 deletions
|
|
@ -452,6 +452,7 @@ cc_binary {
|
|||
|
||||
header_libs: [
|
||||
"bionic_libc_platform_headers",
|
||||
"libnative_bridge_support_accessor_headers",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
|
|
@ -461,6 +462,8 @@ cc_binary {
|
|||
|
||||
"libtombstone_proto",
|
||||
"libprotobuf-cpp-lite",
|
||||
|
||||
"libnative_bridge_guest_state_accessor",
|
||||
],
|
||||
|
||||
shared_libs: [
|
||||
|
|
@ -476,6 +479,15 @@ cc_binary {
|
|||
|
||||
// Required for tests.
|
||||
required: ["crash_dump.policy"],
|
||||
|
||||
target: {
|
||||
android: {
|
||||
header_libs: [
|
||||
"libnative_bridge_support_accessor_headers", // For dlext_namespaces.h
|
||||
],
|
||||
shared_libs: ["libdl_android"], // For android_get_exported_namespace implementation
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
cc_binary {
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@
|
|||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <cstdint>
|
||||
#include <limits>
|
||||
#include <map>
|
||||
#include <memory>
|
||||
|
|
@ -42,6 +43,7 @@
|
|||
#include <android-base/unique_fd.h>
|
||||
#include <bionic/macros.h>
|
||||
#include <bionic/reserved_signals.h>
|
||||
#include <bionic/tls_defines.h>
|
||||
#include <cutils/sockets.h>
|
||||
#include <log/log.h>
|
||||
#include <private/android_filesystem_config.h>
|
||||
|
|
@ -52,7 +54,18 @@
|
|||
|
||||
#include <unwindstack/AndroidUnwinder.h>
|
||||
#include <unwindstack/Error.h>
|
||||
#include <unwindstack/MachineArm.h>
|
||||
#include <unwindstack/MachineArm64.h>
|
||||
#include <unwindstack/MachineRiscv64.h>
|
||||
#include <unwindstack/Regs.h>
|
||||
#include <unwindstack/RegsArm.h>
|
||||
#include <unwindstack/RegsArm64.h>
|
||||
#include <unwindstack/RegsRiscv64.h>
|
||||
#include <unwindstack/UserArm.h>
|
||||
#include <unwindstack/UserArm64.h>
|
||||
#include <unwindstack/UserRiscv64.h>
|
||||
|
||||
#include <native_bridge_support/guest_state_accessor/accessor.h>
|
||||
|
||||
#include "libdebuggerd/backtrace.h"
|
||||
#include "libdebuggerd/tombstone.h"
|
||||
|
|
@ -68,6 +81,10 @@ using android::base::ErrnoRestorer;
|
|||
using android::base::StringPrintf;
|
||||
using android::base::unique_fd;
|
||||
|
||||
// This stores guest architecture. When the architecture is supported, tombstone file will output
|
||||
// guest state information.
|
||||
static Architecture g_guest_arch;
|
||||
|
||||
static bool pid_contains_tid(int pid_proc_fd, pid_t tid) {
|
||||
struct stat st;
|
||||
std::string task_path = StringPrintf("task/%d", tid);
|
||||
|
|
@ -403,6 +420,107 @@ static void InstallSigPipeHandler() {
|
|||
sigaction(SIGPIPE, &action, nullptr);
|
||||
}
|
||||
|
||||
static bool PtracePeek(int request, pid_t tid, uintptr_t addr, void* data, std::string_view err_msg,
|
||||
uintptr_t* result) {
|
||||
errno = 0;
|
||||
*result = ptrace(request, tid, addr, data);
|
||||
if (errno != 0) {
|
||||
PLOG(ERROR) << err_msg;
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool GetGuestRegistersFromCrashedProcess([[maybe_unused]] pid_t tid,
|
||||
NativeBridgeGuestRegs* guest_regs) {
|
||||
auto process_memory = unwindstack::Memory::CreateProcessMemoryCached(tid);
|
||||
|
||||
uintptr_t header_ptr = 0;
|
||||
uintptr_t base = 0;
|
||||
#if defined(__x86_64__)
|
||||
if (!PtracePeek(PTRACE_PEEKUSER, tid, offsetof(user_regs_struct, fs_base), nullptr,
|
||||
"failed to read thread register for thread " + std::to_string(tid), &base)) {
|
||||
return false;
|
||||
}
|
||||
#elif defined(__aarch64__)
|
||||
// base is implicitly casted to uint64_t.
|
||||
struct iovec pt_iov {
|
||||
.iov_base = &base, .iov_len = sizeof(base),
|
||||
};
|
||||
|
||||
if (ptrace(PTRACE_GETREGSET, tid, NT_ARM_TLS, &pt_iov) != 0) {
|
||||
PLOG(ERROR) << "failed to read thread register for thread " << tid;
|
||||
}
|
||||
#else
|
||||
// TODO(b/339287219): Add case for Riscv host.
|
||||
return false;
|
||||
#endif
|
||||
auto ptr_to_guest_slot = base + TLS_SLOT_NATIVE_BRIDGE_GUEST_STATE * sizeof(uintptr_t);
|
||||
if (!process_memory->ReadFully(ptr_to_guest_slot, &header_ptr, sizeof(uintptr_t))) {
|
||||
PLOG(ERROR) << "failed to get guest state TLS slot content for thread " << tid;
|
||||
return false;
|
||||
}
|
||||
|
||||
NativeBridgeGuestStateHeader header;
|
||||
if (!process_memory->ReadFully(header_ptr, &header, sizeof(NativeBridgeGuestStateHeader))) {
|
||||
PLOG(ERROR) << "failed to get the guest state header for thread " << tid;
|
||||
return false;
|
||||
}
|
||||
if (header.signature != NATIVE_BRIDGE_GUEST_STATE_SIGNATURE) {
|
||||
// Return when ptr points to unmapped memory or no valid guest state.
|
||||
return false;
|
||||
}
|
||||
auto guest_state_data_copy = std::make_unique<unsigned char[]>(header.guest_state_data_size);
|
||||
if (!process_memory->ReadFully(reinterpret_cast<uintptr_t>(header.guest_state_data),
|
||||
guest_state_data_copy.get(), header.guest_state_data_size)) {
|
||||
PLOG(ERROR) << "failed to read the guest state data for thread " << tid;
|
||||
return false;
|
||||
}
|
||||
|
||||
LoadGuestStateRegisters(guest_state_data_copy.get(), header.guest_state_data_size, guest_regs);
|
||||
return true;
|
||||
}
|
||||
|
||||
static void ReadGuestRegisters([[maybe_unused]] std::unique_ptr<unwindstack::Regs>* regs,
|
||||
pid_t tid) {
|
||||
// TODO: remove [[maybe_unused]], when the ARM32 case is removed from the native bridge support.
|
||||
NativeBridgeGuestRegs guest_regs;
|
||||
if (!GetGuestRegistersFromCrashedProcess(tid, &guest_regs)) {
|
||||
return;
|
||||
}
|
||||
|
||||
switch (guest_regs.guest_arch) {
|
||||
#if defined(__LP64__)
|
||||
case NATIVE_BRIDGE_ARCH_ARM64: {
|
||||
unwindstack::arm64_user_regs arm64_user_regs = {};
|
||||
for (size_t i = 0; i < unwindstack::ARM64_REG_R31; i++) {
|
||||
arm64_user_regs.regs[i] = guest_regs.regs_arm64.x[i];
|
||||
}
|
||||
arm64_user_regs.sp = guest_regs.regs_arm64.sp;
|
||||
arm64_user_regs.pc = guest_regs.regs_arm64.ip;
|
||||
regs->reset(unwindstack::RegsArm64::Read(&arm64_user_regs));
|
||||
|
||||
g_guest_arch = Architecture::ARM64;
|
||||
break;
|
||||
}
|
||||
case NATIVE_BRIDGE_ARCH_RISCV64: {
|
||||
unwindstack::riscv64_user_regs riscv64_user_regs = {};
|
||||
// RISCV64_REG_PC is at the first position.
|
||||
riscv64_user_regs.regs[0] = guest_regs.regs_riscv64.ip;
|
||||
for (size_t i = 1; i < unwindstack::RISCV64_REG_REAL_COUNT; i++) {
|
||||
riscv64_user_regs.regs[i] = guest_regs.regs_riscv64.x[i];
|
||||
}
|
||||
regs->reset(unwindstack::RegsRiscv64::Read(&riscv64_user_regs, tid));
|
||||
|
||||
g_guest_arch = Architecture::RISCV64;
|
||||
break;
|
||||
}
|
||||
#endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
DefuseSignalHandlers();
|
||||
InstallSigPipeHandler();
|
||||
|
|
@ -551,6 +669,7 @@ int main(int argc, char** argv) {
|
|||
continue;
|
||||
}
|
||||
}
|
||||
ReadGuestRegisters(&info.guest_registers, thread);
|
||||
|
||||
thread_info[thread] = std::move(info);
|
||||
}
|
||||
|
|
@ -660,8 +779,32 @@ int main(int argc, char** argv) {
|
|||
|
||||
{
|
||||
ATRACE_NAME("engrave_tombstone");
|
||||
engrave_tombstone(std::move(g_output_fd), std::move(g_proto_fd), &unwinder, thread_info,
|
||||
g_target_thread, process_info, &open_files, &amfd_data);
|
||||
unwindstack::ArchEnum regs_arch = unwindstack::ARCH_UNKNOWN;
|
||||
switch (g_guest_arch) {
|
||||
case Architecture::ARM32: {
|
||||
regs_arch = unwindstack::ARCH_ARM;
|
||||
break;
|
||||
}
|
||||
case Architecture::ARM64: {
|
||||
regs_arch = unwindstack::ARCH_ARM64;
|
||||
break;
|
||||
}
|
||||
case Architecture::RISCV64: {
|
||||
regs_arch = unwindstack::ARCH_RISCV64;
|
||||
break;
|
||||
}
|
||||
default: {
|
||||
}
|
||||
}
|
||||
if (regs_arch == unwindstack::ARCH_UNKNOWN) {
|
||||
engrave_tombstone(std::move(g_output_fd), std::move(g_proto_fd), &unwinder, thread_info,
|
||||
g_target_thread, process_info, &open_files, &amfd_data);
|
||||
} else {
|
||||
unwindstack::AndroidRemoteUnwinder guest_unwinder(vm_pid, regs_arch);
|
||||
engrave_tombstone(std::move(g_output_fd), std::move(g_proto_fd), &unwinder, thread_info,
|
||||
g_target_thread, process_info, &open_files, &amfd_data, &g_guest_arch,
|
||||
&guest_unwinder);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include <android-base/unique_fd.h>
|
||||
|
||||
#include "open_files_list.h"
|
||||
#include "tombstone.pb.h"
|
||||
#include "types.h"
|
||||
|
||||
// Forward declarations
|
||||
|
|
@ -54,14 +55,17 @@ void engrave_tombstone(android::base::unique_fd output_fd, android::base::unique
|
|||
unwindstack::AndroidUnwinder* unwinder,
|
||||
const std::map<pid_t, ThreadInfo>& thread_info, pid_t target_thread,
|
||||
const ProcessInfo& process_info, OpenFilesList* open_files,
|
||||
std::string* amfd_data);
|
||||
std::string* amfd_data, const Architecture* guest_arch = nullptr,
|
||||
unwindstack::AndroidUnwinder* guest_unwinder = nullptr);
|
||||
|
||||
void engrave_tombstone_ucontext(int tombstone_fd, int proto_fd, uint64_t abort_msg_address,
|
||||
siginfo_t* siginfo, ucontext_t* ucontext);
|
||||
|
||||
void engrave_tombstone_proto(Tombstone* tombstone, unwindstack::AndroidUnwinder* unwinder,
|
||||
const std::map<pid_t, ThreadInfo>& threads, pid_t target_thread,
|
||||
const ProcessInfo& process_info, const OpenFilesList* open_files);
|
||||
const ProcessInfo& process_info, const OpenFilesList* open_files,
|
||||
const Architecture* guest_arch,
|
||||
unwindstack::AndroidUnwinder* guest_unwinder);
|
||||
|
||||
bool tombstone_proto_to_text(
|
||||
const Tombstone& tombstone,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,8 @@ struct ThreadInfo {
|
|||
|
||||
int signo = 0;
|
||||
siginfo_t* siginfo = nullptr;
|
||||
|
||||
std::unique_ptr<unwindstack::Regs> guest_registers;
|
||||
};
|
||||
|
||||
// This struct is written into a pipe from inside the crashing process.
|
||||
|
|
|
|||
|
|
@ -125,10 +125,12 @@ void engrave_tombstone(unique_fd output_fd, unique_fd proto_fd,
|
|||
unwindstack::AndroidUnwinder* unwinder,
|
||||
const std::map<pid_t, ThreadInfo>& threads, pid_t target_thread,
|
||||
const ProcessInfo& process_info, OpenFilesList* open_files,
|
||||
std::string* amfd_data) {
|
||||
std::string* amfd_data, const Architecture* guest_arch,
|
||||
unwindstack::AndroidUnwinder* guest_unwinder) {
|
||||
// Don't copy log messages to tombstone unless this is a development device.
|
||||
Tombstone tombstone;
|
||||
engrave_tombstone_proto(&tombstone, unwinder, threads, target_thread, process_info, open_files);
|
||||
engrave_tombstone_proto(&tombstone, unwinder, threads, target_thread, process_info, open_files,
|
||||
guest_arch, guest_unwinder);
|
||||
|
||||
if (proto_fd != -1) {
|
||||
if (!tombstone.SerializeToFileDescriptor(proto_fd.get())) {
|
||||
|
|
|
|||
|
|
@ -482,7 +482,8 @@ static void dump_thread_backtrace(std::vector<unwindstack::FrameData>& frames, T
|
|||
}
|
||||
|
||||
static void dump_thread(Tombstone* tombstone, unwindstack::AndroidUnwinder* unwinder,
|
||||
const ThreadInfo& thread_info, bool memory_dump = false) {
|
||||
const ThreadInfo& thread_info, bool memory_dump = false,
|
||||
unwindstack::AndroidUnwinder* guest_unwinder = nullptr) {
|
||||
Thread thread;
|
||||
|
||||
thread.set_id(thread_info.tid);
|
||||
|
|
@ -509,6 +510,27 @@ static void dump_thread(Tombstone* tombstone, unwindstack::AndroidUnwinder* unwi
|
|||
|
||||
auto& threads = *tombstone->mutable_threads();
|
||||
threads[thread_info.tid] = thread;
|
||||
|
||||
if (guest_unwinder) {
|
||||
if (!thread_info.guest_registers) {
|
||||
async_safe_format_log(ANDROID_LOG_INFO, LOG_TAG,
|
||||
"No guest state registers information for tid %d", thread_info.tid);
|
||||
return;
|
||||
}
|
||||
Thread guest_thread;
|
||||
unwindstack::AndroidUnwinderData guest_data;
|
||||
guest_data.saved_initial_regs = std::make_optional<std::unique_ptr<unwindstack::Regs>>();
|
||||
if (guest_unwinder->Unwind(thread_info.guest_registers.get(), guest_data)) {
|
||||
dump_thread_backtrace(guest_data.frames, guest_thread);
|
||||
} else {
|
||||
async_safe_format_log(ANDROID_LOG_ERROR, LOG_TAG,
|
||||
"Unwind guest state registers failed for tid %d: Error %s",
|
||||
thread_info.tid, guest_data.GetErrorString().c_str());
|
||||
}
|
||||
dump_registers(guest_unwinder, *guest_data.saved_initial_regs, guest_thread, memory_dump);
|
||||
auto& guest_threads = *tombstone->mutable_guest_threads();
|
||||
guest_threads[thread_info.tid] = guest_thread;
|
||||
}
|
||||
}
|
||||
|
||||
static void dump_mappings(Tombstone* tombstone, unwindstack::Maps* maps,
|
||||
|
|
@ -686,10 +708,17 @@ static void dump_tags_around_fault_addr(Signal* signal, const Tombstone& tombsto
|
|||
|
||||
void engrave_tombstone_proto(Tombstone* tombstone, unwindstack::AndroidUnwinder* unwinder,
|
||||
const std::map<pid_t, ThreadInfo>& threads, pid_t target_tid,
|
||||
const ProcessInfo& process_info, const OpenFilesList* open_files) {
|
||||
const ProcessInfo& process_info, const OpenFilesList* open_files,
|
||||
const Architecture* guest_arch,
|
||||
unwindstack::AndroidUnwinder* guest_unwinder) {
|
||||
Tombstone result;
|
||||
|
||||
result.set_arch(get_arch());
|
||||
if (guest_arch != nullptr) {
|
||||
result.set_guest_arch(*guest_arch);
|
||||
} else {
|
||||
result.set_guest_arch(Architecture::NONE);
|
||||
}
|
||||
result.set_build_fingerprint(android::base::GetProperty("ro.build.fingerprint", "unknown"));
|
||||
result.set_revision(android::base::GetProperty("ro.revision", "unknown"));
|
||||
result.set_timestamp(get_timestamp());
|
||||
|
|
@ -750,11 +779,11 @@ void engrave_tombstone_proto(Tombstone* tombstone, unwindstack::AndroidUnwinder*
|
|||
dump_abort_message(&result, unwinder->GetProcessMemory(), process_info);
|
||||
dump_crash_details(&result, unwinder->GetProcessMemory(), process_info);
|
||||
// Dump the target thread, but save the memory around the registers.
|
||||
dump_thread(&result, unwinder, target_thread, /* memory_dump */ true);
|
||||
dump_thread(&result, unwinder, target_thread, /* memory_dump */ true, guest_unwinder);
|
||||
|
||||
for (const auto& [tid, thread_info] : threads) {
|
||||
if (tid != target_tid) {
|
||||
dump_thread(&result, unwinder, thread_info);
|
||||
dump_thread(&result, unwinder, thread_info, /* memory_dump */ false, guest_unwinder);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@ static std::string describe_pac_enabled_keys(long value) {
|
|||
return describe_end(value, desc);
|
||||
}
|
||||
|
||||
static const char* abi_string(const Tombstone& tombstone) {
|
||||
switch (tombstone.arch()) {
|
||||
static const char* abi_string(const Architecture& arch) {
|
||||
switch (arch) {
|
||||
case Architecture::ARM32:
|
||||
return "arm";
|
||||
case Architecture::ARM64:
|
||||
|
|
@ -578,11 +578,28 @@ void print_logs(CallbackType callback, const Tombstone& tombstone, int tail) {
|
|||
}
|
||||
}
|
||||
|
||||
static void print_guest_thread(CallbackType callback, const Tombstone& tombstone,
|
||||
const Thread& guest_thread, pid_t tid, bool should_log) {
|
||||
CBS("--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---");
|
||||
CBS("Guest thread information for tid: %d", tid);
|
||||
print_thread_registers(callback, tombstone, guest_thread, should_log);
|
||||
|
||||
CBS("");
|
||||
CB(true, "%d total frames", guest_thread.current_backtrace().size());
|
||||
CB(true, "backtrace:");
|
||||
print_backtrace(callback, tombstone, guest_thread.current_backtrace(), should_log);
|
||||
|
||||
print_thread_memory_dump(callback, tombstone, guest_thread);
|
||||
}
|
||||
|
||||
bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback) {
|
||||
CBL("*** *** *** *** *** *** *** *** *** *** *** *** *** *** *** ***");
|
||||
CBL("Build fingerprint: '%s'", tombstone.build_fingerprint().c_str());
|
||||
CBL("Revision: '%s'", tombstone.revision().c_str());
|
||||
CBL("ABI: '%s'", abi_string(tombstone));
|
||||
CBL("ABI: '%s'", abi_string(tombstone.arch()));
|
||||
if (tombstone.guest_arch() != Architecture::NONE) {
|
||||
CBL("Guest architecture: '%s'", abi_string(tombstone.guest_arch()));
|
||||
}
|
||||
CBL("Timestamp: %s", tombstone.timestamp().c_str());
|
||||
CBL("Process uptime: %ds", tombstone.process_uptime());
|
||||
|
||||
|
|
@ -607,6 +624,12 @@ bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback)
|
|||
|
||||
print_logs(callback, tombstone, 50);
|
||||
|
||||
const auto& guest_threads = tombstone.guest_threads();
|
||||
auto main_guest_thread_it = guest_threads.find(tombstone.tid());
|
||||
if (main_guest_thread_it != threads.end()) {
|
||||
print_guest_thread(callback, tombstone, main_guest_thread_it->second, tombstone.tid(), true);
|
||||
}
|
||||
|
||||
// protobuf's map is unordered, so sort the keys first.
|
||||
std::set<int> thread_ids;
|
||||
for (const auto& [tid, _] : threads) {
|
||||
|
|
@ -618,6 +641,10 @@ bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback)
|
|||
for (const auto& tid : thread_ids) {
|
||||
CBS("--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---");
|
||||
print_thread(callback, tombstone, threads.find(tid)->second);
|
||||
auto guest_thread_it = guest_threads.find(tid);
|
||||
if (guest_thread_it != guest_threads.end()) {
|
||||
print_guest_thread(callback, tombstone, guest_thread_it->second, tid, false);
|
||||
}
|
||||
}
|
||||
|
||||
if (tombstone.open_fds().size() > 0) {
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ message CrashDetail {
|
|||
|
||||
message Tombstone {
|
||||
Architecture arch = 1;
|
||||
Architecture guest_arch = 24;
|
||||
string build_fingerprint = 2;
|
||||
string revision = 3;
|
||||
string timestamp = 4;
|
||||
|
|
@ -42,6 +43,7 @@ message Tombstone {
|
|||
repeated Cause causes = 15;
|
||||
|
||||
map<uint32, Thread> threads = 16;
|
||||
map<uint32, Thread> guest_threads = 25;
|
||||
repeated MemoryMapping memory_mappings = 17;
|
||||
repeated LogBuffer log_buffers = 18;
|
||||
repeated FD open_fds = 19;
|
||||
|
|
@ -49,7 +51,7 @@ message Tombstone {
|
|||
uint32 page_size = 22;
|
||||
bool has_been_16kb_mode = 23;
|
||||
|
||||
reserved 24 to 999;
|
||||
reserved 26 to 999;
|
||||
}
|
||||
|
||||
enum Architecture {
|
||||
|
|
@ -58,8 +60,9 @@ enum Architecture {
|
|||
X86 = 2;
|
||||
X86_64 = 3;
|
||||
RISCV64 = 4;
|
||||
NONE = 5;
|
||||
|
||||
reserved 5 to 999;
|
||||
reserved 6 to 999;
|
||||
}
|
||||
|
||||
message Signal {
|
||||
|
|
|
|||
Loading…
Reference in a new issue