tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes from topic "revert-3062926-CJGHTRPCBP" into main am: 9fbd7e1026 am: ff4b02d27e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3081452

Change-Id: I9cdcab3d6b9c3053336449bccde57072e4eef9cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dimitry Ivanov 2024-05-10 16:45:09 +00:00 committed by Automerger Merge Worker
commit 21fd5706e5
8 changed files with 14 additions and 246 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
debuggerd/Android.bp
View file

@ -452,7 +452,6 @@ cc_binary {
header_libs: [
"bionic_libc_platform_headers",
"libnative_bridge_support_accessor_headers",
],
static_libs: [
@ -462,8 +461,6 @@ cc_binary {
"libtombstone_proto",
"libprotobuf-cpp-lite",
"libnative_bridge_guest_state_accessor",
],
shared_libs: [
@ -479,15 +476,6 @@ 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 {

154
debuggerd/crash_dump.cpp
View file

@ -25,12 +25,10 @@
#include <sys/wait.h>
#include <unistd.h>
#include <cstdint>
#include <limits>
#include <map>
#include <memory>
#include <set>
#include <string>
#include <vector>
#include <android-base/errno_restorer.h>
@ -44,7 +42,6 @@
#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>
@ -55,18 +52,7 @@
#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"
@ -82,10 +68,6 @@ 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);
@ -421,113 +403,6 @@ static void InstallSigPipeHandler() {
sigaction(SIGPIPE, &action, nullptr);
}
static bool PtracePeek(int request, pid_t tid, uintptr_t addr, void* data, std::string 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(std::unique_ptr<unwindstack::Regs>* regs, pid_t tid) {
NativeBridgeGuestRegs guest_regs;
if (!GetGuestRegistersFromCrashedProcess(tid, &guest_regs)) {
return;
}
switch (guest_regs.guest_arch) {
case NATIVE_BRIDGE_ARCH_ARM: {
unwindstack::arm_user_regs arm_user_regs = {};
for (size_t i = 0; i < unwindstack::ARM_REG_LAST; i++) {
arm_user_regs.regs[i] = guest_regs.regs_arm.r[i];
}
regs->reset(unwindstack::RegsArm::Read(&arm_user_regs));
g_guest_arch = Architecture::ARM32;
break;
}
#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
}
}
int main(int argc, char** argv) {
DefuseSignalHandlers();
InstallSigPipeHandler();
@ -662,7 +537,6 @@ int main(int argc, char** argv) {
}
if (thread == g_target_thread) {
ReadGuestRegisters(&info.guest_registers, thread);
// Read the thread's registers along with the rest of the crash info out of the pipe.
ReadCrashInfo(input_pipe, &siginfo, &info.registers, &process_info, &recoverable_crash);
info.siginfo = &siginfo;
@ -786,32 +660,8 @@ int main(int argc, char** argv) {
{
ATRACE_NAME("engrave_tombstone");
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);
}
engrave_tombstone(std::move(g_output_fd), std::move(g_proto_fd), &unwinder, thread_info,
g_target_thread, process_info, &open_files, &amfd_data);
}
}

8
debuggerd/libdebuggerd/include/libdebuggerd/tombstone.h
View file

@ -28,7 +28,6 @@
#include <android-base/unique_fd.h>
#include "open_files_list.h"
#include "tombstone.pb.h"
#include "types.h"
// Forward declarations
@ -55,17 +54,14 @@ 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, Architecture* guest_arch = nullptr,
unwindstack::AndroidUnwinder* guest_unwinder = nullptr);
std::string* amfd_data);
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,
Architecture* guest_arch,
unwindstack::AndroidUnwinder* guest_unwinder);
const ProcessInfo& process_info, const OpenFilesList* open_files);
bool tombstone_proto_to_text(
const Tombstone& tombstone,

2
debuggerd/libdebuggerd/include/libdebuggerd/types.h
View file

@ -39,8 +39,6 @@ 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.

6
debuggerd/libdebuggerd/tombstone.cpp
View file

@ -125,12 +125,10 @@ 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, Architecture* guest_arch,
unwindstack::AndroidUnwinder* guest_unwinder) {
std::string* amfd_data) {
// 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,
guest_arch, guest_unwinder);
engrave_tombstone_proto(&tombstone, unwinder, threads, target_thread, process_info, open_files);
if (proto_fd != -1) {
if (!tombstone.SerializeToFileDescriptor(proto_fd.get())) {

34
debuggerd/libdebuggerd/tombstone_proto.cpp
View file

@ -482,8 +482,7 @@ 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,
unwindstack::AndroidUnwinder* guest_unwinder = nullptr) {
const ThreadInfo& thread_info, bool memory_dump = false) {
Thread thread;
thread.set_id(thread_info.tid);
@ -510,26 +509,6 @@ 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);
*tombstone->mutable_guest_thread() = guest_thread;
}
}
static void dump_mappings(Tombstone* tombstone, unwindstack::Maps* maps,
@ -707,17 +686,10 @@ 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,
Architecture* guest_arch,
unwindstack::AndroidUnwinder* guest_unwinder) {
const ProcessInfo& process_info, const OpenFilesList* open_files) {
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());
@ -778,7 +750,7 @@ 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, guest_unwinder);
dump_thread(&result, unwinder, target_thread, /* memory_dump */ true);
for (const auto& [tid, thread_info] : threads) {
if (tid != target_tid) {

37
debuggerd/libdebuggerd/tombstone_proto_to_text.cpp
View file

@ -79,8 +79,8 @@ static std::string describe_pac_enabled_keys(long value) {
return describe_end(value, desc);
}
static const char* abi_string(const Architecture& arch) {
switch (arch) {
static const char* abi_string(const Tombstone& tombstone) {
switch (tombstone.arch()) {
case Architecture::ARM32:
return "arm";
case Architecture::ARM64:
@ -578,37 +578,11 @@ void print_logs(CallbackType callback, const Tombstone& tombstone, int tail) {
}
}
static void print_guest_thread(CallbackType callback, const Tombstone& tombstone,
const Thread& guest_thread) {
CBS("--- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---");
CBS("Guest thread information");
print_thread_registers(callback, tombstone, guest_thread, true);
CBS("");
CB(true, "%d total frames", guest_thread.current_backtrace().size());
CB(true, "backtrace:");
print_backtrace(callback, tombstone, guest_thread.current_backtrace(), true);
print_thread_memory_dump(callback, tombstone, guest_thread);
CBS("");
// No memory maps to print.
if (!tombstone.memory_mappings().empty()) {
print_memory_maps(callback, tombstone);
} else {
CBS("No memory maps found");
}
}
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.arch()));
if (tombstone.guest_arch() != Architecture::NONE) {
CBL("Guest architecture: '%s'", abi_string(tombstone.guest_arch()));
}
CBL("ABI: '%s'", abi_string(tombstone));
CBL("Timestamp: %s", tombstone.timestamp().c_str());
CBL("Process uptime: %ds", tombstone.process_uptime());
@ -661,10 +635,5 @@ bool tombstone_proto_to_text(const Tombstone& tombstone, CallbackType callback)
print_logs(callback, tombstone, 0);
// Process guest thread
if (tombstone.has_guest_thread()) {
print_guest_thread(callback, tombstone, tombstone.guest_thread());
}
return true;
}

7
debuggerd/proto/tombstone.proto
View file

@ -22,7 +22,6 @@ message CrashDetail {
message Tombstone {
Architecture arch = 1;
Architecture guest_arch = 24;
string build_fingerprint = 2;
string revision = 3;
string timestamp = 4;
@ -43,7 +42,6 @@ message Tombstone {
repeated Cause causes = 15;
map<uint32, Thread> threads = 16;
Thread guest_thread = 25;
repeated MemoryMapping memory_mappings = 17;
repeated LogBuffer log_buffers = 18;
repeated FD open_fds = 19;
@ -51,7 +49,7 @@ message Tombstone {
uint32 page_size = 22;
bool has_been_16kb_mode = 23;
reserved 26 to 999;
reserved 24 to 999;
}
enum Architecture {
@ -60,9 +58,8 @@ enum Architecture {
X86 = 2;
X86_64 = 3;
RISCV64 = 4;
NONE = 5;
reserved 6 to 999;
reserved 5 to 999;
}
message Signal {