Skip to content

[Backtracing][Linux] Fix crash handler for musl. #82633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: release/6.1
Choose a base branch
from
Open

[Backtracing][Linux] Fix crash handler for musl. #82633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions stdlib/public/Backtracing/Elf.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,8 +875,8 @@ struct ElfSymbolTable<SomeElfTraits: ElfTraits>: ElfSymbolTableProtocol {
continue
}

// Ignore anything undefined
if symbol.st_shndx == SHN_UNDEF {
// Ignore anything undefined or absolute
if symbol.st_shndx == SHN_UNDEF || symbol.st_shndx == SHN_ABS {
continue
}

Expand Down Expand Up @@ -999,6 +999,8 @@ class ElfImage<SomeImageSource: ImageSource,
var sectionHeaders: [Traits.Shdr]?
var shouldByteSwap: Bool { return header.shouldByteSwap }

var imageBase: Source.Address

required init(source: SomeImageSource,
baseAddress: Source.Address = 0,
endAddress: Source.Address = 0) throws {
Expand Down Expand Up @@ -1029,11 +1031,21 @@ class ElfImage<SomeImageSource: ImageSource,

var phdrs: [Traits.Phdr] = []
var phAddr = Source.Address(header.e_phoff)
var minAddr: Traits.Address? = nil
for _ in 0..<header.e_phnum {
let phdr = maybeSwap(try source.fetch(from: phAddr, as: Traits.Phdr.self))
phdrs.append(phdr)
phAddr += Source.Address(header.e_phentsize)

if phdr.p_type == .PT_LOAD {
if let oldMinAddr = minAddr {
minAddr = min(oldMinAddr, phdr.p_vaddr)
} else {
minAddr = phdr.p_vaddr
}
}
}
imageBase = Source.Address(exactly: minAddr ?? 0)!
programHeaders = phdrs

if source.isMappedImage {
Expand Down
8 changes: 7 additions & 1 deletion stdlib/public/Backtracing/SymbolicatedBacktrace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,27 +496,33 @@ public struct SymbolicatedBacktrace: CustomStringConvertible {
where: { address >= $0.baseAddress
&& address < $0.endOfText }
) {
let relativeAddress = address - FileImageSource.Address(theImages[imageNdx].baseAddress)
var symbol: Symbol = Symbol(imageIndex: imageNdx,
imageName: theImages[imageNdx].name,
rawName: "<unknown>",
offset: 0,
sourceLocation: nil)
var elf32Image = elf32Cache[imageNdx]
var elf64Image = elf64Cache[imageNdx]
var imageBase = FileImageSource.Address(0)

if elf32Image == nil && elf64Image == nil {
if let source = try? FileImageSource(path: theImages[imageNdx].path) {
if let elfImage = try? Elf32Image(source: source) {
elf32Image = elfImage
elf32Cache[imageNdx] = elfImage
imageBase = elfImage.imageBase
} else if let elfImage = try? Elf64Image(source: source) {
elf64Image = elfImage
elf64Cache[imageNdx] = elfImage
imageBase = elfImage.imageBase
}
}
}

let relativeAddress = FileImageSource.Address(
address - theImages[imageNdx].baseAddress
) + imageBase

if let theSymbol = elf32Image?.lookupSymbol(address: relativeAddress) {
var location: SourceLocation?

Expand Down
47 changes: 35 additions & 12 deletions stdlib/public/runtime/CrashHandlerLinux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,15 @@
#include <string.h>
#include <unistd.h>

#define DEBUG_MEMSERVER 0

#if DEBUG_MEMSERVER
#include <stdio.h>
#define memserver_error(x) perror(x)
#else
#define memserver_error(x)
#endif

#include "swift/Runtime/Backtrace.h"

#include <cstring>
Expand Down Expand Up @@ -86,8 +95,8 @@ ssize_t safe_read(int fd, void *buf, size_t len) {
ssize_t ret;
do {
ret = read(fd, buf, len);
} while (ret < 0 && errno == EINTR);
if (ret < 0)
} while (ret <= 0 && errno == EINTR);
if (ret <= 0)
return ret;
total += ret;
ptr += ret;
Expand All @@ -106,8 +115,8 @@ ssize_t safe_write(int fd, const void *buf, size_t len) {
ssize_t ret;
do {
ret = write(fd, buf, len);
} while (ret < 0 && errno == EINTR);
if (ret < 0)
} while (ret <= 0 && errno == EINTR);
if (ret <= 0)
return ret;
total += ret;
ptr += ret;
Expand Down Expand Up @@ -657,20 +666,28 @@ memserver_start()
int fds[2];

ret = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
if (ret < 0)
if (ret < 0) {
memserver_error("memserver_start: socketpair failed");
return ret;
}

memserver_fd = fds[0];
ret = clone(memserver_entry, memserver_stack + sizeof(memserver_stack),
#if MEMSERVER_USE_PROCESS
0,
#else
CLONE_THREAD | CLONE_VM | CLONE_FILES
| CLONE_FS | CLONE_IO | CLONE_SIGHAND,
#ifndef __musl__
// Can't use CLONE_THREAD on musl because the clone() function
// there returns EINVAL if we do.
CLONE_THREAD | CLONE_SIGHAND |
#endif
CLONE_VM | CLONE_FILES | CLONE_FS | CLONE_IO,
#endif
NULL);
if (ret < 0)
if (ret < 0) {
memserver_error("memserver_start: clone failed");
return ret;
}

#if MEMSERVER_USE_PROCESS
memserver_pid = ret;
Expand Down Expand Up @@ -718,7 +735,7 @@ memserver_entry(void *dummy __attribute__((unused))) {
int fd = memserver_fd;
int result = 1;

#if MEMSERVER_USE_PROCESS
#if MEMSERVER_USE_PROCESS || defined(__musl__)
prctl(PR_SET_NAME, "[backtrace]");
#endif

Expand All @@ -743,8 +760,10 @@ memserver_entry(void *dummy __attribute__((unused))) {
ssize_t ret;

ret = safe_read(fd, &req, sizeof(req));
if (ret != sizeof(req))
if (ret != sizeof(req)) {
memserver_error("memserver: terminating because safe_read() returned wrong size");
break;
}

uint64_t addr = req.addr;
uint64_t bytes = req.len;
Expand All @@ -761,15 +780,19 @@ memserver_entry(void *dummy __attribute__((unused))) {
resp.len = ret;

ret = safe_write(fd, &resp, sizeof(resp));
if (ret != sizeof(resp))
if (ret != sizeof(resp)) {
memserver_error("memserver: terminating because safe_write() failed");
goto fail;
}

if (resp.len < 0)
break;

ret = safe_write(fd, memserver_buffer, resp.len);
if (ret != resp.len)
if (ret != resp.len) {
memserver_error("memserver: terminating because safe_write() failed (2)");
goto fail;
}

addr += resp.len;
bytes -= resp.len;
Expand Down