arm64: runtime scripts improvements on efi
v3 cover arm64: runtime scripts improvements on efi
When I run the arm64 tests on efi, I found several runtime scripts issues. This patch series try to fix all the issues.
The first patch add a missing error reporting.
The second patch skip the migration tests when run on efi since it will always fail.
The thrid patch fix the issue when parallel running tests on efi.
Changelog:
----------v2->v3:
- Collect the Reviewed-By.
- Drop the arm64 flag in patch summary of patch2.
- Small tweak to minimize the call to basename in patch3.
v1->v2:
- Add the fixes tag in patch-1.
- Change the $last_line to embedeed format in patch-1.
- Move the check EFI into the check for migration, which decrease one check in patch-2.
- Add more detailed comments about how tests fail in patch-3.
v1: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
Shaoqin Huang (3):
runtime: Fix the missing last_line
runtime: Skip the migration tests when run on EFI
arm64: efi: Make running tests on EFI can be parallel
arm/efi/run | 16 +++++++++------- scripts/runtime.bash | 6 +++++- 2 files changed, 14 insertions(+), 8 deletions(-)
Signature · 1 line
2.40.1
PATCH v3 1/3 runtime: Fix the missing last_line
The last_line is deleted by the 2607d2d6 ("arm64: Add an efi/run script"). This lead to when SKIP test, the reason is missing. Fix the problem by adding last_line back.
--- scripts/runtime.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/runtime.bash +1 -1
@@ -149,7 +149,7 @@ function run() fi if [ ${skip} == true ]; then - print_result "SKIP" $testname "" "$last_line" + print_result "SKIP" $testname "" "$(tail -1 <<<"$log")" return 77 fi }
Signature · 1 line
2.40.1
Re: [kvm-unit-tests PATCH v3 1/3] runtime: Fix the missing last_line
Quoted 27 lines · Shaoqin Huang
The
last_lineis deleted by the2607d2d6("arm64: Add an efi/run script"). This lead to when SKIP test, the reason is missing. Fix the problem by addinglast_lineback.Fixes 2607d2d6 ("arm64: Add an efi/run script")Reviewed-by Andrew Jones <[email protected]>Signed-off-by Shaoqin Huang <[email protected]>--- scripts/runtime.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)scripts/runtime.bash +1
-1@@ -149,7 +149,7 @@ function run() fi if [ ${skip} == true ]; then - print_result "SKIP" $testname "" "$last_line" + print_result "SKIP" $testname "" "$(tail -1 <<<"$log")" return 77 fi }Signature · 1 line
2.40.1
Pushing this patch now, but holding off on patch 2 of this series for now and patch 3 will go through the arm branch with some other arm efi changes.
Thanks,
drew
PATCH v3 2/3 runtime: Skip the migration tests when run on EFI
In reply to Shaoqin HuangWhen running the migration tests on EFI, the migration will always fail since the efi/run use the vvfat format to run test, but the vvfat format does not support live migration. So those migration tests will always fail.
Instead of waiting for fail everytime when run migration tests on EFI, skip those tests if running on EFI.
--- scripts/runtime.bash | 4 ++++ 1 file changed, 4 insertions(+)
scripts/runtime.bash +4 -0
@@ -156,6 +156,10 @@ function run() cmdline=$(get_cmdline $kernel) if find_word "migration" "$groups"; then + if [ "${CONFIG_EFI}" == "y" ]; then + print_result "SKIP" $testname "" "migration tests are not supported with efi" + return 2 + fi cmdline="MIGRATION=yes $cmdline" fi if find_word "panic" "$groups"; then
Signature · 1 line
2.40.1
PATCH v3 3/3 arm64: efi: Make running tests on EFI can be parallel
In reply to Shaoqin HuangCurrently running tests on EFI in parallel can cause part of tests to fail, this is because arm/efi/run script use the EFI_CASE to create the subdir under the efi-tests, and the EFI_CASE is the filename of the test, when running tests in parallel, the multiple tests exist in the same filename will execute at the same time, which will use the same directory and write the test specific things into it, this cause chaotic and make some tests fail.
For example, if we running the pmu-sw-incr and pmu-chained-counters and other pmu tests on EFI at the same time, the EFI_CASE will be pmu. So they will write their $cmd_args to the $EFI/TEST/pmu/startup.nsh at the same time, which will corrupt the startup.nsh file.
And we can get the log which outputs:
* pmu-sw-incr.log:
- ABORT: pmu: Unknown sub-test 'pmu-mem-acce'
* pmu-chained-counters.log
- ABORT: pmu: Unknown sub-test 'pmu-mem-access-reliab'
And the efi-tests/pmu/startup.nsh:
@echo -off
setvar fdtfile -guid 97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823 -rt =L"dtb" pmu.efi pmu-mem-access-reliability
setvar fdtfile -guid 97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823 -rt =L"dtb" pmu.efi pmu-chained-sw-incr
As you can see, when multiple tests write to the same startup.nsh file, it causes the issue.
To Fix this issue, use the testname instead of the filename to create the subdir under the efi-tests. We use the EFI_TESTNAME to replace the EFI_CASE in script. Since every testname is specific, now the tests can be run parallel. It also considers when user directly use the arm/efi/run to run test, in this case, still use the filename.
Besides, replace multiple $EFI_TEST/$EFI_CASE to the $EFI_CASE_DIR, this makes the script looks more clean and we don'e need to replace many EFI_CASE to EFI_TESTNAME.
--- arm/efi/run | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
arm/efi/run +9 -7
@@ -25,6 +25,8 @@ fi : "${EFI_UEFI:=$DEFAULT_UEFI}" : "${EFI_TEST:=efi-tests}" : "${EFI_CASE:=$(basename $1 .efi)}" +: "${EFI_TESTNAME:=$TESTNAME}" +: "${EFI_TESTNAME:=$EFI_CASE}" : "${EFI_VAR_GUID:=97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823}" [ "$EFI_USE_ACPI" = "y" ] || EFI_USE_DTB=y
@@ -56,20 +58,20 @@ if [ "$EFI_CASE" = "_NO_FILE_4Uhere_" ]; then EFI_CASE=dummy fi -: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_CASE"}" +: "${EFI_CASE_DIR:="$EFI_TEST/$EFI_TESTNAME"}" mkdir -p "$EFI_CASE_DIR" -cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_TEST/$EFI_CASE/" -echo "@echo -off" > "$EFI_TEST/$EFI_CASE/startup.nsh" +cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_DIR/" +echo "@echo -off" > "$EFI_CASE_DIR/startup.nsh" if [ "$EFI_USE_DTB" = "y" ]; then qemu_args+=(-machine acpi=off) FDT_BASENAME="dtb" - $(EFI_RUN=y $TEST_DIR/run -machine dumpdtb="$EFI_TEST/$EFI_CASE/$FDT_BASENAME" "${qemu_args[@]}") - echo "setvar fdtfile -guid $EFI_VAR_GUID -rt =L\"$FDT_BASENAME\"" >> "$EFI_TEST/$EFI_CASE/startup.nsh" + $(EFI_RUN=y $TEST_DIR/run -machine dumpdtb="$EFI_CASE_DIR/$FDT_BASENAME" "${qemu_args[@]}") + echo "setvar fdtfile -guid $EFI_VAR_GUID -rt =L\"$FDT_BASENAME\"" >> "$EFI_CASE_DIR/startup.nsh" fi -echo "$EFI_CASE.efi" "${cmd_args[@]}" >> "$EFI_TEST/$EFI_CASE/startup.nsh" +echo "$EFI_CASE.efi" "${cmd_args[@]}" >> "$EFI_CASE_DIR/startup.nsh" EFI_RUN=y $TEST_DIR/run \ -bios "$EFI_UEFI" \ - -drive file.dir="$EFI_TEST/$EFI_CASE/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ + -drive file.dir="$EFI_CASE_DIR/",file.driver=vvfat,file.rw=on,format=raw,if=virtio \ "${qemu_args[@]}"
Signature · 1 line
2.40.1