krytarowski created this revision.
krytarowski added a project: LLDB.
Correct detection of the NetBSD specific core(5) files.
The original code was apparently copied from FreeBSD
and it was buggy, because these BSDs are different and
do not share the same ELF layout for core(5) files.
Split ProcessElfCore::ParseThreadContextsFromNoteSegment
into two functions: NetBSD-specific and Generic. I presume
that other BSDs should follow this or share concepts with
NetBSD. The Linux threading and NOTE layout is very different
to the NetBSD one, and it is not easily doable, without a
monstrous design, to introduce there support for threads.
OpenBSD could reuse NetBSD code and perhaps share the same
functions, as these systems have very similar ELF core(5) layout.
Obligatory demo:
(lldb) target create "/usr/pkg/bin/rtorrent" --core "rtorrent.core"
Core file '/public/lldb_devel/rtorrent.core' (x86_64) was loaded.
(lldb) thread list
Process 0 stopped
* thread #1: tid = 3, 0x00007a59d623b51a libc.so.12`_sys___kevent50 + 10,
stop reason = signal SIGSTOP
thread #2: tid = 2, 0x00007a59d623b51a libc.so.12`_sys___kevent50 + 10,
stop reason = signal SIGSTOP
thread #3: tid = 1, 0x00007a59d623b21a libc.so.12`__select50 + 10, stop
reason = signal SIGSTOP
(lldb) thread select 2
* thread #2, stop reason = signal SIGSTOP
frame #0: 0x00007a59d623b51a libc.so.12`_sys___kevent50 + 10
libc.so.12`_sys___kevent50:
-> 0x7a59d623b51a <+10>: addb %al, (%rax)
0x7a59d623b51c <+12>: addb %al, (%rax)
0x7a59d623b51e <+14>: addb %al, (%rax)
0x7a59d623b520 <+16>: addb %al, (%rax)
(lldb) bt
* thread #2, stop reason = signal SIGSTOP
* frame #0: 0x00007a59d623b51a libc.so.12`_sys___kevent50 + 10
frame #1: 0x00007a59d6606c97 libpthread.so.1`__kevent50(fd=<unavailable>,
ev=<unavailable>, nev=<unavailable>, rev=<unavailable>, nrev=<unavailable>,
ts=<unavailable>) at pthread_cancelstub.c:176
frame #2: 0x00007a59d91167f2
libtorrent.so.19`torrent::PollKQueue::poll(this=0x00007a59da153200, msec=10001)
at poll_kqueue.cc:167
frame #3: 0x00007a59d9116d98
libtorrent.so.19`torrent::PollKQueue::do_poll(this=0x00007a59da153200,
timeout_usec=10000000, flags=1) at poll_kqueue.cc:268
frame #4: 0x00007a59d91396d6
libtorrent.so.19`torrent::thread_base::event_loop(thread=0x00007a59da1a6700) at
thread_base.cc:174
frame #5: 0x00007a59d660b6e1
libpthread.so.1`pthread__create_tramp(cookie=0x00007a59da1fd000) at
pthread.c:576
frame #6: 0x00007a59d6287ac0 libc.so.12
Sponsored by <The NetBSD Foundation>
Repository:
rL LLVM
https://reviews.llvm.org/D32149
Files:
source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
source/Plugins/Process/elf-core/ProcessElfCore.cpp
source/Plugins/Process/elf-core/ProcessElfCore.h
Index: source/Plugins/Process/elf-core/ProcessElfCore.h
===================================================================
--- source/Plugins/Process/elf-core/ProcessElfCore.h
+++ source/Plugins/Process/elf-core/ProcessElfCore.h
@@ -125,6 +125,18 @@
lldb_private::ConstString path;
};
+ // Parse thread(s) data structuresNetBSD(prstatus, prpsinfo) from given NOTE
+ // segment
+ lldb_private::Error ParseThreadContextsFromNoteSegmentNetBSD(
+ const elf::ELFProgramHeader *segment_header,
+ lldb_private::DataExtractor segment_data);
+
+ // Parse thread(s) data structuresGeneric(prstatus, prpsinfo) from given NOTE
+ // segment
+ lldb_private::Error ParseThreadContextsFromNoteSegmentGeneric(
+ const elf::ELFProgramHeader *segment_header,
+ lldb_private::DataExtractor segment_data);
+
//------------------------------------------------------------------
// For ProcessElfCore only
//------------------------------------------------------------------
Index: source/Plugins/Process/elf-core/ProcessElfCore.cpp
===================================================================
--- source/Plugins/Process/elf-core/ProcessElfCore.cpp
+++ source/Plugins/Process/elf-core/ProcessElfCore.cpp
@@ -19,6 +19,7 @@
#include "lldb/Core/PluginManager.h"
#include "lldb/Core/Section.h"
#include "lldb/Core/State.h"
+#include "lldb/Host/StringConvert.h"
#include "lldb/Target/DynamicLoader.h"
#include "lldb/Target/MemoryRegionInfo.h"
#include "lldb/Target/Target.h"
@@ -219,7 +220,7 @@
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.
@@ -373,7 +374,8 @@
lldb::addr_t bytes_left =
0; // Number of bytes available in the core file from the given address
- // Don't proceed if core file doesn't contain the actual data for this address range.
+ // Don't proceed if core file doesn't contain the actual data for this address
+ // range.
if (file_start == file_end)
return 0;
@@ -458,9 +460,14 @@
namespace NETBSD {
-enum { NT_PROCINFO = 1, NT_AUXV, NT_AMD64_REGS = 33, NT_AMD64_FPREGS = 35 };
+enum { NT_PROCINFO = 1, NT_PROCINFO_SIZE = 160, NT_AUXV = 2 };
+
+namespace AMD64 {
+enum { NT_REGS = 33, NT_FPREGS = 35 };
}
+} // namespace NETBSD
+
// Parse a FreeBSD NT_PRSTATUS note - see FreeBSD sys/procfs.h for details.
static void ParseFreeBSDPrStatus(ThreadData &thread_data, DataExtractor &data,
ArchSpec &arch) {
@@ -497,15 +504,29 @@
thread_data.name = data.GetCStr(&offset, 20);
}
-static void ParseNetBSDProcInfo(ThreadData &thread_data, DataExtractor &data) {
+static Error ParseNetBSDProcInfo(DataExtractor &data, uint32_t &cpi_nlwps,
+ uint32_t &cpi_signo, uint32_t &cpi_siglwp) {
lldb::offset_t offset = 0;
- int version = data.GetU32(&offset);
+ uint32_t version = data.GetU32(&offset);
if (version != 1)
- return;
+ return Error(
+ "Error parsing NetBSD core(5) notes: Unsupported procinfo version");
- offset += 4;
- thread_data.signo = data.GetU32(&offset);
+ uint32_t cpisize = data.GetU32(&offset);
+ if (cpisize != NETBSD::NT_PROCINFO_SIZE)
+ return Error(
+ "Error parsing NetBSD core(5) notes: Unsupported procinfo size");
+
+ cpi_signo = data.GetU32(&offset); /* killing signal */
+
+ offset += 108;
+ cpi_nlwps = data.GetU32(&offset); /* number of LWPs */
+
+ offset += 32;
+ cpi_siglwp = data.GetU32(&offset); /* LWP target of killing signal */
+
+ return Error();
}
static void ParseOpenBSDProcInfo(ThreadData &thread_data, DataExtractor &data) {
@@ -524,12 +545,28 @@
/// 1) A PT_NOTE segment is composed of one or more NOTE entries.
/// 2) NOTE Entry contains a standard header followed by variable size data.
/// (see ELFNote structure)
-/// 3) A Thread Context in a core file usually described by 3 NOTE entries.
+Error ProcessElfCore::ParseThreadContextsFromNoteSegment(
+ const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
+
+ assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
+
+ switch (GetArchitecture().GetTriple().getOS()) {
+ case llvm::Triple::NetBSD:
+ return ParseThreadContextsFromNoteSegmentNetBSD(segment_header,
+ segment_data);
+ default:
+ return ParseThreadContextsFromNoteSegmentGeneric(segment_header,
+ segment_data);
+ }
+}
+
+/// Generic (Linux, ...) specific Thread context from PT_NOTE segment
+/// 1) A Thread Context in a core file usually described by 3 NOTE entries.
/// a) NT_PRSTATUS - Register context
/// b) NT_PRPSINFO - Process info(pid..)
/// c) NT_FPREGSET - Floating point registers
-/// 4) The NOTE entries can be in any order
-/// 5) If a core file contains multiple thread contexts then there is two data
+/// 2) The NOTE entries can be in any order
+/// 3) If a core file contains multiple thread contexts then there is two data
/// forms
/// a) Each thread context(2 or more NOTE entries) contained in its own
/// segment (PT_NOTE)
@@ -540,8 +577,9 @@
/// new thread when it finds NT_PRSTATUS or NT_PRPSINFO NOTE entry.
/// For case (b) there may be either one NT_PRPSINFO per thread, or a single
/// one that applies to all threads (depending on the platform type).
-Error ProcessElfCore::ParseThreadContextsFromNoteSegment(
+Error ProcessElfCore::ParseThreadContextsFromNoteSegmentGeneric(
const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
+
assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
lldb::offset_t offset = 0;
@@ -607,21 +645,6 @@
default:
break;
}
- } else if (note.n_name.substr(0, 11) == "NetBSD-CORE") {
- // NetBSD per-thread information is stored in notes named
- // "NetBSD-CORE@nnn" so match on the initial part of the string.
- m_os = llvm::Triple::NetBSD;
- if (note.n_type == NETBSD::NT_PROCINFO) {
- ParseNetBSDProcInfo(*thread_data, note_data);
- } else if (note.n_type == NETBSD::NT_AUXV) {
- m_auxv = DataExtractor(note_data);
- } else if (arch.GetMachine() == llvm::Triple::x86_64 &&
- note.n_type == NETBSD::NT_AMD64_REGS) {
- thread_data->gpregset = note_data;
- } else if (arch.GetMachine() == llvm::Triple::x86_64 &&
- note.n_type == NETBSD::NT_AMD64_FPREGS) {
- thread_data->fpregset = note_data;
- }
} else if (note.n_name.substr(0, 7) == "OpenBSD") {
// OpenBSD per-thread information is stored in notes named
// "OpenBSD@nnn" so match on the initial part of the string.
@@ -659,7 +682,7 @@
// The result from FXSAVE is in NT_PRXFPREG for i386 core files
if (arch.GetCore() == ArchSpec::eCore_x86_64_x86_64)
thread_data->fpregset = note_data;
- else if(arch.IsMIPS())
+ else if (arch.IsMIPS())
thread_data->fpregset = note_data;
break;
case NT_PRPSINFO:
@@ -717,6 +740,134 @@
return error;
}
+/// NetBSD specific Thread context from PT_NOTE segment
+///
+/// NetBSD ELF core files use notes to provide information about
+/// the process's state. The note name is "NetBSD-CORE" for
+/// information that is global to the process, and "NetBSD-CORE@nn",
+/// where "nn" is the lwpid of the LWP that the information belongs
+/// to (such as register state).
+///
+/// NetBSD uses the following note identifiers:
+///
+/// ELF_NOTE_NETBSD_CORE_PROCINFO (value 1)
+/// Note is a "netbsd_elfcore_procinfo" structure.
+/// ELF_NOTE_NETBSD_CORE_AUXV (value 2; since NetBSD 8.0)
+/// Note is an array of AuxInfo structures.
+///
+/// NetBSD also uses ptrace(2) request numbers (the ones that exist in
+/// machine-dependent space) to identify register info notes. The
+/// info in such notes is in the same format that ptrace(2) would
+/// export that information.
+///
+/// For more information see /usr/include/sys/exec_elf.h
+///
+Error ProcessElfCore::ParseThreadContextsFromNoteSegmentNetBSD(
+ const elf::ELFProgramHeader *segment_header, DataExtractor segment_data) {
+
+ assert(segment_header && segment_header->p_type == llvm::ELF::PT_NOTE);
+
+ lldb::offset_t offset = 0;
+ ArchSpec arch = GetArchitecture();
+ m_os = llvm::Triple::NetBSD;
+
+ /*
+ * To be extracted from struct netbsd_elfcore_procinfo
+ * Used to sanity check of the LWPs of the process
+ */
+ uint32_t nlwps = 0;
+ uint32_t signo; /* killing signal */
+ uint32_t siglwp; /* LWP target of killing signal */
+
+ while (offset < segment_header->p_filesz) {
+ ELFNote note = ELFNote();
+ note.Parse(segment_data, &offset);
+
+ size_t note_start, note_size;
+ note_start = offset;
+ note_size = llvm::alignTo(note.n_descsz, 4);
+
+ // Store the NOTE information in the current thread
+ DataExtractor note_data(segment_data, note_start, note_size);
+ note_data.SetAddressByteSize(
+ m_core_module_sp->GetArchitecture().GetAddressByteSize());
+
+ if ((note.n_name == "NetBSD-CORE") &&
+ (note.n_type == NETBSD::NT_PROCINFO)) {
+ Error error = ParseNetBSDProcInfo(note_data, nlwps, signo, siglwp);
+ if (error.Fail())
+ return error;
+ } else if ((note.n_name == "NetBSD-CORE") &&
+ (note.n_type == NETBSD::NT_AUXV)) {
+ m_auxv = DataExtractor(note_data);
+ } else if ((note.n_name.substr(0, 12) == "NetBSD-CORE@")) {
+ switch (arch.GetMachine()) {
+ case llvm::Triple::x86_64: {
+ /* Assume orfer PT_GETREGS, PT_GETFPREGS */
+ if (note.n_type == NETBSD::AMD64::NT_REGS) {
+ m_thread_data.push_back(ThreadData());
+ m_thread_data.back().gpregset = note_data;
+ bool success;
+ m_thread_data.back().tid = StringConvert::ToUInt32(
+ note.n_name.substr(12).c_str(), UINT32_MAX, 0, &success);
+ if (!success)
+ return Error("Error parsing NetBSD core(5) notes: Cannot convert "
+ "LWP ID to integer");
+ } else if (note.n_type == NETBSD::AMD64::NT_FPREGS) {
+ if (m_thread_data.empty())
+ return Error("Error parsing NetBSD core(5) notes: Unexpected order "
+ "of NOTEs PT_GETFPREG before PT_GETREG");
+ m_thread_data.back().fpregset = note_data;
+ } else {
+ return Error(
+ "Error parsing NetBSD core(5) notes: Unsupported AMD64 NOTE");
+ }
+ } break;
+ default:
+ return Error(
+ "Error parsing NetBSD core(5) notes: Unsupported architecture");
+ }
+ } else {
+ return Error("Error parsing NetBSD core(5) notes: Unrecognized note");
+ }
+
+ offset += note_size;
+ }
+
+ if (m_thread_data.empty())
+ return Error("Error parsing NetBSD core(5) notes: No threads information "
+ "specified in notes");
+
+ if (m_thread_data.size() != nlwps)
+ return Error("rror parsing NetBSD core(5) notes: Mismatch between the "
+ "number of LWPs in netbsd_elfcore_procinfo and the number of "
+ "LWPs specified by MD notes");
+
+ /* The whole process signal */
+ if (siglwp == 0) {
+ std::for_each(
+ m_thread_data.begin(), m_thread_data.end(),
+ [&signo](ThreadData &thread_data) { thread_data.signo = signo; });
+ }
+ /* Signal destinated for a particular LWP */
+ else {
+ bool passed = false;
+
+ for (auto it = m_thread_data.begin(); it != m_thread_data.end(); ++it) {
+ if (it->tid == siglwp) {
+ it->signo = signo;
+ passed = true;
+ break;
+ }
+ }
+ if (!passed)
+ return Error(
+ "Error parsing NetBSD core(5) notes: Signal passed to unknown LWP");
+ }
+
+ return Error();
+}
+
uint32_t ProcessElfCore::GetNumThreadContexts() {
if (!m_thread_data_valid)
DoLoadCore();
@@ -730,7 +881,7 @@
core_file->GetArchitecture(arch);
ArchSpec target_arch = GetTarget().GetArchitecture();
-
+
if (target_arch.IsMIPS())
return target_arch;
Index: source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
===================================================================
--- source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -51,7 +51,7 @@
// ELF note owner definitions
const char *const LLDB_NT_OWNER_FREEBSD = "FreeBSD";
const char *const LLDB_NT_OWNER_GNU = "GNU";
-const char *const LLDB_NT_OWNER_NETBSD = "NetBSD";
+const char *const LLDB_NT_OWNER_NETBSDCORE = "NetBSD-CORE";
const char *const LLDB_NT_OWNER_OPENBSD = "OpenBSD";
const char *const LLDB_NT_OWNER_CSR = "csr";
const char *const LLDB_NT_OWNER_ANDROID = "Android";
@@ -67,8 +67,7 @@
const elf_word LLDB_NT_GNU_BUILD_ID_TAG = 0x03;
-const elf_word LLDB_NT_NETBSD_ABI_TAG = 0x01;
-const elf_word LLDB_NT_NETBSD_ABI_SIZE = 4;
+const elf_word LLDB_NT_NETBSD_NT_PROCINFO = 1;
// GNU ABI note OS constants
const elf_word LLDB_NT_GNU_ABI_OS_LINUX = 0x00;
@@ -1371,24 +1370,11 @@
arch_spec.GetTriple().setOS(llvm::Triple::OSType::Linux);
}
// Process NetBSD ELF notes.
- else if ((note.n_name == LLDB_NT_OWNER_NETBSD) &&
- (note.n_type == LLDB_NT_NETBSD_ABI_TAG) &&
- (note.n_descsz == LLDB_NT_NETBSD_ABI_SIZE)) {
- // Pull out the min version info.
- uint32_t version_info;
- if (data.GetU32(&offset, &version_info, 1) == nullptr) {
- error.SetErrorString("failed to read NetBSD ABI note payload");
- return error;
- }
-
+ else if ((note.n_name == LLDB_NT_OWNER_NETBSDCORE) &&
+ (note.n_type == LLDB_NT_NETBSD_NT_PROCINFO)) {
// Set the elf OS version to NetBSD. Also clear the vendor.
arch_spec.GetTriple().setOS(llvm::Triple::OSType::NetBSD);
arch_spec.GetTriple().setVendor(llvm::Triple::VendorType::UnknownVendor);
-
- if (log)
- log->Printf(
- "ObjectFileELF::%s detected NetBSD, min version constant %" PRIu32,
- __FUNCTION__, version_info);
}
// Process OpenBSD ELF notes.
else if (note.n_name == LLDB_NT_OWNER_OPENBSD) {
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
