From 12c84469fd02690cca93c63fd23fe2aa9ea221b8 Mon Sep 17 00:00:00 2001 From: Joern Siglen Date: Mon, 27 Sep 2021 13:35:36 +0200 Subject: [PATCH] dbginfo.sh: exclude reading page_idle/bitmap sysfs attribute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to issues with reading the /sys/kernel/mm/page_idle/bitmap sysfs attribute that can lead to a system hang, reading this particular attribute is excluded. Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1904884 Reviewed-by: Mario Held Signed-off-by: Joern Siglen Signed-off-by: Jan Höppner --- CHANGELOG.md | 1 + scripts/dbginfo.sh | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eec2dbb3..220ba2bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ Release history for s390-tools (MIT version) For Linux kernel version: 5.xx Changes of existing tools: + - dbginfo.sh: add exception on dump2tar for /sys/kernel/mm/page_idle/bitmap - dbginfo.sh: cleanup of outdated sections and general code rework - dbginfo.sh: Collect zipl boot menu entries from boot loader specification - dbginfo.sh: add collection in area of timedate, coredump and --check option diff --git a/scripts/dbginfo.sh b/scripts/dbginfo.sh index 4836a671..77896441 100755 --- a/scripts/dbginfo.sh +++ b/scripts/dbginfo.sh @@ -145,6 +145,7 @@ print_check() { Hardware platform = ${HW} Runtime environment = ${RUNTIME_ENVIRONMENT} +$(cat /proc/sysinfo | grep 'Name') Kernel version = ${KERNEL_INFO} OS version / distro = ${OS_NAME} KVM host = ${KVM} @@ -735,7 +736,7 @@ collect_sysfs() { # files known to block on read (-x). Stop reading a file that takes # more than 5 seconds (-T 5) such as an active ftrace buffer. # error messages are not written to the log - dump2tar /sys -z -o "${OUTPUT_FILE_SYSFS}.tgz" -x '*/tracing/trace_pipe*' \ + dump2tar /sys -z -o "${OUTPUT_FILE_SYSFS}.tgz" -x '*/tracing/trace_pipe*' -x '*/page_idle/bitmap*' \ -x '*/tracing/per_cpu/*' --ignore-failed-read -J 1 -T 5 2>>${OUTPUT_FILE_SYSFS}.err if [ $? -ne 0 ] ; then