diff --git a/debuggerd/Android.bp b/debuggerd/Android.bp index 4783d6e56..79d5c0862 100644 --- a/debuggerd/Android.bp +++ b/debuggerd/Android.bp @@ -9,10 +9,6 @@ cc_defaults { "-Os", ], - // util.cpp gets async signal safe logging via libc_logging, - // which defines its interface in bionic private headers. - include_dirs: ["bionic/libc"], - local_include_dirs: ["include"], } @@ -26,7 +22,7 @@ cc_library_static { ], whole_static_libs: [ - "libc_logging", + "libasync_safe", "libcutils", "libbase", ], @@ -39,7 +35,7 @@ cc_library_static { srcs: ["handler/debuggerd_handler.cpp"], whole_static_libs: [ - "libc_logging", + "libasync_safe", "libdebuggerd", ], @@ -70,6 +66,7 @@ cc_library_static { whole_static_libs: [ "libdebuggerd_handler_core", "libtombstoned_client", + "libasync_safe", "libbase", "libdebuggerd", "libbacktrace", @@ -166,6 +163,7 @@ cc_test { "tombstoned_client.cpp", "util.cpp" ], + static_libs: ["libasync_safe"], }, }, @@ -178,7 +176,6 @@ cc_test { static_libs: [ "libdebuggerd", - "libc_logging", ], local_include_dirs: [ diff --git a/debuggerd/handler/debuggerd_fallback.cpp b/debuggerd/handler/debuggerd_fallback.cpp index 5c6c59c2c..47c98d1c9 100644 --- a/debuggerd/handler/debuggerd_fallback.cpp +++ b/debuggerd/handler/debuggerd_fallback.cpp @@ -39,6 +39,7 @@ #include #include +#include #include "debuggerd/handler.h" #include "debuggerd/tombstoned.h" @@ -47,8 +48,6 @@ #include "backtrace.h" #include "tombstone.h" -#include "private/libc_logging.h" - using android::base::unique_fd; extern "C" void __linker_enable_fallback_allocator(); @@ -81,7 +80,7 @@ static void iterate_siblings(bool (*callback)(pid_t, int), int output_fd) { DIR* dir = opendir(buf); if (!dir) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to open %s: %s", buf, strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "failed to open %s: %s", buf, strerror(errno)); return; } @@ -145,7 +144,8 @@ static void trace_handler(siginfo_t* info, ucontext_t* ucontext) { static pthread_mutex_t trace_mutex = PTHREAD_MUTEX_INITIALIZER; int ret = pthread_mutex_trylock(&trace_mutex); if (ret != 0) { - __libc_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_try_lock failed: %s", strerror(ret)); + async_safe_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_try_lock failed: %s", + strerror(ret)); return; } @@ -167,7 +167,8 @@ static void trace_handler(siginfo_t* info, ucontext_t* ucontext) { // receiving our signal. unique_fd pipe_read, pipe_write; if (!Pipe(&pipe_read, &pipe_write)) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to create pipe: %s", strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "failed to create pipe: %s", + strerror(errno)); return false; } @@ -180,8 +181,8 @@ static void trace_handler(siginfo_t* info, ucontext_t* ucontext) { siginfo.si_uid = getuid(); if (syscall(__NR_rt_tgsigqueueinfo, getpid(), tid, DEBUGGER_SIGNAL, &siginfo) != 0) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to send trace signal to %d: %s", tid, - strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "failed to send trace signal to %d: %s", + tid, strerror(errno)); return false; } @@ -209,7 +210,7 @@ static void crash_handler(siginfo_t* info, ucontext_t* ucontext, void* abort_mes static pthread_mutex_t crash_mutex = PTHREAD_MUTEX_INITIALIZER; int ret = pthread_mutex_lock(&crash_mutex); if (ret != 0) { - __libc_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_lock failed: %s", strerror(ret)); + async_safe_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_lock failed: %s", strerror(ret)); return; } diff --git a/debuggerd/handler/debuggerd_handler.cpp b/debuggerd/handler/debuggerd_handler.cpp index b70554f66..6e3e6acd1 100644 --- a/debuggerd/handler/debuggerd_handler.cpp +++ b/debuggerd/handler/debuggerd_handler.cpp @@ -48,8 +48,7 @@ #include #include -#include "private/bionic_futex.h" -#include "private/libc_logging.h" +#include // see man(2) prctl, specifically the section about PR_GET_NAME #define MAX_TASK_NAME_LEN (16) @@ -62,6 +61,10 @@ #define CRASH_DUMP_PATH "/system/bin/" CRASH_DUMP_NAME +static inline void futex_wait(volatile void* ftx, int value) { + syscall(__NR_futex, ftx, FUTEX_WAIT, value, nullptr, nullptr, 0); +} + class ErrnoRestorer { public: ErrnoRestorer() : saved_errno_(errno) { @@ -82,11 +85,12 @@ static debuggerd_callbacks_t g_callbacks; // Mutex to ensure only one crashing thread dumps itself. static pthread_mutex_t crash_mutex = PTHREAD_MUTEX_INITIALIZER; -// Don't use __libc_fatal because it exits via abort, which might put us back into a signal handler. +// Don't use async_safe_fatal because it exits via abort, which might put us back into +// a signal handler. static void __noreturn __printflike(1, 2) fatal(const char* fmt, ...) { va_list args; va_start(args, fmt); - __libc_format_log_va_list(ANDROID_LOG_FATAL, "libc", fmt, args); + async_safe_format_log_va_list(ANDROID_LOG_FATAL, "libc", fmt, args); _exit(1); } @@ -96,7 +100,7 @@ static void __noreturn __printflike(1, 2) fatal_errno(const char* fmt, ...) { va_start(args, fmt); char buf[4096]; - __libc_format_buffer_va_list(buf, sizeof(buf), fmt, args); + async_safe_format_buffer_va_list(buf, sizeof(buf), fmt, args); fatal("%s: %s", buf, strerror(err)); } @@ -120,8 +124,8 @@ static void log_signal_summary(int signum, const siginfo_t* info) { } if (signum == DEBUGGER_SIGNAL) { - __libc_format_log(ANDROID_LOG_INFO, "libc", "Requested dump for tid %d (%s)", gettid(), - thread_name); + async_safe_format_log(ANDROID_LOG_INFO, "libc", "Requested dump for tid %d (%s)", gettid(), + thread_name); return; } @@ -166,14 +170,14 @@ static void log_signal_summary(int signum, const siginfo_t* info) { char addr_desc[32]; // ", fault addr 0x1234" addr_desc[0] = code_desc[0] = 0; if (info != nullptr) { - __libc_format_buffer(code_desc, sizeof(code_desc), ", code %d", info->si_code); + async_safe_format_buffer(code_desc, sizeof(code_desc), ", code %d", info->si_code); if (has_address) { - __libc_format_buffer(addr_desc, sizeof(addr_desc), ", fault addr %p", info->si_addr); + async_safe_format_buffer(addr_desc, sizeof(addr_desc), ", fault addr %p", info->si_addr); } } - __libc_format_log(ANDROID_LOG_FATAL, "libc", "Fatal signal %d (%s)%s%s in tid %d (%s)", signum, - signal_name, code_desc, addr_desc, gettid(), thread_name); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "Fatal signal %d (%s)%s%s in tid %d (%s)", + signum, signal_name, code_desc, addr_desc, gettid(), thread_name); } /* @@ -182,8 +186,8 @@ static void log_signal_summary(int signum, const siginfo_t* info) { static bool have_siginfo(int signum) { struct sigaction old_action; if (sigaction(signum, nullptr, &old_action) < 0) { - __libc_format_log(ANDROID_LOG_WARN, "libc", "Failed testing for SA_SIGINFO: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_WARN, "libc", "Failed testing for SA_SIGINFO: %s", + strerror(errno)); return false; } return (old_action.sa_flags & SA_SIGINFO) != 0; @@ -207,7 +211,7 @@ static void raise_caps() { capdata[1].inheritable = capdata[1].permitted; if (capset(&capheader, &capdata[0]) == -1) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "capset failed: %s", strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "capset failed: %s", strerror(errno)); } } @@ -217,8 +221,8 @@ static void raise_caps() { for (unsigned long i = 0; i < 64; ++i) { if (capmask & (1ULL << i)) { if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, i, 0, 0) != 0) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to raise ambient capability %lu: %s", - i, strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", + "failed to raise ambient capability %lu: %s", i, strerror(errno)); } } } @@ -260,8 +264,8 @@ static int debuggerd_dispatch_pseudothread(void* arg) { // Don't use fork(2) to avoid calling pthread_atfork handlers. int forkpid = clone(nullptr, nullptr, 0, nullptr); if (forkpid == -1) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "failed to fork in debuggerd signal handler: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", + "failed to fork in debuggerd signal handler: %s", strerror(errno)); } else if (forkpid == 0) { TEMP_FAILURE_RETRY(dup2(pipefds[1], STDOUT_FILENO)); close(pipefds[0]); @@ -271,8 +275,9 @@ static int debuggerd_dispatch_pseudothread(void* arg) { char main_tid[10]; char pseudothread_tid[10]; - __libc_format_buffer(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid); - __libc_format_buffer(pseudothread_tid, sizeof(pseudothread_tid), "%d", thread_info->pseudothread_tid); + async_safe_format_buffer(main_tid, sizeof(main_tid), "%d", thread_info->crashing_tid); + async_safe_format_buffer(pseudothread_tid, sizeof(pseudothread_tid), "%d", + thread_info->pseudothread_tid); execl(CRASH_DUMP_PATH, CRASH_DUMP_NAME, main_tid, pseudothread_tid, nullptr); @@ -282,15 +287,16 @@ static int debuggerd_dispatch_pseudothread(void* arg) { char buf[4]; ssize_t rc = TEMP_FAILURE_RETRY(read(pipefds[0], &buf, sizeof(buf))); if (rc == -1) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "read of IPC pipe failed: %s", strerror(errno)); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "read of IPC pipe failed: %s", + strerror(errno)); } else if (rc == 0) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper failed to exec"); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper failed to exec"); } else if (rc != 1) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", - "read of IPC pipe returned unexpected value: %zd", rc); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", + "read of IPC pipe returned unexpected value: %zd", rc); } else { if (buf[0] != '\1') { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper reported failure"); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper reported failure"); } else { thread_info->crash_dump_started = true; } @@ -300,10 +306,10 @@ static int debuggerd_dispatch_pseudothread(void* arg) { // Don't leave a zombie child. int status; if (TEMP_FAILURE_RETRY(waitpid(forkpid, &status, 0)) == -1) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "failed to wait for crash_dump helper: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "failed to wait for crash_dump helper: %s", + strerror(errno)); } else if (WIFSTOPPED(status) || WIFSIGNALED(status)) { - __libc_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper crashed or stopped"); + async_safe_format_log(ANDROID_LOG_FATAL, "libc", "crash_dump helper crashed or stopped"); thread_info->crash_dump_started = false; } } @@ -383,7 +389,7 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c // Only allow one thread to handle a signal at a time. int ret = pthread_mutex_lock(&crash_mutex); if (ret != 0) { - __libc_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_lock failed: %s", strerror(ret)); + async_safe_format_log(ANDROID_LOG_INFO, "libc", "pthread_mutex_lock failed: %s", strerror(ret)); return; } @@ -419,10 +425,10 @@ static void debuggerd_signal_handler(int signal_number, siginfo_t* info, void* c } // Wait for the child to start... - __futex_wait(&thread_info.pseudothread_tid, -1, nullptr); + futex_wait(&thread_info.pseudothread_tid, -1); // and then wait for it to finish. - __futex_wait(&thread_info.pseudothread_tid, child_pid, nullptr); + futex_wait(&thread_info.pseudothread_tid, child_pid); // Restore PR_SET_DUMPABLE to its original value. if (prctl(PR_SET_DUMPABLE, orig_dumpable) != 0) { diff --git a/debuggerd/tombstoned_client.cpp b/debuggerd/tombstoned_client.cpp index 03b4a20bb..4741fa6b1 100644 --- a/debuggerd/tombstoned_client.cpp +++ b/debuggerd/tombstoned_client.cpp @@ -22,11 +22,11 @@ #include #include +#include #include #include "debuggerd/protocol.h" #include "debuggerd/util.h" -#include "private/libc_logging.h" using android::base::unique_fd; @@ -34,8 +34,8 @@ bool tombstoned_connect(pid_t pid, unique_fd* tombstoned_socket, unique_fd* outp unique_fd sockfd(socket_local_client(kTombstonedCrashSocketName, ANDROID_SOCKET_NAMESPACE_RESERVED, SOCK_SEQPACKET)); if (sockfd == -1) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to connect to tombstoned: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "failed to connect to tombstoned: %s", + strerror(errno)); return false; } @@ -43,22 +43,22 @@ bool tombstoned_connect(pid_t pid, unique_fd* tombstoned_socket, unique_fd* outp packet.packet_type = CrashPacketType::kDumpRequest; packet.packet.dump_request.pid = pid; if (TEMP_FAILURE_RETRY(write(sockfd, &packet, sizeof(packet))) != sizeof(packet)) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", "failed to write DumpRequest packet: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", "failed to write DumpRequest packet: %s", + strerror(errno)); return false; } unique_fd tmp_output_fd; ssize_t rc = recv_fd(sockfd, &packet, sizeof(packet), &tmp_output_fd); if (rc == -1) { - __libc_format_log(ANDROID_LOG_ERROR, "libc", - "failed to read response to DumpRequest packet: %s", strerror(errno)); + async_safe_format_log(ANDROID_LOG_ERROR, "libc", + "failed to read response to DumpRequest packet: %s", strerror(errno)); return false; } else if (rc != sizeof(packet)) { - __libc_format_log( - ANDROID_LOG_ERROR, "libc", - "received DumpRequest response packet of incorrect length (expected %zu, got %zd)", - sizeof(packet), rc); + async_safe_format_log( + ANDROID_LOG_ERROR, "libc", + "received DumpRequest response packet of incorrect length (expected %zu, got %zd)", + sizeof(packet), rc); return false; } @@ -67,8 +67,8 @@ bool tombstoned_connect(pid_t pid, unique_fd* tombstoned_socket, unique_fd* outp // a regular fd, and writing to an fd with O_APPEND). int flags = fcntl(tmp_output_fd.get(), F_GETFL); if (fcntl(tmp_output_fd.get(), F_SETFL, flags | O_APPEND) != 0) { - __libc_format_log(ANDROID_LOG_WARN, "libc", "failed to set output fd flags: %s", - strerror(errno)); + async_safe_format_log(ANDROID_LOG_WARN, "libc", "failed to set output fd flags: %s", + strerror(errno)); } *tombstoned_socket = std::move(sockfd); diff --git a/debuggerd/util.cpp b/debuggerd/util.cpp index 4c015d70a..32d2f1880 100644 --- a/debuggerd/util.cpp +++ b/debuggerd/util.cpp @@ -24,8 +24,6 @@ #include #include -#include "private/libc_logging.h" - using android::base::unique_fd; ssize_t send_fd(int sockfd, const void* data, size_t len, unique_fd fd) { diff --git a/liblog/tests/Android.mk b/liblog/tests/Android.mk index 0e6432ced..ab964295c 100644 --- a/liblog/tests/Android.mk +++ b/liblog/tests/Android.mk @@ -55,6 +55,7 @@ test_c_flags := \ -fno-builtin \ test_src_files := \ + libc_test.cpp \ liblog_test_default.cpp \ liblog_test_local.cpp \ liblog_test_stderr.cpp \ @@ -65,14 +66,6 @@ test_src_files := \ log_system_test.cpp \ log_time_test.cpp -# to prevent breaking the build if bionic not relatively visible to us -ifneq ($(wildcard $(LOCAL_PATH)/../../../../bionic/libc/bionic/libc_logging.cpp),) - -test_src_files += \ - libc_test.cpp - -endif - # Build tests for the device (with .so). Run with: # adb shell /data/nativetest/liblog-unit-tests/liblog-unit-tests include $(CLEAR_VARS) diff --git a/libmemunreachable/Android.bp b/libmemunreachable/Android.bp index 4662368fe..2867f6495 100644 --- a/libmemunreachable/Android.bp +++ b/libmemunreachable/Android.bp @@ -30,7 +30,6 @@ cc_library_shared { static_libs: [ "libc_malloc_debug_backtrace", - "libc_logging", ], // Only need this for arm since libc++ uses its own unwind code that // doesn't mix with the other default unwind code.