| Message ID | 20240822163439.13092-1-rysulliv@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 052f3951640fd96d2e777b3272a925ec6c0c8100 |
| Headers | show |
| Series | selftests/livepatch: wait for atomic replace to occur | expand |
On 8/22/24 12:34, Ryan Sullivan wrote: > Uses 'loop_until' to wait for the atomic replace to unload all previous > livepatches, as on some machines with a large number of CPUs there is a > sizable delay between the atomic replace ocurring and when sysfs > updates accordingly. > Small nit: flip this around so it describes the problem first, then the 'loop_util' solution. Also spell check "occurring" if you keep it
diff --git a/tools/testing/selftests/livepatch/test-livepatch.sh b/tools/testing/selftests/livepatch/test-livepatch.sh index 65c9c058458d..bd13257bfdfe 100755 --- a/tools/testing/selftests/livepatch/test-livepatch.sh +++ b/tools/testing/selftests/livepatch/test-livepatch.sh @@ -139,11 +139,8 @@ load_lp $MOD_REPLACE replace=1 grep 'live patched' /proc/cmdline > /dev/kmsg grep 'live patched' /proc/meminfo > /dev/kmsg -mods=(/sys/kernel/livepatch/*) -nmods=${#mods[@]} -if [ "$nmods" -ne 1 ]; then - die "Expecting only one moduled listed, found $nmods" -fi +loop_until 'mods=(/sys/kernel/livepatch/*); nmods=${#mods[@]}; [[ "$nmods" -eq 1 ]]' || + die "Expecting only one moduled listed, found $nmods" # These modules were disabled by the atomic replace for mod in $MOD_LIVEPATCH3 $MOD_LIVEPATCH2 $MOD_LIVEPATCH1; do
Uses 'loop_until' to wait for the atomic replace to unload all previous livepatches, as on some machines with a large number of CPUs there is a sizable delay between the atomic replace ocurring and when sysfs updates accordingly. Signed-off-by: Ryan Sullivan <rysulliv@redhat.com> --- tools/testing/selftests/livepatch/test-livepatch.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)