mirror of
https://github.com/RGBCube/serenity
synced 2025-05-30 23:58:12 +00:00
Kernel: Abort core dump generation if any substep fails
And make an effort to propagate errors out from the inner parts. This fixes an issue where the kernel would infinitely loop in coredump generation if the TmpFS filled up.
This commit is contained in:
parent
531c3fe72e
commit
2dfe5751f3
4 changed files with 52 additions and 24 deletions
|
@ -84,7 +84,7 @@ RefPtr<FileDescription> CoreDump::create_target_file(const Process& process, con
|
||||||
return fd_or_error.value();
|
return fd_or_error.value();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreDump::write_elf_header()
|
KResult CoreDump::write_elf_header()
|
||||||
{
|
{
|
||||||
Elf32_Ehdr elf_file_header;
|
Elf32_Ehdr elf_file_header;
|
||||||
elf_file_header.e_ident[EI_MAG0] = 0x7f;
|
elf_file_header.e_ident[EI_MAG0] = 0x7f;
|
||||||
|
@ -116,10 +116,13 @@ void CoreDump::write_elf_header()
|
||||||
elf_file_header.e_shnum = 0;
|
elf_file_header.e_shnum = 0;
|
||||||
elf_file_header.e_shstrndx = SHN_UNDEF;
|
elf_file_header.e_shstrndx = SHN_UNDEF;
|
||||||
|
|
||||||
[[maybe_unused]] auto rc = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(reinterpret_cast<uint8_t*>(&elf_file_header)), sizeof(Elf32_Ehdr));
|
auto result = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(reinterpret_cast<uint8_t*>(&elf_file_header)), sizeof(Elf32_Ehdr));
|
||||||
|
if (result.is_error())
|
||||||
|
return result.error();
|
||||||
|
return KSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreDump::write_program_headers(size_t notes_size)
|
KResult CoreDump::write_program_headers(size_t notes_size)
|
||||||
{
|
{
|
||||||
size_t offset = sizeof(Elf32_Ehdr) + m_num_program_headers * sizeof(Elf32_Phdr);
|
size_t offset = sizeof(Elf32_Ehdr) + m_num_program_headers * sizeof(Elf32_Phdr);
|
||||||
for (auto& region : m_process.m_regions) {
|
for (auto& region : m_process.m_regions) {
|
||||||
|
@ -155,10 +158,13 @@ void CoreDump::write_program_headers(size_t notes_size)
|
||||||
notes_pheader.p_align = 0;
|
notes_pheader.p_align = 0;
|
||||||
notes_pheader.p_flags = 0;
|
notes_pheader.p_flags = 0;
|
||||||
|
|
||||||
[[maybe_unused]] auto rc = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(reinterpret_cast<uint8_t*>(¬es_pheader)), sizeof(Elf32_Phdr));
|
auto result = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(reinterpret_cast<uint8_t*>(¬es_pheader)), sizeof(Elf32_Phdr));
|
||||||
|
if (result.is_error())
|
||||||
|
return result.error();
|
||||||
|
return KSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreDump::write_regions()
|
KResult CoreDump::write_regions()
|
||||||
{
|
{
|
||||||
for (auto& region : m_process.m_regions) {
|
for (auto& region : m_process.m_regions) {
|
||||||
if (region.is_kernel())
|
if (region.is_kernel())
|
||||||
|
@ -182,14 +188,20 @@ void CoreDump::write_regions()
|
||||||
// (A page may not be backed by a physical page because it has never been faulted in when the process ran).
|
// (A page may not be backed by a physical page because it has never been faulted in when the process ran).
|
||||||
src_buffer = UserOrKernelBuffer::for_kernel_buffer(zero_buffer);
|
src_buffer = UserOrKernelBuffer::for_kernel_buffer(zero_buffer);
|
||||||
}
|
}
|
||||||
[[maybe_unused]] auto rc = m_fd->write(src_buffer.value(), PAGE_SIZE);
|
auto result = m_fd->write(src_buffer.value(), PAGE_SIZE);
|
||||||
|
if (result.is_error())
|
||||||
|
return result.error();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return KSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreDump::write_notes_segment(ByteBuffer& notes_segment)
|
KResult CoreDump::write_notes_segment(ByteBuffer& notes_segment)
|
||||||
{
|
{
|
||||||
[[maybe_unused]] auto rc = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(notes_segment.data()), notes_segment.size());
|
auto result = m_fd->write(UserOrKernelBuffer::for_kernel_buffer(notes_segment.data()), notes_segment.size());
|
||||||
|
if (result.is_error())
|
||||||
|
return result.error();
|
||||||
|
return KSuccess;
|
||||||
}
|
}
|
||||||
|
|
||||||
ByteBuffer CoreDump::create_notes_threads_data() const
|
ByteBuffer CoreDump::create_notes_threads_data() const
|
||||||
|
@ -253,18 +265,26 @@ ByteBuffer CoreDump::create_notes_segment_data() const
|
||||||
return notes_buffer;
|
return notes_buffer;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CoreDump::write()
|
KResult CoreDump::write()
|
||||||
{
|
{
|
||||||
ProcessPagingScope scope(m_process);
|
ProcessPagingScope scope(m_process);
|
||||||
|
|
||||||
ByteBuffer notes_segment = create_notes_segment_data();
|
ByteBuffer notes_segment = create_notes_segment_data();
|
||||||
|
|
||||||
write_elf_header();
|
auto result = write_elf_header();
|
||||||
write_program_headers(notes_segment.size());
|
if (result.is_error())
|
||||||
write_regions();
|
return result;
|
||||||
write_notes_segment(notes_segment);
|
result = write_program_headers(notes_segment.size());
|
||||||
|
if (result.is_error())
|
||||||
|
return result;
|
||||||
|
result = write_regions();
|
||||||
|
if (result.is_error())
|
||||||
|
return result;
|
||||||
|
result = write_notes_segment(notes_segment);
|
||||||
|
if (result.is_error())
|
||||||
|
return result;
|
||||||
|
|
||||||
[[maybe_unused]] auto rc = m_fd->chmod(0400); // Make coredump file readable
|
return m_fd->chmod(0400); // Make coredump file readable
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,16 +42,16 @@ public:
|
||||||
static OwnPtr<CoreDump> create(Process&, const String& output_path);
|
static OwnPtr<CoreDump> create(Process&, const String& output_path);
|
||||||
|
|
||||||
~CoreDump();
|
~CoreDump();
|
||||||
void write();
|
[[nodiscard]] KResult write();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
CoreDump(Process&, NonnullRefPtr<FileDescription>&&);
|
CoreDump(Process&, NonnullRefPtr<FileDescription>&&);
|
||||||
static RefPtr<FileDescription> create_target_file(const Process&, const String& output_path);
|
static RefPtr<FileDescription> create_target_file(const Process&, const String& output_path);
|
||||||
|
|
||||||
void write_elf_header();
|
[[nodiscard]] KResult write_elf_header();
|
||||||
void write_program_headers(size_t notes_size);
|
[[nodiscard]] KResult write_program_headers(size_t notes_size);
|
||||||
void write_regions();
|
[[nodiscard]] KResult write_regions();
|
||||||
void write_notes_segment(ByteBuffer&);
|
[[nodiscard]] KResult write_notes_segment(ByteBuffer&);
|
||||||
|
|
||||||
ByteBuffer create_notes_segment_data() const;
|
ByteBuffer create_notes_segment_data() const;
|
||||||
ByteBuffer create_notes_threads_data() const;
|
ByteBuffer create_notes_threads_data() const;
|
||||||
|
|
|
@ -590,7 +590,9 @@ void Process::finalize()
|
||||||
if (is_profiling()) {
|
if (is_profiling()) {
|
||||||
auto coredump = CoreDump::create(*this, String::formatted("/tmp/profiler_coredumps/{}", pid().value()));
|
auto coredump = CoreDump::create(*this, String::formatted("/tmp/profiler_coredumps/{}", pid().value()));
|
||||||
if (coredump) {
|
if (coredump) {
|
||||||
coredump->write();
|
auto result = coredump->write();
|
||||||
|
if (result.is_error())
|
||||||
|
dbgln("Core dump generation failed: {}", result.error());
|
||||||
} else {
|
} else {
|
||||||
dbgln("Could not create coredump");
|
dbgln("Could not create coredump");
|
||||||
}
|
}
|
||||||
|
@ -601,7 +603,9 @@ void Process::finalize()
|
||||||
auto coredump_path = String::formatted("/tmp/coredump/{}_{}_{}", name(), m_pid.value(), RTC::now());
|
auto coredump_path = String::formatted("/tmp/coredump/{}_{}_{}", name(), m_pid.value(), RTC::now());
|
||||||
auto coredump = CoreDump::create(*this, coredump_path);
|
auto coredump = CoreDump::create(*this, coredump_path);
|
||||||
if (coredump) {
|
if (coredump) {
|
||||||
coredump->write();
|
auto result = coredump->write();
|
||||||
|
if (result.is_error())
|
||||||
|
dbgln("Core dump generation failed: {}", result.error());
|
||||||
} else {
|
} else {
|
||||||
dbgln("Could not create coredump");
|
dbgln("Could not create coredump");
|
||||||
}
|
}
|
||||||
|
|
|
@ -60,10 +60,14 @@ int Process::sys$profiling_disable(pid_t pid)
|
||||||
// We explicitly unlock here because we can't hold the lock when writing the coredump VFS
|
// We explicitly unlock here because we can't hold the lock when writing the coredump VFS
|
||||||
lock.unlock();
|
lock.unlock();
|
||||||
|
|
||||||
if (auto coredump = CoreDump::create(*process, String::formatted("/tmp/profiler_coredumps/{}", pid)))
|
if (auto coredump = CoreDump::create(*process, String::formatted("/tmp/profiler_coredumps/{}", pid))) {
|
||||||
coredump->write();
|
auto result = coredump->write();
|
||||||
else
|
if (result.is_error())
|
||||||
|
return result.error();
|
||||||
|
} else {
|
||||||
|
// FIXME: Return an error maybe?
|
||||||
dbgln("Unable to create profiler coredump for PID {}", pid);
|
dbgln("Unable to create profiler coredump for PID {}", pid);
|
||||||
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue