Author: Jacob Lalonde Date: 2025-05-27T10:55:59-07:00 New Revision: 9d33b9291318c117429ab461c2119c108abd6ed2
URL: https://github.com/llvm/llvm-project/commit/9d33b9291318c117429ab461c2119c108abd6ed2 DIFF: https://github.com/llvm/llvm-project/commit/9d33b9291318c117429ab461c2119c108abd6ed2.diff LOG: Revert "[LLDB][ELF Core] Support all the Generic (Negative) SI Codes." (#141645) Reverts llvm/llvm-project#140150 Broke the Darwin tests, but they pass on Linux. Reverting to make the build healthy while I investigate Added: Modified: lldb/include/lldb/Target/Platform.h lldb/include/lldb/Target/UnixSignals.h lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp lldb/source/Plugins/Platform/Linux/PlatformLinux.h lldb/source/Plugins/Process/Utility/LinuxSignals.cpp lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp lldb/source/Plugins/Process/elf-core/ThreadElfCore.h lldb/source/Target/UnixSignals.cpp lldb/unittests/Signals/UnixSignalsTest.cpp Removed: ################################################################################ diff --git a/lldb/include/lldb/Target/Platform.h b/lldb/include/lldb/Target/Platform.h index 35ffdabf907e7..a702abb540fd9 100644 --- a/lldb/include/lldb/Target/Platform.h +++ b/lldb/include/lldb/Target/Platform.h @@ -21,7 +21,6 @@ #include "lldb/Core/UserSettingsController.h" #include "lldb/Host/File.h" #include "lldb/Interpreter/Options.h" -#include "lldb/Target/StopInfo.h" #include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/ConstString.h" #include "lldb/Utility/FileSpec.h" @@ -961,8 +960,6 @@ class Platform : public PluginInterface { virtual CompilerType GetSiginfoType(const llvm::Triple &triple); - virtual lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) { return {}; } - virtual Args GetExtraStartupCommands(); typedef std::function<Status(const ModuleSpec &module_spec, diff --git a/lldb/include/lldb/Target/UnixSignals.h b/lldb/include/lldb/Target/UnixSignals.h index a1807d69f329b..b3605ccefddbe 100644 --- a/lldb/include/lldb/Target/UnixSignals.h +++ b/lldb/include/lldb/Target/UnixSignals.h @@ -36,9 +36,7 @@ class UnixSignals { std::optional<int32_t> code = std::nullopt, std::optional<lldb::addr_t> addr = std::nullopt, std::optional<lldb::addr_t> lower = std::nullopt, - std::optional<lldb::addr_t> upper = std::nullopt, - std::optional<uint32_t> pid = std::nullopt, - std::optional<uint32_t> uid = std::nullopt) const; + std::optional<lldb::addr_t> upper = std::nullopt) const; bool SignalIsValid(int32_t signo) const; @@ -107,7 +105,7 @@ class UnixSignals { llvm::StringRef description, llvm::StringRef alias = llvm::StringRef()); - enum SignalCodePrintOption { None, Address, Bounds, Sender }; + enum SignalCodePrintOption { None, Address, Bounds }; // Instead of calling this directly, use a ADD_SIGCODE macro to get compile // time checks when on the native platform. diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp index cb60caf1cb422..9db2c83acc125 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp @@ -14,7 +14,6 @@ #include <sys/utsname.h> #endif -#include "Plugins/Process/Utility/LinuxSignals.h" #include "Utility/ARM64_DWARF_Registers.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/PluginManager.h" @@ -481,107 +480,3 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) { ast->CompleteTagDeclarationDefinition(siginfo_type); return siginfo_type; } - -static std::string GetDescriptionFromSiginfo(lldb::ValueObjectSP siginfo_sp) { - if (!siginfo_sp) - return ""; - - lldb_private::LinuxSignals linux_signals; - int code = siginfo_sp->GetChildMemberWithName("si_code")->GetValueAsSigned(0); - int signo = - siginfo_sp->GetChildMemberWithName("si_signo")->GetValueAsSigned(-1); - - auto sifields = siginfo_sp->GetChildMemberWithName("_sifields"); - if (!sifields) - return linux_signals.GetSignalDescription(signo, code); - - // declare everything that we can populate later. - std::optional<lldb::addr_t> addr; - std::optional<lldb::addr_t> upper; - std::optional<lldb::addr_t> lower; - std::optional<uint32_t> pid; - std::optional<uint32_t> uid; - - // The negative si_codes are special and mean this signal was sent from user - // space not the kernel. These take precedence because they break some of the - // invariants around kernel sent signals. Such as SIGSEGV won't have an - // address. - if (code < 0) { - auto sikill = sifields->GetChildMemberWithName("_kill"); - if (sikill) { - auto pid_sp = sikill->GetChildMemberWithName("si_pid"); - if (pid_sp) - pid = pid_sp->GetValueAsUnsigned(-1); - auto uid_sp = sikill->GetChildMemberWithName("si_uid"); - if (uid_sp) - uid = uid_sp->GetValueAsUnsigned(-1); - } - } else { - - switch (signo) { - case SIGILL: - case SIGFPE: - case SIGBUS: { - auto sigfault = sifields->GetChildMemberWithName("_sigfault"); - if (!sigfault) - break; - - auto addr_sp = sigfault->GetChildMemberWithName("si_addr"); - if (addr_sp) - addr = addr_sp->GetValueAsUnsigned(-1); - break; - } - case SIGSEGV: { - auto sigfault = sifields->GetChildMemberWithName("_sigfault"); - if (!sigfault) - break; - - auto addr_sp = sigfault->GetChildMemberWithName("si_addr"); - if (addr_sp) - addr = addr_sp->GetValueAsUnsigned(-1); - - auto bounds_sp = sigfault->GetChildMemberWithName("_bounds"); - if (!bounds_sp) - break; - - auto addr_bnds_sp = bounds_sp->GetChildMemberWithName("_addr_bnd"); - if (!addr_bnds_sp) - break; - - auto lower_sp = addr_bnds_sp->GetChildMemberWithName("_lower"); - if (lower_sp) - lower = lower_sp->GetValueAsUnsigned(-1); - - auto upper_sp = addr_bnds_sp->GetChildMemberWithName("_upper"); - if (upper_sp) - upper = upper_sp->GetValueAsUnsigned(-1); - - break; - } - default: - break; - } - } - - return linux_signals.GetSignalDescription(signo, code, addr, lower, upper, - uid, pid); -} - -lldb::StopInfoSP PlatformLinux::GetStopInfoFromSiginfo(Thread &thread) { - ValueObjectSP siginfo_sp = thread.GetSiginfoValue(); - if (!siginfo_sp) - return {}; - auto signo_sp = siginfo_sp->GetChildMemberWithName("si_signo"); - auto sicode_sp = siginfo_sp->GetChildMemberWithName("si_code"); - if (!signo_sp || !sicode_sp) - return {}; - - std::string siginfo_description = GetDescriptionFromSiginfo(siginfo_sp); - if (siginfo_description.empty()) - return StopInfo::CreateStopReasonWithSignal( - thread, signo_sp->GetValueAsUnsigned(-1)); - - return StopInfo::CreateStopReasonWithSignal( - thread, signo_sp->GetValueAsUnsigned(-1), siginfo_description.c_str(), - sicode_sp->GetValueAsUnsigned(0)); -} diff --git a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h index 0fd33b03dcd23..89f0bd709ef60 100644 --- a/lldb/source/Plugins/Platform/Linux/PlatformLinux.h +++ b/lldb/source/Plugins/Platform/Linux/PlatformLinux.h @@ -62,8 +62,6 @@ class PlatformLinux : public PlatformPOSIX { CompilerType GetSiginfoType(const llvm::Triple &triple) override; - lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) override; - std::vector<ArchSpec> m_supported_architectures; private: diff --git a/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp b/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp index 76c32e376eb4b..9c4fe55147a28 100644 --- a/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp +++ b/lldb/source/Plugins/Process/Utility/LinuxSignals.cpp @@ -38,28 +38,6 @@ #define ADD_SIGCODE(signal_name, signal_value, code_name, code_value, ...) \ AddSignalCode(signal_value, code_value, __VA_ARGS__) #endif /* if defined(__linux__) && !defined(__mips__) */ -// See siginfo.h in the Linux Kernel, these codes can be sent for any signal. -#define ADD_LINUX_SIGNAL(signo, name, ...) \ - AddSignal(signo, name, __VA_ARGS__); \ - ADD_SIGCODE(signo, signo, SI_QUEUE, -1, "sent by sigqueue", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_TIMER, -2, "sent by timer expiration", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_MESGQ, -3, \ - "sent by real time mesq state change", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_ASYNCIO, -4, "sent by AIO completion", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_SIGIO, -5, "sent by queued SIGIO", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_TKILL, -6, "sent by tkill system call", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_DETHREAD, -7, \ - "sent by execve() killing subsidiary threads", \ - SignalCodePrintOption::Sender); \ - ADD_SIGCODE(signo, signo, SI_ASYNCNL, -60, \ - "sent by glibc async name lookup completion", \ - SignalCodePrintOption::Sender); using namespace lldb_private; @@ -68,13 +46,13 @@ LinuxSignals::LinuxSignals() : UnixSignals() { Reset(); } void LinuxSignals::Reset() { m_signals.clear(); // clang-format off - // SIGNO NAME SUPPRESS STOP NOTIFY DESCRIPTION - // ====== ============== ======== ====== ====== =================================================== - ADD_LINUX_SIGNAL(1, "SIGHUP", false, true, true, "hangup"); - ADD_LINUX_SIGNAL(2, "SIGINT", true, true, true, "interrupt"); - ADD_LINUX_SIGNAL(3, "SIGQUIT", false, true, true, "quit"); + // SIGNO NAME SUPPRESS STOP NOTIFY DESCRIPTION + // ====== ============== ======== ====== ====== =================================================== + AddSignal(1, "SIGHUP", false, true, true, "hangup"); + AddSignal(2, "SIGINT", true, true, true, "interrupt"); + AddSignal(3, "SIGQUIT", false, true, true, "quit"); - ADD_LINUX_SIGNAL(4, "SIGILL", false, true, true, "illegal instruction"); + AddSignal(4, "SIGILL", false, true, true, "illegal instruction"); ADD_SIGCODE(SIGILL, 4, ILL_ILLOPC, 1, "illegal opcode"); ADD_SIGCODE(SIGILL, 4, ILL_ILLOPN, 2, "illegal operand"); ADD_SIGCODE(SIGILL, 4, ILL_ILLADR, 3, "illegal addressing mode"); @@ -84,15 +62,15 @@ void LinuxSignals::Reset() { ADD_SIGCODE(SIGILL, 4, ILL_COPROC, 7, "coprocessor error"); ADD_SIGCODE(SIGILL, 4, ILL_BADSTK, 8, "internal stack error"); - ADD_LINUX_SIGNAL(5, "SIGTRAP", true, true, true, "trace trap (not reset when caught)"); - ADD_LINUX_SIGNAL(6, "SIGABRT", false, true, true, "abort()/IOT trap", "SIGIOT"); + AddSignal(5, "SIGTRAP", true, true, true, "trace trap (not reset when caught)"); + AddSignal(6, "SIGABRT", false, true, true, "abort()/IOT trap", "SIGIOT"); - ADD_LINUX_SIGNAL(7, "SIGBUS", false, true, true, "bus error"); + AddSignal(7, "SIGBUS", false, true, true, "bus error"); ADD_SIGCODE(SIGBUS, 7, BUS_ADRALN, 1, "illegal alignment"); ADD_SIGCODE(SIGBUS, 7, BUS_ADRERR, 2, "illegal address"); ADD_SIGCODE(SIGBUS, 7, BUS_OBJERR, 3, "hardware error"); - ADD_LINUX_SIGNAL(8, "SIGFPE", false, true, true, "floating point exception"); + AddSignal(8, "SIGFPE", false, true, true, "floating point exception"); ADD_SIGCODE(SIGFPE, 8, FPE_INTDIV, 1, "integer divide by zero"); ADD_SIGCODE(SIGFPE, 8, FPE_INTOVF, 2, "integer overflow"); ADD_SIGCODE(SIGFPE, 8, FPE_FLTDIV, 3, "floating point divide by zero"); @@ -102,10 +80,10 @@ void LinuxSignals::Reset() { ADD_SIGCODE(SIGFPE, 8, FPE_FLTINV, 7, "floating point invalid operation"); ADD_SIGCODE(SIGFPE, 8, FPE_FLTSUB, 8, "subscript out of range"); - ADD_LINUX_SIGNAL(9, "SIGKILL", false, true, true, "kill"); - ADD_LINUX_SIGNAL(10, "SIGUSR1", false, true, true, "user defined signal 1"); + AddSignal(9, "SIGKILL", false, true, true, "kill"); + AddSignal(10, "SIGUSR1", false, true, true, "user defined signal 1"); - ADD_LINUX_SIGNAL(11, "SIGSEGV", false, true, true, "segmentation violation"); + AddSignal(11, "SIGSEGV", false, true, true, "segmentation violation"); ADD_SIGCODE(SIGSEGV, 11, SEGV_MAPERR, 1, "address not mapped to object", SignalCodePrintOption::Address); ADD_SIGCODE(SIGSEGV, 11, SEGV_ACCERR, 2, "invalid permissions for mapped object", SignalCodePrintOption::Address); ADD_SIGCODE(SIGSEGV, 11, SEGV_BNDERR, 3, "failed address bounds checks", SignalCodePrintOption::Bounds); @@ -116,58 +94,58 @@ void LinuxSignals::Reset() { // codes. One way to get this is via unaligned SIMD loads. Treat it as invalid address. ADD_SIGCODE(SIGSEGV, 11, SI_KERNEL, 0x80, "invalid address", SignalCodePrintOption::Address); - ADD_LINUX_SIGNAL(12, "SIGUSR2", false, true, true, "user defined signal 2"); - ADD_LINUX_SIGNAL(13, "SIGPIPE", false, true, true, "write to pipe with reading end closed"); - ADD_LINUX_SIGNAL(14, "SIGALRM", false, false, false, "alarm"); - ADD_LINUX_SIGNAL(15, "SIGTERM", false, true, true, "termination requested"); - ADD_LINUX_SIGNAL(16, "SIGSTKFLT", false, true, true, "stack fault"); - ADD_LINUX_SIGNAL(17, "SIGCHLD", false, false, true, "child status has changed", "SIGCLD"); - ADD_LINUX_SIGNAL(18, "SIGCONT", false, false, true, "process continue"); - ADD_LINUX_SIGNAL(19, "SIGSTOP", true, true, true, "process stop"); - ADD_LINUX_SIGNAL(20, "SIGTSTP", false, true, true, "tty stop"); - ADD_LINUX_SIGNAL(21, "SIGTTIN", false, true, true, "background tty read"); - ADD_LINUX_SIGNAL(22, "SIGTTOU", false, true, true, "background tty write"); - ADD_LINUX_SIGNAL(23, "SIGURG", false, true, true, "urgent data on socket"); - ADD_LINUX_SIGNAL(24, "SIGXCPU", false, true, true, "CPU resource exceeded"); - ADD_LINUX_SIGNAL(25, "SIGXFSZ", false, true, true, "file size limit exceeded"); - ADD_LINUX_SIGNAL(26, "SIGVTALRM", false, true, true, "virtual time alarm"); - ADD_LINUX_SIGNAL(27, "SIGPROF", false, false, false, "profiling time alarm"); - ADD_LINUX_SIGNAL(28, "SIGWINCH", false, true, true, "window size changes"); - ADD_LINUX_SIGNAL(29, "SIGIO", false, true, true, "input/output ready/Pollable event", "SIGPOLL"); - ADD_LINUX_SIGNAL(30, "SIGPWR", false, true, true, "power failure"); - ADD_LINUX_SIGNAL(31, "SIGSYS", false, true, true, "invalid system call"); - ADD_LINUX_SIGNAL(32, "SIG32", false, false, false, "threading library internal signal 1"); - ADD_LINUX_SIGNAL(33, "SIG33", false, false, false, "threading library internal signal 2"); - ADD_LINUX_SIGNAL(34, "SIGRTMIN", false, false, false, "real time signal 0"); - ADD_LINUX_SIGNAL(35, "SIGRTMIN+1", false, false, false, "real time signal 1"); - ADD_LINUX_SIGNAL(36, "SIGRTMIN+2", false, false, false, "real time signal 2"); - ADD_LINUX_SIGNAL(37, "SIGRTMIN+3", false, false, false, "real time signal 3"); - ADD_LINUX_SIGNAL(38, "SIGRTMIN+4", false, false, false, "real time signal 4"); - ADD_LINUX_SIGNAL(39, "SIGRTMIN+5", false, false, false, "real time signal 5"); - ADD_LINUX_SIGNAL(40, "SIGRTMIN+6", false, false, false, "real time signal 6"); - ADD_LINUX_SIGNAL(41, "SIGRTMIN+7", false, false, false, "real time signal 7"); - ADD_LINUX_SIGNAL(42, "SIGRTMIN+8", false, false, false, "real time signal 8"); - ADD_LINUX_SIGNAL(43, "SIGRTMIN+9", false, false, false, "real time signal 9"); - ADD_LINUX_SIGNAL(44, "SIGRTMIN+10", false, false, false, "real time signal 10"); - ADD_LINUX_SIGNAL(45, "SIGRTMIN+11", false, false, false, "real time signal 11"); - ADD_LINUX_SIGNAL(46, "SIGRTMIN+12", false, false, false, "real time signal 12"); - ADD_LINUX_SIGNAL(47, "SIGRTMIN+13", false, false, false, "real time signal 13"); - ADD_LINUX_SIGNAL(48, "SIGRTMIN+14", false, false, false, "real time signal 14"); - ADD_LINUX_SIGNAL(49, "SIGRTMIN+15", false, false, false, "real time signal 15"); - ADD_LINUX_SIGNAL(50, "SIGRTMAX-14", false, false, false, "real time signal 16"); // switching to SIGRTMAX-xxx to match "kill -l" output - ADD_LINUX_SIGNAL(51, "SIGRTMAX-13", false, false, false, "real time signal 17"); - ADD_LINUX_SIGNAL(52, "SIGRTMAX-12", false, false, false, "real time signal 18"); - ADD_LINUX_SIGNAL(53, "SIGRTMAX-11", false, false, false, "real time signal 19"); - ADD_LINUX_SIGNAL(54, "SIGRTMAX-10", false, false, false, "real time signal 20"); - ADD_LINUX_SIGNAL(55, "SIGRTMAX-9", false, false, false, "real time signal 21"); - ADD_LINUX_SIGNAL(56, "SIGRTMAX-8", false, false, false, "real time signal 22"); - ADD_LINUX_SIGNAL(57, "SIGRTMAX-7", false, false, false, "real time signal 23"); - ADD_LINUX_SIGNAL(58, "SIGRTMAX-6", false, false, false, "real time signal 24"); - ADD_LINUX_SIGNAL(59, "SIGRTMAX-5", false, false, false, "real time signal 25"); - ADD_LINUX_SIGNAL(60, "SIGRTMAX-4", false, false, false, "real time signal 26"); - ADD_LINUX_SIGNAL(61, "SIGRTMAX-3", false, false, false, "real time signal 27"); - ADD_LINUX_SIGNAL(62, "SIGRTMAX-2", false, false, false, "real time signal 28"); - ADD_LINUX_SIGNAL(63, "SIGRTMAX-1", false, false, false, "real time signal 29"); - ADD_LINUX_SIGNAL(64, "SIGRTMAX", false, false, false, "real time signal 30"); + AddSignal(12, "SIGUSR2", false, true, true, "user defined signal 2"); + AddSignal(13, "SIGPIPE", false, true, true, "write to pipe with reading end closed"); + AddSignal(14, "SIGALRM", false, false, false, "alarm"); + AddSignal(15, "SIGTERM", false, true, true, "termination requested"); + AddSignal(16, "SIGSTKFLT", false, true, true, "stack fault"); + AddSignal(17, "SIGCHLD", false, false, true, "child status has changed", "SIGCLD"); + AddSignal(18, "SIGCONT", false, false, true, "process continue"); + AddSignal(19, "SIGSTOP", true, true, true, "process stop"); + AddSignal(20, "SIGTSTP", false, true, true, "tty stop"); + AddSignal(21, "SIGTTIN", false, true, true, "background tty read"); + AddSignal(22, "SIGTTOU", false, true, true, "background tty write"); + AddSignal(23, "SIGURG", false, true, true, "urgent data on socket"); + AddSignal(24, "SIGXCPU", false, true, true, "CPU resource exceeded"); + AddSignal(25, "SIGXFSZ", false, true, true, "file size limit exceeded"); + AddSignal(26, "SIGVTALRM", false, true, true, "virtual time alarm"); + AddSignal(27, "SIGPROF", false, false, false, "profiling time alarm"); + AddSignal(28, "SIGWINCH", false, true, true, "window size changes"); + AddSignal(29, "SIGIO", false, true, true, "input/output ready/Pollable event", "SIGPOLL"); + AddSignal(30, "SIGPWR", false, true, true, "power failure"); + AddSignal(31, "SIGSYS", false, true, true, "invalid system call"); + AddSignal(32, "SIG32", false, false, false, "threading library internal signal 1"); + AddSignal(33, "SIG33", false, false, false, "threading library internal signal 2"); + AddSignal(34, "SIGRTMIN", false, false, false, "real time signal 0"); + AddSignal(35, "SIGRTMIN+1", false, false, false, "real time signal 1"); + AddSignal(36, "SIGRTMIN+2", false, false, false, "real time signal 2"); + AddSignal(37, "SIGRTMIN+3", false, false, false, "real time signal 3"); + AddSignal(38, "SIGRTMIN+4", false, false, false, "real time signal 4"); + AddSignal(39, "SIGRTMIN+5", false, false, false, "real time signal 5"); + AddSignal(40, "SIGRTMIN+6", false, false, false, "real time signal 6"); + AddSignal(41, "SIGRTMIN+7", false, false, false, "real time signal 7"); + AddSignal(42, "SIGRTMIN+8", false, false, false, "real time signal 8"); + AddSignal(43, "SIGRTMIN+9", false, false, false, "real time signal 9"); + AddSignal(44, "SIGRTMIN+10", false, false, false, "real time signal 10"); + AddSignal(45, "SIGRTMIN+11", false, false, false, "real time signal 11"); + AddSignal(46, "SIGRTMIN+12", false, false, false, "real time signal 12"); + AddSignal(47, "SIGRTMIN+13", false, false, false, "real time signal 13"); + AddSignal(48, "SIGRTMIN+14", false, false, false, "real time signal 14"); + AddSignal(49, "SIGRTMIN+15", false, false, false, "real time signal 15"); + AddSignal(50, "SIGRTMAX-14", false, false, false, "real time signal 16"); // switching to SIGRTMAX-xxx to match "kill -l" output + AddSignal(51, "SIGRTMAX-13", false, false, false, "real time signal 17"); + AddSignal(52, "SIGRTMAX-12", false, false, false, "real time signal 18"); + AddSignal(53, "SIGRTMAX-11", false, false, false, "real time signal 19"); + AddSignal(54, "SIGRTMAX-10", false, false, false, "real time signal 20"); + AddSignal(55, "SIGRTMAX-9", false, false, false, "real time signal 21"); + AddSignal(56, "SIGRTMAX-8", false, false, false, "real time signal 22"); + AddSignal(57, "SIGRTMAX-7", false, false, false, "real time signal 23"); + AddSignal(58, "SIGRTMAX-6", false, false, false, "real time signal 24"); + AddSignal(59, "SIGRTMAX-5", false, false, false, "real time signal 25"); + AddSignal(60, "SIGRTMAX-4", false, false, false, "real time signal 26"); + AddSignal(61, "SIGRTMAX-3", false, false, false, "real time signal 27"); + AddSignal(62, "SIGRTMAX-2", false, false, false, "real time signal 28"); + AddSignal(63, "SIGRTMAX-1", false, false, false, "real time signal 29"); + AddSignal(64, "SIGRTMAX", false, false, false, "real time signal 30"); // clang-format on } diff --git a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp index 6637f4679c075..6635b15b669f1 100644 --- a/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp +++ b/lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp @@ -232,7 +232,7 @@ Status ProcessElfCore::DoLoadCore() { bool prstatus_signal_found = false; // Check we found a signal in a SIGINFO note. for (const auto &thread_data : m_thread_data) { - if (!thread_data.siginfo_bytes.empty() || thread_data.signo != 0) + if (thread_data.siginfo.si_signo != 0) siginfo_signal_found = true; if (thread_data.prstatus_sig != 0) prstatus_signal_found = true; @@ -242,10 +242,10 @@ Status ProcessElfCore::DoLoadCore() { // PRSTATUS note. if (prstatus_signal_found) { for (auto &thread_data : m_thread_data) - thread_data.signo = thread_data.prstatus_sig; + thread_data.siginfo.si_signo = thread_data.prstatus_sig; } else if (m_thread_data.size() > 0) { // If all else fails force the first thread to be SIGSTOP - m_thread_data.begin()->signo = + m_thread_data.begin()->siginfo.si_signo = GetUnixSignals()->GetSignalNumberFromName("SIGSTOP"); } } @@ -506,7 +506,7 @@ static void ParseFreeBSDPrStatus(ThreadData &thread_data, else offset += 16; - thread_data.signo = data.GetU32(&offset); // pr_cursig + thread_data.siginfo.si_signo = data.GetU32(&offset); // pr_cursig thread_data.tid = data.GetU32(&offset); // pr_pid if (lp64) offset += 4; @@ -589,7 +589,7 @@ static void ParseOpenBSDProcInfo(ThreadData &thread_data, return; offset += 4; - thread_data.signo = data.GetU32(&offset); + thread_data.siginfo.si_signo = data.GetU32(&offset); } llvm::Expected<std::vector<CoreNote>> @@ -827,7 +827,7 @@ llvm::Error ProcessElfCore::parseNetBSDNotes(llvm::ArrayRef<CoreNote> notes) { // Signal targeted at the whole process. if (siglwp == 0) { for (auto &data : m_thread_data) - data.signo = signo; + data.siginfo.si_signo = signo; } // Signal destined for a particular LWP. else { @@ -835,7 +835,7 @@ llvm::Error ProcessElfCore::parseNetBSDNotes(llvm::ArrayRef<CoreNote> notes) { for (auto &data : m_thread_data) { if (data.tid == siglwp) { - data.signo = signo; + data.siginfo.si_signo = signo; passed = true; break; } @@ -938,10 +938,12 @@ llvm::Error ProcessElfCore::parseLinuxNotes(llvm::ArrayRef<CoreNote> notes) { break; } case ELF::NT_SIGINFO: { - Status status = ELFLinuxSigInfo::Parse( - note.data, arch, GetTarget().GetPlatform(), thread_data); + const lldb_private::UnixSignals &unix_signals = *GetUnixSignals(); + ELFLinuxSigInfo siginfo; + Status status = siginfo.Parse(note.data, arch, unix_signals); if (status.Fail()) return status.ToError(); + thread_data.siginfo = siginfo; break; } case ELF::NT_FILE: { diff --git a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp index ee9a03eec5a9f..e1c28e2edc20b 100644 --- a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp +++ b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp @@ -53,7 +53,7 @@ using namespace lldb_private; ThreadElfCore::ThreadElfCore(Process &process, const ThreadData &td) : Thread(process, td.tid), m_thread_name(td.name), m_thread_reg_ctx_sp(), m_gpregset_data(td.gpregset), m_notes(td.notes), - m_siginfo_bytes(std::move(td.siginfo_bytes)), m_signo(td.signo) {} + m_siginfo(std::move(td.siginfo)) {} ThreadElfCore::~ThreadElfCore() { DestroyThread(); } @@ -249,34 +249,26 @@ ThreadElfCore::CreateRegisterContextForFrame(StackFrame *frame) { return reg_ctx_sp; } -llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> -ThreadElfCore::GetSiginfo(size_t max_size) const { - if (m_siginfo_bytes.empty()) - return llvm::createStringError(llvm::inconvertibleErrorCode(), - "no siginfo note"); - - return llvm::MemoryBuffer::getMemBufferCopy(m_siginfo_bytes, - "siginfo note bytes"); -} - bool ThreadElfCore::CalculateStopInfo() { ProcessSP process_sp(GetProcess()); if (!process_sp) return false; - PlatformSP platform_sp = process_sp->GetTarget().GetPlatform(); - if (platform_sp) { - lldb::StopInfoSP stopinfo_sp = platform_sp->GetStopInfoFromSiginfo(*this); - // The platform SP can optionally handle creating the stop info from the - // siginfo value however it's not guaraunteed to be implemented on every - // platform, so if we fall through this case, we create from just the signo. - if (stopinfo_sp) { - SetStopInfo(std::move(stopinfo_sp)); - return true; - } - } + lldb::UnixSignalsSP unix_signals_sp(process_sp->GetUnixSignals()); + if (!unix_signals_sp) + return false; + + const char *sig_description; + std::string description = m_siginfo.GetDescription(*unix_signals_sp); + if (description.empty()) + sig_description = nullptr; + else + sig_description = description.c_str(); + + SetStopInfo(StopInfo::CreateStopReasonWithSignal( + *this, m_siginfo.si_signo, sig_description, m_siginfo.si_code)); - SetStopInfo(StopInfo::CreateStopReasonWithSignal(*this, m_signo)); + SetStopInfo(m_stop_info_sp); return true; } @@ -558,26 +550,82 @@ ELFLinuxPrPsInfo::Populate(const lldb_private::ProcessInstanceInfo &info, return prpsinfo; } +// Parse SIGINFO from NOTE entry +ELFLinuxSigInfo::ELFLinuxSigInfo() { memset(this, 0, sizeof(ELFLinuxSigInfo)); } + +size_t ELFLinuxSigInfo::GetSize(const lldb_private::ArchSpec &arch) { + if (arch.IsMIPS()) + return sizeof(ELFLinuxSigInfo); + switch (arch.GetCore()) { + case lldb_private::ArchSpec::eCore_x86_64_x86_64: + return sizeof(ELFLinuxSigInfo); + case lldb_private::ArchSpec::eCore_s390x_generic: + case lldb_private::ArchSpec::eCore_x86_32_i386: + case lldb_private::ArchSpec::eCore_x86_32_i486: + return 12; + default: + return 0; + } +} + Status ELFLinuxSigInfo::Parse(const DataExtractor &data, const ArchSpec &arch, - const lldb::PlatformSP platform_sp, - ThreadData &thread_data) { - if (!platform_sp) - return Status::FromErrorString("No platform for arch."); - CompilerType type = platform_sp->GetSiginfoType(arch.GetTriple()); - if (!type.IsValid()) - return Status::FromErrorString("no siginfo_t for platform."); - - auto type_size_or_err = type.GetByteSize(nullptr); - if (!type_size_or_err) - return Status::FromError(type_size_or_err.takeError()); - - if (data.GetByteSize() < *type_size_or_err) - return Status::FromErrorString( - "siginfo note byte size smaller than siginfo_t for platform."); - - lldb::offset_t offset = 0; - const char *bytes = - static_cast<const char *>(data.GetData(&offset, *type_size_or_err)); - thread_data.siginfo_bytes = llvm::StringRef(bytes, *type_size_or_err); - return Status(); + const lldb_private::UnixSignals &unix_signals) { + Status error; + uint64_t size = GetSize(arch); + if (size > data.GetByteSize()) { + error = Status::FromErrorStringWithFormat( + "NT_SIGINFO size should be %zu, but the remaining bytes are: %" PRIu64, + GetSize(arch), data.GetByteSize()); + return error; + } + + // Set that we've parsed the siginfo from a SIGINFO note. + note_type = eNT_SIGINFO; + // Parsing from a 32 bit ELF core file, and populating/reusing the structure + // properly, because the struct is for the 64 bit version + offset_t offset = 0; + si_signo = data.GetU32(&offset); + si_errno = data.GetU32(&offset); + si_code = data.GetU32(&offset); + // 64b ELF have a 4 byte pad. + if (data.GetAddressByteSize() == 8) + offset += 4; + // Not every stop signal has a valid address, but that will get resolved in + // the unix_signals.GetSignalDescription() call below. + if (unix_signals.GetShouldStop(si_signo)) { + // Instead of memcpy we call all these individually as the extractor will + // handle endianness for us. + sigfault.si_addr = data.GetAddress(&offset); + sigfault.si_addr_lsb = data.GetU16(&offset); + if (data.GetByteSize() - offset >= sizeof(sigfault.bounds)) { + sigfault.bounds._addr_bnd._lower = data.GetAddress(&offset); + sigfault.bounds._addr_bnd._upper = data.GetAddress(&offset); + sigfault.bounds._pkey = data.GetU32(&offset); + } else { + // Set these to 0 so we don't use bogus data for the description. + sigfault.bounds._addr_bnd._lower = 0; + sigfault.bounds._addr_bnd._upper = 0; + sigfault.bounds._pkey = 0; + } + } + + return error; +} + +std::string ELFLinuxSigInfo::GetDescription( + const lldb_private::UnixSignals &unix_signals) const { + if (unix_signals.GetShouldStop(si_signo) && note_type == eNT_SIGINFO) { + if (sigfault.bounds._addr_bnd._upper != 0) + return unix_signals.GetSignalDescription( + si_signo, si_code, sigfault.si_addr, sigfault.bounds._addr_bnd._lower, + sigfault.bounds._addr_bnd._upper); + else + return unix_signals.GetSignalDescription(si_signo, si_code, + sigfault.si_addr); + } + + // This looks weird, but there is an existing pattern where we don't pass a + // description to keep up with that, we return empty here, and then the above + // function will set the description whether or not this is empty. + return std::string(); } diff --git a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h index 8a84ac718461f..6f8d41351a6bf 100644 --- a/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h +++ b/lldb/source/Plugins/Process/elf-core/ThreadElfCore.h @@ -10,10 +10,8 @@ #define LLDB_SOURCE_PLUGINS_PROCESS_ELF_CORE_THREADELFCORE_H #include "Plugins/Process/elf-core/RegisterUtilities.h" -#include "lldb/Target/Platform.h" #include "lldb/Target/Thread.h" #include "lldb/Utility/DataExtractor.h" -#include "lldb/ValueObject/ValueObject.h" #include "llvm/ADT/DenseMap.h" #include <optional> #include <string> @@ -79,24 +77,50 @@ struct ELFLinuxPrStatus { static_assert(sizeof(ELFLinuxPrStatus) == 112, "sizeof ELFLinuxPrStatus is not correct!"); -struct ThreadData { - lldb_private::DataExtractor gpregset; - std::vector<lldb_private::CoreNote> notes; - lldb::tid_t tid; - std::string name; - llvm::StringRef siginfo_bytes; - int prstatus_sig = 0; - int signo = 0; -}; +struct ELFLinuxSigInfo { -class ELFLinuxSigInfo { -public: - static lldb_private::Status Parse(const lldb_private::DataExtractor &data, - const lldb_private::ArchSpec &arch, - const lldb::PlatformSP platform_sp, - ThreadData &thread_data); + int32_t si_signo; // Order matters for the first 3. + int32_t si_errno; + int32_t si_code; + // Copied from siginfo_t so we don't have to include signal.h on non 'Nix + // builds. Slight modifications to ensure no 32b vs 64b diff erences. + struct alignas(8) { + lldb::addr_t si_addr; /* faulting insn/memory ref. */ + int16_t si_addr_lsb; /* Valid LSB of the reported address. */ + union { + /* used when si_code=SEGV_BNDERR */ + struct { + lldb::addr_t _lower; + lldb::addr_t _upper; + } _addr_bnd; + /* used when si_code=SEGV_PKUERR */ + uint32_t _pkey; + } bounds; + } sigfault; + + enum SigInfoNoteType : uint8_t { eUnspecified, eNT_SIGINFO }; + SigInfoNoteType note_type; + + ELFLinuxSigInfo(); + + lldb_private::Status Parse(const lldb_private::DataExtractor &data, + const lldb_private::ArchSpec &arch, + const lldb_private::UnixSignals &unix_signals); + + std::string + GetDescription(const lldb_private::UnixSignals &unix_signals) const; + + // Return the bytesize of the structure + // 64 bit - just sizeof + // 32 bit - hardcoded because we are reusing the struct, but some of the + // members are smaller - + // so the layout is not the same + static size_t GetSize(const lldb_private::ArchSpec &arch); }; +static_assert(sizeof(ELFLinuxSigInfo) == 56, + "sizeof ELFLinuxSigInfo is not correct!"); + // PRPSINFO structure's size diff ers based on architecture. // This is the layout in the x86-64 arch case. // In the i386 case we parse it manually and fill it again @@ -139,6 +163,15 @@ struct ELFLinuxPrPsInfo { static_assert(sizeof(ELFLinuxPrPsInfo) == 136, "sizeof ELFLinuxPrPsInfo is not correct!"); +struct ThreadData { + lldb_private::DataExtractor gpregset; + std::vector<lldb_private::CoreNote> notes; + lldb::tid_t tid; + std::string name; + ELFLinuxSigInfo siginfo; + int prstatus_sig = 0; +}; + class ThreadElfCore : public lldb_private::Thread { public: ThreadElfCore(lldb_private::Process &process, const ThreadData &td); @@ -167,8 +200,8 @@ class ThreadElfCore : public lldb_private::Thread { m_thread_name.clear(); } - llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>> - GetSiginfo(size_t max_size) const override; + void CreateStopFromSigInfo(const ELFLinuxSigInfo &siginfo, + const lldb_private::UnixSignals &unix_signals); protected: // Member variables. @@ -177,9 +210,7 @@ class ThreadElfCore : public lldb_private::Thread { lldb_private::DataExtractor m_gpregset_data; std::vector<lldb_private::CoreNote> m_notes; - llvm::StringRef m_siginfo_bytes; - // Only used if no siginfo note. - int m_signo; + ELFLinuxSigInfo m_siginfo; bool CalculateStopInfo() override; }; diff --git a/lldb/source/Target/UnixSignals.cpp b/lldb/source/Target/UnixSignals.cpp index 6113c6648817c..da661003925c7 100644 --- a/lldb/source/Target/UnixSignals.cpp +++ b/lldb/source/Target/UnixSignals.cpp @@ -137,11 +137,11 @@ llvm::StringRef UnixSignals::GetSignalAsStringRef(int32_t signo) const { return pos->second.m_name; } -std::string UnixSignals::GetSignalDescription( - int32_t signo, std::optional<int32_t> code, - std::optional<lldb::addr_t> addr, std::optional<lldb::addr_t> lower, - std::optional<lldb::addr_t> upper, std::optional<uint32_t> pid, - std::optional<uint32_t> uid) const { +std::string +UnixSignals::GetSignalDescription(int32_t signo, std::optional<int32_t> code, + std::optional<lldb::addr_t> addr, + std::optional<lldb::addr_t> lower, + std::optional<lldb::addr_t> upper) const { std::string str; collection::const_iterator pos = m_signals.find(signo); @@ -180,10 +180,6 @@ std::string UnixSignals::GetSignalDescription( strm << sc.m_description.str(); break; - case SignalCodePrintOption::Sender: - if (pid && uid) - strm << " (sender pid=" << *pid << ", uid=" << *uid << ")"; - break; } str += strm.str(); } @@ -401,3 +397,4 @@ bool UnixSignals::ResetSignal(int32_t signo, bool reset_stop, (*elem).second.Reset(reset_stop, reset_notify, reset_suppress); return true; } + diff --git a/lldb/unittests/Signals/UnixSignalsTest.cpp b/lldb/unittests/Signals/UnixSignalsTest.cpp index 582e441556067..9a7d9afc2b185 100644 --- a/lldb/unittests/Signals/UnixSignalsTest.cpp +++ b/lldb/unittests/Signals/UnixSignalsTest.cpp @@ -27,8 +27,6 @@ class TestSignals : public UnixSignals { AddSignalCode(16, 2, "SIG16 with a fault address", SignalCodePrintOption::Address); AddSignalCode(16, 3, "bounds violation", SignalCodePrintOption::Bounds); - AddSignalCode(16, -6, "sent by tkill system call", - SignalCodePrintOption::Sender); } }; @@ -126,13 +124,6 @@ TEST(UnixSignalsTest, GetAsString) { // No address given just print the code description. ASSERT_EQ("SIG16: SIG16 with a fault address", signals.GetSignalDescription(16, 2)); - // TKill, but with no sender - ASSERT_EQ("SIG16: sent by tkill system call", - signals.GetSignalDescription(16, -6, 0xCAFEF00D)); - // TKill, but with no sender - ASSERT_EQ("SIG16: sent by tkill system call (sender pid=912, uid=99)", - signals.GetSignalDescription(16, -6, 0xCAFEF00D, std::nullopt, - std::nullopt, 912, 99)); const char *expected = "SIG16: bounds violation"; // Must pass all needed info to get full output. _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
