shylie/llvm-project
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reapply "[LLDB][ELF Core] Support all the Generic (Negative) SI Codes." (#141670)

Browse Source 
After some debugging, I found out ProcessELFCore never updates the
platform. I've updated ProcessElfCore to set the arch and platform
before we parse the Notes.
This commit is contained in:
Jacob Lalonde 2025-05-29 08:43:55 -07:00 committed by GitHub
parent 062d24a7d6
commit 5fe9aea6d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 305 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lldb/include/lldb/Target/Platform.h
View File

@ -21,6 +21,7 @@
#include "lldb/Core/UserSettingsController.h" #include "lldb/Core/UserSettingsController.h"
#include "lldb/Host/File.h" #include "lldb/Host/File.h"
#include "lldb/Interpreter/Options.h" #include "lldb/Interpreter/Options.h"
#include "lldb/Target/StopInfo.h"
#include "lldb/Utility/ArchSpec.h" #include "lldb/Utility/ArchSpec.h"
#include "lldb/Utility/ConstString.h" #include "lldb/Utility/ConstString.h"
#include "lldb/Utility/FileSpec.h" #include "lldb/Utility/FileSpec.h"
@ -960,6 +961,8 @@ public:
virtual CompilerType GetSiginfoType(const llvm::Triple &triple); virtual CompilerType GetSiginfoType(const llvm::Triple &triple);
virtual lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) { return {}; }
virtual Args GetExtraStartupCommands(); virtual Args GetExtraStartupCommands();
typedef std::function<Status(const ModuleSpec &module_spec, typedef std::function<Status(const ModuleSpec &module_spec,

6
lldb/include/lldb/Target/UnixSignals.h
View File

@ -36,7 +36,9 @@ public:
std::optional<int32_t> code = std::nullopt, std::optional<int32_t> code = std::nullopt,
std::optional<lldb::addr_t> addr = std::nullopt, std::optional<lldb::addr_t> addr = std::nullopt,
std::optional<lldb::addr_t> lower = std::nullopt, std::optional<lldb::addr_t> lower = std::nullopt,
std::optional<lldb::addr_t> upper = std::nullopt) const; std::optional<lldb::addr_t> upper = std::nullopt,
std::optional<uint32_t> pid = std::nullopt,
std::optional<uint32_t> uid = std::nullopt) const;
bool SignalIsValid(int32_t signo) const; bool SignalIsValid(int32_t signo) const;
@ -105,7 +107,7 @@ public:
llvm::StringRef description, llvm::StringRef description,
llvm::StringRef alias = llvm::StringRef()); llvm::StringRef alias = llvm::StringRef());
enum SignalCodePrintOption { None, Address, Bounds }; enum SignalCodePrintOption { None, Address, Bounds, Sender };
// Instead of calling this directly, use a ADD_SIGCODE macro to get compile // Instead of calling this directly, use a ADD_SIGCODE macro to get compile
// time checks when on the native platform. // time checks when on the native platform.

105
lldb/source/Plugins/Platform/Linux/PlatformLinux.cpp
View File

@ -14,6 +14,7 @@
#include <sys/utsname.h> #include <sys/utsname.h>
#endif #endif
#include "Plugins/Process/Utility/LinuxSignals.h"
#include "Utility/ARM64_DWARF_Registers.h" #include "Utility/ARM64_DWARF_Registers.h"
#include "lldb/Core/Debugger.h" #include "lldb/Core/Debugger.h"
#include "lldb/Core/PluginManager.h" #include "lldb/Core/PluginManager.h"
@ -480,3 +481,107 @@ CompilerType PlatformLinux::GetSiginfoType(const llvm::Triple &triple) {
ast->CompleteTagDeclarationDefinition(siginfo_type); ast->CompleteTagDeclarationDefinition(siginfo_type);
return 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));
}

2
lldb/source/Plugins/Platform/Linux/PlatformLinux.h
View File

@ -62,6 +62,8 @@ public:
CompilerType GetSiginfoType(const llvm::Triple &triple) override; CompilerType GetSiginfoType(const llvm::Triple &triple) override;
lldb::StopInfoSP GetStopInfoFromSiginfo(Thread &thread) override;
std::vector<ArchSpec> m_supported_architectures; std::vector<ArchSpec> m_supported_architectures;
private: private:

174
lldb/source/Plugins/Process/Utility/LinuxSignals.cpp
View File

