Skip to content

testing optimizations for labsconf 2021 talk #47

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
mwilck wants to merge 18 commits into
base: master
Choose a base branch
from
Open

testing optimizations for labsconf 2021 talk #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c13072f
labsconf 2021 debugging / profiling
mwilck Sep 30, 2021
a5a091f
weak-modules2: remove pointless debug statements in add_kmp_modules
mwilck Sep 30, 2021
e82a0c6
weak-modules2: skip "test" call to has_unresolved_symbols
mwilck Sep 30, 2021
43cceac
weak-modules2: try incremental depmod in has_unresolved_symbols
mwilck Sep 30, 2021
15ef595
weak-modules2: remove_kmp(): drop inconsistency test
mwilck Sep 30, 2021
10b023b
weak-modules2: sanitize "_kernel_" logic
mwilck Sep 30, 2021
6ad6e91
weak-modules2: split run_depmod() and build_initrd()
mwilck Oct 1, 2021
5c26cf1
weak-modules2: incremental depmod in run_depmod with WM2_DEPMOD_INC
mwilck Oct 1, 2021
633bf41
weak-modules2: use needs_initrd for kernel subpackages
mwilck Oct 1, 2021
12e0116
weak-modules2: factor out get_image_name()
mwilck Oct 1, 2021
c179127
weak-modules2: honor INITRD_IN_POSTTRANS for kernel packages
mwilck Oct 1, 2021
c027ccd
weak-modules2: shellcheck fixes
mwilck Oct 1, 2021
b8936ab
weak-modules2: skip initrd rebuild in remove_kernel_modules
mwilck Oct 1, 2021
0e0f534
weak_modules2: has_unresolved_symbols(): use correct symlinks
mwilck Oct 1, 2021
045f170
Revert 'weak-modules2: skip "test" call to has_unresolved_symbols'
mwilck Oct 2, 2021
935cfd7
regenerate-initrd-posttrans: don't use dracut --regenerate-all
mwilck Oct 4, 2021
ebfde61
regenerate-initrd-posttrans: parallel execution of dracut
mwilck Oct 4, 2021
4d0b058
weak-modules2: parallel execution of add_kmp() and remove_kmp()
mwilck Oct 4, 2021
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
11 changes: 8 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,16 @@ details.

Use the following environment variables:

* WM2_VERBOSE: value from 0 (default, no logging) - 3 (tracing).
* `WM2_VERBOSE:` value from 0 (default, no logging) - 3 (tracing).
the -v/--verbose option increases log level by one.
* WM2_DEBUG: 0 (default) or 1. Enables verbose output of certain
* `WM2_DEBUG`: 0 (default) or 1. Enables verbose output of certain
commands called by weak-modules2. Equivalent to --debug.
* WM2_LOGFILE: redirect the output to the given file.
* `WM2_LOGFILE`: redirect the output to the given file.

### Other environment variables

* `WM2_DEPMOD_INC`: set this to a non-empty string to enable the experimental
"incremental depmod" feature. This will speed up KMP installations.

## Kernel scriptlet files

Expand Down
3 changes: 3 additions & 0 deletions kernel-scriptlets/rpm-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@ EOF
[ -z "$certs" ] || /usr/lib/module-init-tools/kernel-scriptlets/cert-$op --ca-check 1 --certs "$certs" "$@"
;;
posttrans)
if test -x /usr/lib/module-init-tools/regenerate-initrd-posttrans; then
/bin/bash -c 'set +e; /usr/lib/module-init-tools/regenerate-initrd-posttrans' || script_rc=$?
fi
;;
*)
echo Unknown scriptlet "$op" >&2
Expand Down
62 changes: 54 additions & 8 deletions regenerate-initrd-posttrans
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,59 @@ for f in "$dir"/*; do
break
done

tmpdir=$(mktemp -d /var/tmp/r-i-p-XXXXXX)
[ -n "$tmpdir" ] && [ -d "$tmpdir" ] || {
echo "error: failed to create temporary directory" >&2
exit 1
}
trap 'rm -rf "$tmpdir"' 0

start_dracut() {
local kver=$1 x pid
if [ x"$RIP_PARALLEL" != x1 ]; then
if ! "$DRACUT" -f "/boot/initrd-$kver" "$kver"; then
err=$?
fi
else
"$DRACUT" -f "/boot/initrd-$kver" "$kver" >"$tmpdir/dracut-$kver.log" 2>&1 &
pid=$!
echo "$DRACUT started for $kver with pid $pid" >&2
ln -s dracut-$kver.log "$tmpdir/$pid.log"
PIDS="$PIDS $pid"
fi
}

wait_for_dracut() {
local pid err=$1

for pid in $PIDS; do
wait $pid
if [ $? -ne 0 ]; then
err=$?
echo "$DRACUT($pid) failed" >&2
else
echo "$DRACUT($pid) successful" >&2
fi
[[ ! -f "$tmpdir/$pid.log" ]] || cat "$tmpdir/$pid.log"
done
return $err
}

err=0
PIDS=""

if test -e "$dir/all"; then
rm "$dir"/*
"$DRACUT" -f --regenerate-all
exit
rm "$dir"/*
PIDS=""
for f in /lib/modules/*; do
[ -f "$f/modules.dep" ] || [ -f "$f/modules.dep.bin" ] || continue
kver=${f##*/}
start_dracut "$kver"
done
wait_for_dracut "$err"
exit $?
fi
err=0

for f in "$dir"/*; do
case $f in
"$dir/*")
Expand All @@ -53,8 +100,7 @@ for f in "$dir"/*; do
echo $0: skippping invalid kernel version "$dir/$kver"
continue
}
if ! "$DRACUT" -f --kver "$kver"; then
err=$?
fi
start_dracut "$kver"
done
exit $err
wait_for_dracut "$err"
exit $?
Loading