Skip to content

Commit 3534e03

Browse files
beshlemankuba-moo
authored andcommitted
selftests/vsock: avoid false-positives when checking dmesg
Sometimes VMs will have some intermittent dmesg warnings that are unrelated to vsock. Change the dmesg parsing to filter on strings containing 'vsock' to avoid false positive failures that are unrelated to vsock. The downside is that it is possible for some vsock related warnings to not contain the substring 'vsock', so those will be missed. Fixes: a4a65c6 ("selftests/vsock: add initial vmtest.sh for vsock") Reviewed-by: Simon Horman <horms@kernel.org> Signed-off-by: Bobby Eshleman <bobbyeshleman@meta.com> Reviewed-by: Stefano Garzarella <sgarzare@redhat.com> Link: https://patch.msgid.link/20251105-vsock-vmtest-dmesg-fix-v2-1-1a042a14892c@meta.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 13fef4f commit 3534e03

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

tools/testing/selftests/vsock/vmtest.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,9 @@ run_test() {
389389
local rc
390390

391391
host_oops_cnt_before=$(dmesg | grep -c -i 'Oops')
392-
host_warn_cnt_before=$(dmesg --level=warn | wc -l)
392+
host_warn_cnt_before=$(dmesg --level=warn | grep -c -i 'vsock')
393393
vm_oops_cnt_before=$(vm_ssh -- dmesg | grep -c -i 'Oops')
394-
vm_warn_cnt_before=$(vm_ssh -- dmesg --level=warn | wc -l)
394+
vm_warn_cnt_before=$(vm_ssh -- dmesg --level=warn | grep -c -i 'vsock')
395395

396396
name=$(echo "${1}" | awk '{ print $1 }')
397397
eval test_"${name}"
@@ -403,7 +403,7 @@ run_test() {
403403
rc=$KSFT_FAIL
404404
fi
405405

406-
host_warn_cnt_after=$(dmesg --level=warn | wc -l)
406+
host_warn_cnt_after=$(dmesg --level=warn | grep -c -i 'vsock')
407407
if [[ ${host_warn_cnt_after} -gt ${host_warn_cnt_before} ]]; then
408408
echo "FAIL: kernel warning detected on host" | log_host "${name}"
409409
rc=$KSFT_FAIL
@@ -415,7 +415,7 @@ run_test() {
415415
rc=$KSFT_FAIL
416416
fi
417417

418-
vm_warn_cnt_after=$(vm_ssh -- dmesg --level=warn | wc -l)
418+
vm_warn_cnt_after=$(vm_ssh -- dmesg --level=warn | grep -c -i 'vsock')
419419
if [[ ${vm_warn_cnt_after} -gt ${vm_warn_cnt_before} ]]; then
420420
echo "FAIL: kernel warning detected on vm" | log_host "${name}"
421421
rc=$KSFT_FAIL

0 commit comments

Comments
 (0)