@ -27,6 +27,30 @@
#ifndef SEGV_CPERR #ifndef SEGV_CPERR
#define SEGV_CPERR 10 #define SEGV_CPERR 10
#endif #endif
#ifndef SI_QUEUE
#define SI_QUEUE -1
#endif
#ifndef SI_TIMER
#define SI_TIMER -2
#endif
#ifndef SI_MESGQ
#define SI_MESGQ -3
#endif
#ifndef SI_ASYNCIO
#define SI_ASYNCIO -4
#endif
#ifndef SI_SIGIO
#define SI_SIGIO -5
#endif
#ifndef SI_TKILL
#define SI_TKILL -6
#endif
#ifndef SI_DETHREAD
#define SI_DETHREAD -7
#endif
#ifndef SI_ASYNCNL
#define SI_ASYNCNL -60
#endif
#define ADD_SIGCODE(signal_name, signal_value, code_name, code_value, ...) \ #define ADD_SIGCODE(signal_name, signal_value, code_name, code_value, ...) \
static_assert(signal_name == signal_value, \ static_assert(signal_name == signal_value, \
@ -38,6 +62,28 @@
#define ADD_SIGCODE(signal_name, signal_value, code_name, code_value, ...) \ #define ADD_SIGCODE(signal_name, signal_value, code_name, code_value, ...) \
AddSignalCode(signal_value, code_value, __VA_ARGS__) AddSignalCode(signal_value, code_value, __VA_ARGS__)
#endif /* if defined(__linux__) && !defined(__mips__) */ #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; using namespace lldb_private;
@ -48,11 +94,11 @@ void LinuxSignals::Reset() {
// clang-format off // clang-format off
// SIGNO NAME SUPPRESS STOP NOTIFY DESCRIPTION // SIGNO NAME SUPPRESS STOP NOTIFY DESCRIPTION
// ====== ============== ======== ====== ====== =================================================== // ====== ============== ======== ====== ====== ===================================================
AddSignal(1, "SIGHUP", false, true, true, "hangup"); ADD_LINUX_SIGNAL(1, "SIGHUP", false, true, true, "hangup");
AddSignal(2, "SIGINT", true, true, true, "interrupt"); ADD_LINUX_SIGNAL(2, "SIGINT", true, true, true, "interrupt");
AddSignal(3, "SIGQUIT", false, true, true, "quit"); ADD_LINUX_SIGNAL(3, "SIGQUIT", false, true, true, "quit");
AddSignal(4, "SIGILL", false, true, true, "illegal instruction"); ADD_LINUX_SIGNAL(4, "SIGILL", false, true, true, "illegal instruction");
ADD_SIGCODE(SIGILL, 4, ILL_ILLOPC, 1, "illegal opcode"); ADD_SIGCODE(SIGILL, 4, ILL_ILLOPC, 1, "illegal opcode");
ADD_SIGCODE(SIGILL, 4, ILL_ILLOPN, 2, "illegal operand"); ADD_SIGCODE(SIGILL, 4, ILL_ILLOPN, 2, "illegal operand");
ADD_SIGCODE(SIGILL, 4, ILL_ILLADR, 3, "illegal addressing mode"); ADD_SIGCODE(SIGILL, 4, ILL_ILLADR, 3, "illegal addressing mode");
@ -62,15 +108,15 @@ void LinuxSignals::Reset() {
ADD_SIGCODE(SIGILL, 4, ILL_COPROC, 7, "coprocessor error"); ADD_SIGCODE(SIGILL, 4, ILL_COPROC, 7, "coprocessor error");
ADD_SIGCODE(SIGILL, 4, ILL_BADSTK, 8, "internal stack error"); ADD_SIGCODE(SIGILL, 4, ILL_BADSTK, 8, "internal stack error");
AddSignal(5, "SIGTRAP", true, true, true, "trace trap (not reset when caught)"); ADD_LINUX_SIGNAL(5, "SIGTRAP", true, true, true, "trace trap (not reset when caught)");
AddSignal(6, "SIGABRT", false, true, true, "abort()/IOT trap", "SIGIOT"); ADD_LINUX_SIGNAL(6, "SIGABRT", false, true, true, "abort()/IOT trap", "SIGIOT");
AddSignal(7, "SIGBUS", false, true, true, "bus error"); ADD_LINUX_SIGNAL(7, "SIGBUS", false, true, true, "bus error");
ADD_SIGCODE(SIGBUS, 7, BUS_ADRALN, 1, "illegal alignment"); ADD_SIGCODE(SIGBUS, 7, BUS_ADRALN, 1, "illegal alignment");
ADD_SIGCODE(SIGBUS, 7, BUS_ADRERR, 2, "illegal address"); ADD_SIGCODE(SIGBUS, 7, BUS_ADRERR, 2, "illegal address");
ADD_SIGCODE(SIGBUS, 7, BUS_OBJERR, 3, "hardware error"); ADD_SIGCODE(SIGBUS, 7, BUS_OBJERR, 3, "hardware error");
AddSignal(8, "SIGFPE", false, true, true, "floating point exception"); ADD_LINUX_SIGNAL(8, "SIGFPE", false, true, true, "floating point exception");
ADD_SIGCODE(SIGFPE, 8, FPE_INTDIV, 1, "integer divide by zero"); 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_INTOVF, 2, "integer overflow");
ADD_SIGCODE(SIGFPE, 8, FPE_FLTDIV, 3, "floating point divide by zero"); ADD_SIGCODE(SIGFPE, 8, FPE_FLTDIV, 3, "floating point divide by zero");
@ -80,10 +126,10 @@ void LinuxSignals::Reset() {
ADD_SIGCODE(SIGFPE, 8, FPE_FLTINV, 7, "floating point invalid operation"); ADD_SIGCODE(SIGFPE, 8, FPE_FLTINV, 7, "floating point invalid operation");
ADD_SIGCODE(SIGFPE, 8, FPE_FLTSUB, 8, "subscript out of range"); ADD_SIGCODE(SIGFPE, 8, FPE_FLTSUB, 8, "subscript out of range");
AddSignal(9, "SIGKILL", false, true, true, "kill"); ADD_LINUX_SIGNAL(9, "SIGKILL", false, true, true, "kill");
AddSignal(10, "SIGUSR1", false, true, true, "user defined signal 1"); ADD_LINUX_SIGNAL(10, "SIGUSR1", false, true, true, "user defined signal 1");
AddSignal(11, "SIGSEGV", false, true, true, "segmentation violation"); ADD_LINUX_SIGNAL(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_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_ACCERR, 2, "invalid permissions for mapped object", SignalCodePrintOption::Address);
ADD_SIGCODE(SIGSEGV, 11, SEGV_BNDERR, 3, "failed address bounds checks", SignalCodePrintOption::Bounds); ADD_SIGCODE(SIGSEGV, 11, SEGV_BNDERR, 3, "failed address bounds checks", SignalCodePrintOption::Bounds);
@ -94,58 +140,58 @@ void LinuxSignals::Reset() {
// codes. One way to get this is via unaligned SIMD loads. Treat it as invalid address. // 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_SIGCODE(SIGSEGV, 11, SI_KERNEL, 0x80, "invalid address", SignalCodePrintOption::Address);
AddSignal(12, "SIGUSR2", false, true, true, "user defined signal 2"); ADD_LINUX_SIGNAL(12, "SIGUSR2", false, true, true, "user defined signal 2");
AddSignal(13, "SIGPIPE", false, true, true, "write to pipe with reading end closed"); ADD_LINUX_SIGNAL(13, "SIGPIPE", false, true, true, "write to pipe with reading end closed");
AddSignal(14, "SIGALRM", false, false, false, "alarm"); ADD_LINUX_SIGNAL(14, "SIGALRM", false, false, false, "alarm");
AddSignal(15, "SIGTERM", false, true, true, "termination requested"); ADD_LINUX_SIGNAL(15, "SIGTERM", false, true, true, "termination requested");
AddSignal(16, "SIGSTKFLT", false, true, true, "stack fault"); ADD_LINUX_SIGNAL(16, "SIGSTKFLT", false, true, true, "stack fault");
AddSignal(17, "SIGCHLD", false, false, true, "child status has changed", "SIGCLD"); ADD_LINUX_SIGNAL(17, "SIGCHLD", false, false, true, "child status has changed", "SIGCLD");
AddSignal(18, "SIGCONT", false, false, true, "process continue"); ADD_LINUX_SIGNAL(18, "SIGCONT", false, false, true, "process continue");
AddSignal(19, "SIGSTOP", true, true, true, "process stop"); ADD_LINUX_SIGNAL(19, "SIGSTOP", true, true, true, "process stop");
AddSignal(20, "SIGTSTP", false, true, true, "tty stop"); ADD_LINUX_SIGNAL(20, "SIGTSTP", false, true, true, "tty stop");
AddSignal(21, "SIGTTIN", false, true, true, "background tty read"); ADD_LINUX_SIGNAL(21, "SIGTTIN", false, true, true, "background tty read");
AddSignal(22, "SIGTTOU", false, true, true, "background tty write"); ADD_LINUX_SIGNAL(22, "SIGTTOU", false, true, true, "background tty write");
AddSignal(23, "SIGURG", false, true, true, "urgent data on socket"); ADD_LINUX_SIGNAL(23, "SIGURG", false, true, true, "urgent data on socket");
AddSignal(24, "SIGXCPU", false, true, true, "CPU resource exceeded"); ADD_LINUX_SIGNAL(24, "SIGXCPU", false, true, true, "CPU resource exceeded");
AddSignal(25, "SIGXFSZ", false, true, true, "file size limit exceeded"); ADD_LINUX_SIGNAL(25, "SIGXFSZ", false, true, true, "file size limit exceeded");
AddSignal(26, "SIGVTALRM", false, true, true, "virtual time alarm"); ADD_LINUX_SIGNAL(26, "SIGVTALRM", false, true, true, "virtual time alarm");
AddSignal(27, "SIGPROF", false, false, false, "profiling time alarm"); ADD_LINUX_SIGNAL(27, "SIGPROF", false, false, false, "profiling time alarm");
AddSignal(28, "SIGWINCH", false, true, true, "window size changes"); ADD_LINUX_SIGNAL(28, "SIGWINCH", false, true, true, "window size changes");
AddSignal(29, "SIGIO", false, true, true, "input/output ready/Pollable event", "SIGPOLL"); ADD_LINUX_SIGNAL(29, "SIGIO", false, true, true, "input/output ready/Pollable event", "SIGPOLL");
AddSignal(30, "SIGPWR", false, true, true, "power failure"); ADD_LINUX_SIGNAL(30, "SIGPWR", false, true, true, "power failure");
AddSignal(31, "SIGSYS", false, true, true, "invalid system call"); ADD_LINUX_SIGNAL(31, "SIGSYS", false, true, true, "invalid system call");
AddSignal(32, "SIG32", false, false, false, "threading library internal signal 1"); ADD_LINUX_SIGNAL(32, "SIG32", false, false, false, "threading library internal signal 1");
AddSignal(33, "SIG33", false, false, false, "threading library internal signal 2"); ADD_LINUX_SIGNAL(33, "SIG33", false, false, false, "threading library internal signal 2");
AddSignal(34, "SIGRTMIN", false, false, false, "real time signal 0"); ADD_LINUX_SIGNAL(34, "SIGRTMIN", false, false, false, "real time signal 0");
AddSignal(35, "SIGRTMIN+1", false, false, false, "real time signal 1"); ADD_LINUX_SIGNAL(35, "SIGRTMIN+1", false, false, false, "real time signal 1");
AddSignal(36, "SIGRTMIN+2", false, false, false, "real time signal 2"); ADD_LINUX_SIGNAL(36, "SIGRTMIN+2", false, false, false, "real time signal 2");
AddSignal(37, "SIGRTMIN+3", false, false, false, "real time signal 3"); ADD_LINUX_SIGNAL(37, "SIGRTMIN+3", false, false, false, "real time signal 3");
AddSignal(38, "SIGRTMIN+4", false, false, false, "real time signal 4"); ADD_LINUX_SIGNAL(38, "SIGRTMIN+4", false, false, false, "real time signal 4");
AddSignal(39, "SIGRTMIN+5", false, false, false, "real time signal 5"); ADD_LINUX_SIGNAL(39, "SIGRTMIN+5", false, false, false, "real time signal 5");
AddSignal(40, "SIGRTMIN+6", false, false, false, "real time signal 6"); ADD_LINUX_SIGNAL(40, "SIGRTMIN+6", false, false, false, "real time signal 6");
AddSignal(41, "SIGRTMIN+7", false, false, false, "real time signal 7"); ADD_LINUX_SIGNAL(41, "SIGRTMIN+7", false, false, false, "real time signal 7");
AddSignal(42, "SIGRTMIN+8", false, false, false, "real time signal 8"); ADD_LINUX_SIGNAL(42, "SIGRTMIN+8", false, false, false, "real time signal 8");
AddSignal(43, "SIGRTMIN+9", false, false, false, "real time signal 9"); ADD_LINUX_SIGNAL(43, "SIGRTMIN+9", false, false, false, "real time signal 9");
AddSignal(44, "SIGRTMIN+10", false, false, false, "real time signal 10"); ADD_LINUX_SIGNAL(44, "SIGRTMIN+10", false, false, false, "real time signal 10");
AddSignal(45, "SIGRTMIN+11", false, false, false, "real time signal 11"); ADD_LINUX_SIGNAL(45, "SIGRTMIN+11", false, false, false, "real time signal 11");
AddSignal(46, "SIGRTMIN+12", false, false, false, "real time signal 12"); ADD_LINUX_SIGNAL(46, "SIGRTMIN+12", false, false, false, "real time signal 12");
AddSignal(47, "SIGRTMIN+13", false, false, false, "real time signal 13"); ADD_LINUX_SIGNAL(47, "SIGRTMIN+13", false, false, false, "real time signal 13");
AddSignal(48, "SIGRTMIN+14", false, false, false, "real time signal 14"); ADD_LINUX_SIGNAL(48, "SIGRTMIN+14", false, false, false, "real time signal 14");
AddSignal(49, "SIGRTMIN+15", false, false, false, "real time signal 15"); ADD_LINUX_SIGNAL(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 ADD_LINUX_SIGNAL(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"); ADD_LINUX_SIGNAL(51, "SIGRTMAX-13", false, false, false, "real time signal 17");
AddSignal(52, "SIGRTMAX-12", false, false, false, "real time signal 18"); ADD_LINUX_SIGNAL(52, "SIGRTMAX-12", false, false, false, "real time signal 18");
AddSignal(53, "SIGRTMAX-11", false, false, false, "real time signal 19"); ADD_LINUX_SIGNAL(53, "SIGRTMAX-11", false, false, false, "real time signal 19");
AddSignal(54, "SIGRTMAX-10", false, false, false, "real time signal 20"); ADD_LINUX_SIGNAL(54, "SIGRTMAX-10", false, false, false, "real time signal 20");
AddSignal(55, "SIGRTMAX-9", false, false, false, "real time signal 21"); ADD_LINUX_SIGNAL(55, "SIGRTMAX-9", false, false, false, "real time signal 21");
AddSignal(56, "SIGRTMAX-8", false, false, false, "real time signal 22"); ADD_LINUX_SIGNAL(56, "SIGRTMAX-8", false, false, false, "real time signal 22");
AddSignal(57, "SIGRTMAX-7", false, false, false, "real time signal 23"); ADD_LINUX_SIGNAL(57, "SIGRTMAX-7", false, false, false, "real time signal 23");
AddSignal(58, "SIGRTMAX-6", false, false, false, "real time signal 24"); ADD_LINUX_SIGNAL(58, "SIGRTMAX-6", false, false, false, "real time signal 24");
AddSignal(59, "SIGRTMAX-5", false, false, false, "real time signal 25"); ADD_LINUX_SIGNAL(59, "SIGRTMAX-5", false, false, false, "real time signal 25");
AddSignal(60, "SIGRTMAX-4", false, false, false, "real time signal 26"); ADD_LINUX_SIGNAL(60, "SIGRTMAX-4", false, false, false, "real time signal 26");
AddSignal(61, "SIGRTMAX-3", false, false, false, "real time signal 27"); ADD_LINUX_SIGNAL(61, "SIGRTMAX-3", false, false, false, "real time signal 27");
AddSignal(62, "SIGRTMAX-2", false, false, false, "real time signal 28"); ADD_LINUX_SIGNAL(62, "SIGRTMAX-2", false, false, false, "real time signal 28");
AddSignal(63, "SIGRTMAX-1", false, false, false, "real time signal 29"); ADD_LINUX_SIGNAL(63, "SIGRTMAX-1", false, false, false, "real time signal 29");
AddSignal(64, "SIGRTMAX", false, false, false, "real time signal 30"); ADD_LINUX_SIGNAL(64, "SIGRTMAX", false, false, false, "real time signal 30");
// clang-format on // clang-format on
} }

47
lldb/source/Plugins/Process/elf-core/ProcessElfCore.cpp
View File

@ -176,6 +176,17 @@ Status ProcessElfCore::DoLoadCore() {
return error; return error;
} }
// Even if the architecture is set in the target, we need to override it to
// match the core file which is always single arch.
ArchSpec arch(m_core_module_sp->GetArchitecture());
ArchSpec target_arch = GetTarget().GetArchitecture();
ArchSpec core_arch(m_core_module_sp->GetArchitecture());
target_arch.MergeFrom(core_arch);
GetTarget().SetArchitecture(target_arch, /*set_platform*/ true);
SetUnixSignals(UnixSignals::Create(GetArchitecture()));
SetCanJIT(false); SetCanJIT(false);
m_thread_data_valid = true; m_thread_data_valid = true;
@ -216,23 +227,12 @@ Status ProcessElfCore::DoLoadCore() {
m_core_tag_ranges.Sort(); m_core_tag_ranges.Sort();
} }
// Even if the architecture is set in the target, we need to override it to
// match the core file which is always single arch.
ArchSpec arch(m_core_module_sp->GetArchitecture());
ArchSpec target_arch = GetTarget().GetArchitecture();
ArchSpec core_arch(m_core_module_sp->GetArchitecture());
target_arch.MergeFrom(core_arch);
GetTarget().SetArchitecture(target_arch);
SetUnixSignals(UnixSignals::Create(GetArchitecture()));
// Ensure we found at least one thread that was stopped on a signal. // Ensure we found at least one thread that was stopped on a signal.
bool siginfo_signal_found = false; bool siginfo_signal_found = false;
bool prstatus_signal_found = false; bool prstatus_signal_found = false;
// Check we found a signal in a SIGINFO note. // Check we found a signal in a SIGINFO note.
for (const auto &thread_data : m_thread_data) { for (const auto &thread_data : m_thread_data) {
if (thread_data.siginfo.si_signo != 0) if (!thread_data.siginfo_bytes.empty() || thread_data.signo != 0)
siginfo_signal_found = true; siginfo_signal_found = true;
if (thread_data.prstatus_sig != 0) if (thread_data.prstatus_sig != 0)
prstatus_signal_found = true; prstatus_signal_found = true;
@ -242,10 +242,10 @@ Status ProcessElfCore::DoLoadCore() {
// PRSTATUS note. // PRSTATUS note.
if (prstatus_signal_found) { if (prstatus_signal_found) {
for (auto &thread_data : m_thread_data) for (auto &thread_data : m_thread_data)
thread_data.siginfo.si_signo = thread_data.prstatus_sig; thread_data.signo = thread_data.prstatus_sig;
} else if (m_thread_data.size() > 0) { } else if (m_thread_data.size() > 0) {
// If all else fails force the first thread to be SIGSTOP // If all else fails force the first thread to be SIGSTOP
m_thread_data.begin()->siginfo.si_signo = m_thread_data.begin()->signo =
GetUnixSignals()->GetSignalNumberFromName("SIGSTOP"); GetUnixSignals()->GetSignalNumberFromName("SIGSTOP");
} }
} }
@ -506,7 +506,7 @@ static void ParseFreeBSDPrStatus(ThreadData &thread_data,
else else
offset += 16; offset += 16;
thread_data.siginfo.si_signo = data.GetU32(&offset); // pr_cursig thread_data.signo = data.GetU32(&offset); // pr_cursig
thread_data.tid = data.GetU32(&offset); // pr_pid thread_data.tid = data.GetU32(&offset); // pr_pid
if (lp64) if (lp64)
offset += 4; offset += 4;
@ -589,7 +589,7 @@ static void ParseOpenBSDProcInfo(ThreadData &thread_data,
return; return;
offset += 4; offset += 4;
thread_data.siginfo.si_signo = data.GetU32(&offset); thread_data.signo = data.GetU32(&offset);
} }
llvm::Expected<std::vector<CoreNote>> llvm::Expected<std::vector<CoreNote>>
@ -827,7 +827,7 @@ llvm::Error ProcessElfCore::parseNetBSDNotes(llvm::ArrayRef<CoreNote> notes) {
// Signal targeted at the whole process. // Signal targeted at the whole process.
if (siglwp == 0) { if (siglwp == 0) {
for (auto &data : m_thread_data) for (auto &data : m_thread_data)
data.siginfo.si_signo = signo; data.signo = signo;
} }
// Signal destined for a particular LWP. // Signal destined for a particular LWP.
else { else {
@ -835,7 +835,7 @@ llvm::Error ProcessElfCore::parseNetBSDNotes(llvm::ArrayRef<CoreNote> notes) {
for (auto &data : m_thread_data) { for (auto &data : m_thread_data) {
if (data.tid == siglwp) { if (data.tid == siglwp) {
data.siginfo.si_signo = signo; data.signo = signo;
passed = true; passed = true;
break; break;
} }
@ -938,12 +938,11 @@ llvm::Error ProcessElfCore::parseLinuxNotes(llvm::ArrayRef<CoreNote> notes) {
break; break;
} }
case ELF::NT_SIGINFO: { case ELF::NT_SIGINFO: {
const lldb_private::UnixSignals &unix_signals = *GetUnixSignals(); lldb::offset_t size = note.data.GetByteSize();
ELFLinuxSigInfo siginfo; lldb::offset_t offset = 0;
Status status = siginfo.Parse(note.data, arch, unix_signals); const char *bytes =
if (status.Fail()) static_cast<const char *>(note.data.GetData(&offset, size));
return status.ToError(); thread_data.siginfo_bytes = llvm::StringRef(bytes, size);
thread_data.siginfo = siginfo;
break; break;
} }
case ELF::NT_FILE: { case ELF::NT_FILE: {

118
lldb/source/Plugins/Process/elf-core/ThreadElfCore.cpp
View File

@ -53,7 +53,7 @@ using namespace lldb_private;
ThreadElfCore::ThreadElfCore(Process &process, const ThreadData &td) ThreadElfCore::ThreadElfCore(Process &process, const ThreadData &td)
: Thread(process, td.tid), m_thread_name(td.name), m_thread_reg_ctx_sp(), : Thread(process, td.tid), m_thread_name(td.name), m_thread_reg_ctx_sp(),
m_gpregset_data(td.gpregset), m_notes(td.notes), m_gpregset_data(td.gpregset), m_notes(td.notes),
m_siginfo(std::move(td.siginfo)) {} m_siginfo_bytes(std::move(td.siginfo_bytes)), m_signo(td.signo) {}
ThreadElfCore::~ThreadElfCore() { DestroyThread(); } ThreadElfCore::~ThreadElfCore() { DestroyThread(); }
@ -249,26 +249,34 @@ ThreadElfCore::CreateRegisterContextForFrame(StackFrame *frame) {
return reg_ctx_sp; 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() { bool ThreadElfCore::CalculateStopInfo() {
ProcessSP process_sp(GetProcess()); ProcessSP process_sp(GetProcess());
if (!process_sp) if (!process_sp)
return false; return false;
lldb::UnixSignalsSP unix_signals_sp(process_sp->GetUnixSignals()); PlatformSP platform_sp = process_sp->GetTarget().GetPlatform();
if (!unix_signals_sp) if (platform_sp) {
return false; 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;
}
}
const char *sig_description; SetStopInfo(StopInfo::CreateStopReasonWithSignal(*this, m_signo));
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(m_stop_info_sp);
return true; return true;
} }
@ -549,83 +557,3 @@ ELFLinuxPrPsInfo::Populate(const lldb_private::ProcessInstanceInfo &info,
*(psargs - 1) = '\0'; *(psargs - 1) = '\0';
return prpsinfo; 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_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();
}

69
lldb/source/Plugins/Process/elf-core/ThreadElfCore.h
View File

@ -10,8 +10,10 @@
#define LLDB_SOURCE_PLUGINS_PROCESS_ELF_CORE_THREADELFCORE_H #define LLDB_SOURCE_PLUGINS_PROCESS_ELF_CORE_THREADELFCORE_H
#include "Plugins/Process/elf-core/RegisterUtilities.h" #include "Plugins/Process/elf-core/RegisterUtilities.h"
#include "lldb/Target/Platform.h"
#include "lldb/Target/Thread.h" #include "lldb/Target/Thread.h"
#include "lldb/Utility/DataExtractor.h" #include "lldb/Utility/DataExtractor.h"
#include "lldb/ValueObject/ValueObject.h"
#include "llvm/ADT/DenseMap.h" #include "llvm/ADT/DenseMap.h"
#include <optional> #include <optional>
#include <string> #include <string>
@ -77,50 +79,16 @@ struct ELFLinuxPrStatus {
static_assert(sizeof(ELFLinuxPrStatus) == 112, static_assert(sizeof(ELFLinuxPrStatus) == 112,
"sizeof ELFLinuxPrStatus is not correct!"); "sizeof ELFLinuxPrStatus is not correct!");
struct ELFLinuxSigInfo { struct ThreadData {
lldb_private::DataExtractor gpregset;
int32_t si_signo; // Order matters for the first 3. std::vector<lldb_private::CoreNote> notes;
int32_t si_errno; lldb::tid_t tid;
int32_t si_code; std::string name;
// Copied from siginfo_t so we don't have to include signal.h on non 'Nix llvm::StringRef siginfo_bytes;
// builds. Slight modifications to ensure no 32b vs 64b differences. int prstatus_sig = 0;
struct alignas(8) { int signo = 0;
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 differs based on architecture. // PRPSINFO structure's size differs based on architecture.
// This is the layout in the x86-64 arch case. // This is the layout in the x86-64 arch case.
// In the i386 case we parse it manually and fill it again // In the i386 case we parse it manually and fill it again
@ -163,15 +131,6 @@ struct ELFLinuxPrPsInfo {
static_assert(sizeof(ELFLinuxPrPsInfo) == 136, static_assert(sizeof(ELFLinuxPrPsInfo) == 136,
"sizeof ELFLinuxPrPsInfo is not correct!"); "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 { class ThreadElfCore : public lldb_private::Thread {
public: public:
ThreadElfCore(lldb_private::Process &process, const ThreadData &td); ThreadElfCore(lldb_private::Process &process, const ThreadData &td);
@ -200,8 +159,8 @@ public:
m_thread_name.clear(); m_thread_name.clear();
} }
void CreateStopFromSigInfo(const ELFLinuxSigInfo &siginfo, llvm::Expected<std::unique_ptr<llvm::MemoryBuffer>>
const lldb_private::UnixSignals &unix_signals); GetSiginfo(size_t max_size) const override;
protected: protected:
// Member variables. // Member variables.
@ -210,7 +169,9 @@ protected:
lldb_private::DataExtractor m_gpregset_data; lldb_private::DataExtractor m_gpregset_data;
std::vector<lldb_private::CoreNote> m_notes; std::vector<lldb_private::CoreNote> m_notes;
ELFLinuxSigInfo m_siginfo; llvm::StringRef m_siginfo_bytes;
// Only used if no siginfo note.
int m_signo;
bool CalculateStopInfo() override; bool CalculateStopInfo() override;
}; };

15
lldb/source/Target/UnixSignals.cpp
View File

@ -137,11 +137,11 @@ llvm::StringRef UnixSignals::GetSignalAsStringRef(int32_t signo) const {
return pos->second.m_name; return pos->second.m_name;
} }
std::string std::string UnixSignals::GetSignalDescription(
UnixSignals::GetSignalDescription(int32_t signo, std::optional<int32_t> code, int32_t signo, std::optional<int32_t> code,
std::optional<lldb::addr_t> addr, std::optional<lldb::addr_t> addr, std::optional<lldb::addr_t> lower,
std::optional<lldb::addr_t> lower, std::optional<lldb::addr_t> upper, std::optional<uint32_t> pid,
std::optional<lldb::addr_t> upper) const { std::optional<uint32_t> uid) const {
std::string str; std::string str;
collection::const_iterator pos = m_signals.find(signo); collection::const_iterator pos = m_signals.find(signo);
@ -180,6 +180,10 @@ UnixSignals::GetSignalDescription(int32_t signo, std::optional<int32_t> code,
strm << sc.m_description.str(); strm << sc.m_description.str();
break; break;
case SignalCodePrintOption::Sender:
if (pid && uid)
strm << " (sender pid=" << *pid << ", uid=" << *uid << ")";
break;
} }
str += strm.str(); str += strm.str();
} }
@ -397,4 +401,3 @@ bool UnixSignals::ResetSignal(int32_t signo, bool reset_stop,
(*elem).second.Reset(reset_stop, reset_notify, reset_suppress); (*elem).second.Reset(reset_stop, reset_notify, reset_suppress);
return true; return true;
} }

9
lldb/unittests/Signals/UnixSignalsTest.cpp
View File

@ -27,6 +27,8 @@ public:
AddSignalCode(16, 2, "SIG16 with a fault address", AddSignalCode(16, 2, "SIG16 with a fault address",
SignalCodePrintOption::Address); SignalCodePrintOption::Address);
AddSignalCode(16, 3, "bounds violation", SignalCodePrintOption::Bounds); AddSignalCode(16, 3, "bounds violation", SignalCodePrintOption::Bounds);
AddSignalCode(16, -6, "sent by tkill system call",
SignalCodePrintOption::Sender);
} }
}; };
@ -124,6 +126,13 @@ TEST(UnixSignalsTest, GetAsString) {
// No address given just print the code description. // No address given just print the code description.
ASSERT_EQ("SIG16: SIG16 with a fault address", ASSERT_EQ("SIG16: SIG16 with a fault address",
signals.GetSignalDescription(16, 2)); 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"; const char *expected = "SIG16: bounds violation";
// Must pass all needed info to get full output. // Must pass all needed info to get full output.