Skip to content
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

common: revert workarounds for QEMU segfaults #719

Merged
merged 1 commit into from
Mar 28, 2024
Merged

common: revert workarounds for QEMU segfaults #719

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
36 changes: 1 addition & 35 deletions common/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,40 +191,6 @@ centos_ensure_qemu_symlink() {
return 1
fi

# FIXME: workaround for intermittent QEMU segfaults when running TCG VMs in AWS on C9S
#
# See: https://issues.redhat.com/browse/RHEL-23844
if [[ "$(rpm -q --qf "%{release}" bash)" =~ .el9$ && "$(uname -m)" == x86_64 ]] && systemd-detect-virt -q; then
target="/bin/qemu-system-$(uname -m)"

cat >"$target" <<EOF
#!/bin/bash
set -ux

for _ in {0..2}; do
# Hardcode the timeout invocation into the wrapper, since the upstream test suite runs it with --foreground,
# and with this wrapper in place qemu-kvm is no longer the "main" process (and timeout with --foreground won't
# touch children of the monitored process).
timeout 30m "$source" "\$@"
ec=\$?

# 128 + 11 (SIGSEGV)
if [[ \$ec -eq 139 ]]; then
continue
fi

exit \$ec
done

echo "QEMU crashed three times in a row, we're doomed"
exit 1
EOF
chmod +x "$target"
"$target" --version

return 0
fi

systemd-detect-virt -q && target="/bin/qemu-system-$(uname -m)" || target=/bin/qemu-kvm
if [[ ! -x "${target:?}" ]]; then
ln -svf "${source:?}" "${target:?}"
Expand Down Expand Up @@ -412,7 +378,7 @@ coredumpctl_collect() {
# sleep/bash - intentional SIGABRT caused by TEST-57
# systemd-notify - intermittent (and intentional) SIGABRT caused by TEST-59
# test(-usr)?-dump - intentional coredumps from systemd-coredump tests in TEST-74
local exclude_rx="${COREDUMPCTL_EXCLUDE_RX:-/(bash|gnome-shell|qemu-kvm|sleep|systemd-notify|test-execute|test(-usr)?-dump)$}"
local exclude_rx="${COREDUMPCTL_EXCLUDE_RX:-/(bash|gnome-shell|sleep|systemd-notify|test-execute|test(-usr)?-dump)$}"
_log "Excluding coredumps matching '$exclude_rx'"
if ! "$coredumpctl_bin" "${args[@]}" -F COREDUMP_EXE | grep -Ev "$exclude_rx" > "$tempfile"; then
_log "No relevant coredumps found"
Expand Down
Loading