From nobody Wed Jun 17 02:50:49 2026 Received: from mail-oo1-f98.google.com (mail-oo1-f98.google.com [209.85.161.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D1B73DDDBE for ; Tue, 21 Apr 2026 20:09:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802154; cv=none; b=sGsYTKzkOWq89xawaA8ptjHmBagTWBlkrgA+c/xmU+OLZtj3ld6//Yoz9t80PA0DjIlnfto7rVH7MR0glDPf+60egfOCOSmAHr5oFvq98WM9brpaDDSsYfcdHvbGlFnSDuig9NNqGfc8Sbj0oOL6dndqX5N4SDfsDeBi4DKbpNo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802154; c=relaxed/simple; bh=3bZzptENpoBqzIHXaVa0LkMXfgfRwFVRlUiPmM914Fc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OkbkCgD5TIXRnP6xY9W+nn9XsOwHa/N4XvLG4QpxC93bm7Pcmu/ol9LU+00aJT2gOL28fnhZIdVliVhI0/1DLXe46KClfzXLO2Srs8cu8fpbOZ8z78/hdg8BQ3BImqxgcJLlAh+xZ3O1uthAfB58ZMDFhDzhT/NHE5Bp6cqmyoc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=PF20AzFX; arc=none smtp.client-ip=209.85.161.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="PF20AzFX" Received: by mail-oo1-f98.google.com with SMTP id 006d021491bc7-6948c21f72eso114206eaf.0 for ; Tue, 21 Apr 2026 13:09:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1776802146; x=1777406946; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5HbzcGaNxncNlRgz3rnOziXXo7yuHKny0NAgQHvZ9SM=; b=PF20AzFXke0vC/c2Jm+OzcjFwB5cCZzV7xxuXiTb/uNTquHQIAU4/4mby8ZZKskvHE +epERBGXmHPsmcuhLRTfyObsMjM1Yk7WtDbKlZjAbS9lRa316Gz5MGzVTexOOhgnxJs+ /9x546n/Gwv6e1veEKJN36nZezqufUMXu9AmLPlU2KYVYwe+MKOU9YcQmjtQJBUMfezz X8QIMYUWhTXeFr3wQsPvKF/KjSyTphRjVkRVxDSAQYovIpna02GHVxF6Uo5qMNIe58MU nflTJ+ejPVkhMnERXu+uFGnfWMvDhyPHP132I9daVOigrS+FrW1b5TpwR5QNm2b0F++Y a6rA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776802146; x=1777406946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5HbzcGaNxncNlRgz3rnOziXXo7yuHKny0NAgQHvZ9SM=; b=GqFJtJ5LsxqVgSICG+zPtNGB4pkYTjDH4Yoa+oI5c8GLSg1lIHwSH63ksk1aRm1YWQ BI4DBrEA3y2yGD+J61dw4v//jK7qkn56dCWvWWtJhuhyYMEvlzyAsrcDH4BJGgNTpfbg R1s9x61SR91BDyAK30rRR5KAAERn2aVXVipyIbntlwWT7FdhAxomBiem4WTysRMLjY4P YA52fL5RGewQ2DwRR8pFQKvbwjdwOuceOpENVLoankxa4qW+pRYJpwJrgBnLWePyFvMw 45ZEToSQTIdLcakEPaYIEMdz9KbgBGUkVtZH4eSYtT95Px1ia9ypGps5rRDaCvgoUB/c rDog== X-Gm-Message-State: AOJu0YwPwvDFQhB45iJWYO/M2+FIgVKAOPmHrmIpcHuB3ns7hNDaDN02 HjqE5fXeLPPKDJNso+Pyjac9ZN1GURupxSBusDbkVS/MGk4+hur7NJdKY9Q7SVcDsFqMhvakIJ4 +BTWwwexD0ShiZLjtHO8LzNNyBA6HKS+P7Vct X-Gm-Gg: AeBDieszGlfljuIKD61qaNF2tqQAIeKdtMNjUWxzIfjylZetq6EIJM4YY+gPKlfIqFp MnDXEljbh+w8SLU37iiaEdPNAiGsQj4uJMXYpftXn43HHMzHw499Sg/0T7xJ8ELZHjU34eCo6oJ VZLiu6ZP+5s8lDWTEc40YqmceyBqQ+kxHM80JqRFwSdJIEXxhhqEFMxSgQt+pormf4LJVoa3WxL FjgRL7aLsV3+AKX6KhW7mxlrdA3/7EZ7/OWXX05Qea22dAH+9+XC4vPnTAFeCsvUiY7vhsEmcMb 9rhKGn6ipY4gVAT679mXIbFet2p4CJhanXi1QrH+NdJz9F5PNiWBIAK35zeeE7fTv1kD4auL38N aFVNyPk5DQLWX9hHRBnH/Jqv9/iKh8GsOjB917ACsUCXfzlNdFl3N3r4UY5pwV68R X-Received: by 2002:a05:6820:638d:b0:687:aaa0:8f59 with SMTP id 006d021491bc7-69462bec543mr3736693eaf.0.1776802145646; Tue, 21 Apr 2026 13:09:05 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.129]) by smtp-relay.gmail.com with ESMTPS id 006d021491bc7-694918cf79esm258207eaf.12.2026.04.21.13.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 13:09:05 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 42AF03405FC; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 3DBDCE41A9F; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 1/3] selftests: ublk: remove unused argument to _cleanup Date: Tue, 21 Apr 2026 14:08:59 -0600 Message-ID: <20260421200901.1528842-2-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260421200901.1528842-1-csander@purestorage.com> References: <20260421200901.1528842-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The _cleanup helper function doesn't take any arguments, so drop them from its callers. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/test_batch_01.sh | 4 ++-- tools/testing/selftests/ublk/test_batch_02.sh | 2 +- tools/testing/selftests/ublk/test_batch_03.sh | 2 +- tools/testing/selftests/ublk/test_generic_02.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_03.sh | 2 +- tools/testing/selftests/ublk/test_generic_06.sh | 2 +- tools/testing/selftests/ublk/test_generic_07.sh | 2 +- tools/testing/selftests/ublk/test_generic_08.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_09.sh | 2 +- tools/testing/selftests/ublk/test_generic_10.sh | 2 +- tools/testing/selftests/ublk/test_generic_12.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_13.sh | 2 +- tools/testing/selftests/ublk/test_generic_16.sh | 4 ++-- tools/testing/selftests/ublk/test_generic_17.sh | 2 +- tools/testing/selftests/ublk/test_loop_01.sh | 2 +- tools/testing/selftests/ublk/test_loop_02.sh | 2 +- tools/testing/selftests/ublk/test_loop_03.sh | 2 +- tools/testing/selftests/ublk/test_loop_04.sh | 2 +- tools/testing/selftests/ublk/test_loop_05.sh | 2 +- tools/testing/selftests/ublk/test_loop_06.sh | 2 +- tools/testing/selftests/ublk/test_loop_07.sh | 2 +- tools/testing/selftests/ublk/test_null_01.sh | 2 +- tools/testing/selftests/ublk/test_null_02.sh | 2 +- tools/testing/selftests/ublk/test_null_03.sh | 2 +- tools/testing/selftests/ublk/test_part_01.sh | 4 ++-- tools/testing/selftests/ublk/test_part_02.sh | 2 +- tools/testing/selftests/ublk/test_recover_01.sh | 2 +- tools/testing/selftests/ublk/test_recover_02.sh | 2 +- tools/testing/selftests/ublk/test_recover_03.sh | 2 +- tools/testing/selftests/ublk/test_recover_04.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_01.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_02.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_03.sh | 2 +- tools/testing/selftests/ublk/test_shmemzc_04.sh | 2 +- tools/testing/selftests/ublk/test_stress_01.sh | 2 +- tools/testing/selftests/ublk/test_stress_02.sh | 2 +- tools/testing/selftests/ublk/test_stress_03.sh | 2 +- tools/testing/selftests/ublk/test_stress_04.sh | 2 +- tools/testing/selftests/ublk/test_stress_05.sh | 2 +- tools/testing/selftests/ublk/test_stress_06.sh | 2 +- tools/testing/selftests/ublk/test_stress_07.sh | 2 +- tools/testing/selftests/ublk/test_stress_08.sh | 2 +- tools/testing/selftests/ublk/test_stress_09.sh | 2 +- tools/testing/selftests/ublk/test_stripe_01.sh | 2 +- tools/testing/selftests/ublk/test_stripe_02.sh | 2 +- tools/testing/selftests/ublk/test_stripe_03.sh | 2 +- tools/testing/selftests/ublk/test_stripe_04.sh | 2 +- tools/testing/selftests/ublk/test_stripe_05.sh | 2 +- tools/testing/selftests/ublk/test_stripe_06.sh | 2 +- 49 files changed, 55 insertions(+), 55 deletions(-) diff --git a/tools/testing/selftests/ublk/test_batch_01.sh b/tools/testing/= selftests/ublk/test_batch_01.sh index a18fb39af8be..6e19303706a9 100755 --- a/tools/testing/selftests/ublk/test_batch_01.sh +++ b/tools/testing/selftests/ublk/test_batch_01.sh @@ -16,16 +16,16 @@ _create_backfile 1 256M =20 dev_id=3D$(_add_ublk_dev -t loop -q 2 -b "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? =20 if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then - _cleanup_test "generic" + _cleanup_test _show_result $TID 255 fi =20 dev_id=3D$(_add_ublk_dev -t stripe -b --auto_zc "${UBLK_BACKFILES[0]}" "${= UBLK_BACKFILES[1]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_batch_02.sh b/tools/testing/= selftests/ublk/test_batch_02.sh index 7ca384d11987..7c683f755379 100755 --- a/tools/testing/selftests/ublk/test_batch_02.sh +++ b/tools/testing/selftests/ublk/test_batch_02.sh @@ -23,7 +23,7 @@ _check_add_dev $TID $? # run fio over the ublk disk fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite \ --iodepth=3D32 --size=3D100M --numjobs=3D4 > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_batch_03.sh b/tools/testing/= selftests/ublk/test_batch_03.sh index aca9cf144b55..914ccd6a335d 100755 --- a/tools/testing/selftests/ublk/test_batch_03.sh +++ b/tools/testing/selftests/ublk/test_batch_03.sh @@ -23,7 +23,7 @@ _check_add_dev $TID $? # run fio over the ublk disk fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite \ --iodepth=3D32 --size=3D100M --numjobs=3D4 > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_02.sh b/tools/testin= g/selftests/ublk/test_generic_02.sh index 46b657143fd6..2afc8cdbed8f 100755 --- a/tools/testing/selftests/ublk/test_generic_02.sh +++ b/tools/testing/selftests/ublk/test_generic_02.sh @@ -27,11 +27,11 @@ for _ in $(seq 100); do grep -q "BPFTRACE_READY" "$UBLK_TMP" 2>/dev/null && break sleep 0.1 done =20 if ! kill -0 "$btrace_pid" 2>/dev/null; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi =20 # run fio over this ublk disk (pinned to CPU 0) taskset -c 0 fio --name=3Dwrite_seq \ @@ -49,7 +49,7 @@ wait if grep -q "^out_of_order:" "$UBLK_TMP"; then echo "I/O reordering detected:" grep "^out_of_order:" "$UBLK_TMP" ERR_CODE=3D255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_03.sh b/tools/testin= g/selftests/ublk/test_generic_03.sh index 8934ea926762..8e78be860d34 100755 --- a/tools/testing/selftests/ublk/test_generic_03.sh +++ b/tools/testing/selftests/ublk/test_generic_03.sh @@ -21,7 +21,7 @@ if [ "$max_segments" !=3D "32" ]; then ERR_CODE=3D255 fi if [ "$max_segment_size" !=3D "32768" ]; then ERR_CODE=3D255 fi -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_06.sh b/tools/testin= g/selftests/ublk/test_generic_06.sh index 14a05054fcd8..a8b3634b6b4b 100755 --- a/tools/testing/selftests/ublk/test_generic_06.sh +++ b/tools/testing/selftests/ublk/test_generic_06.sh @@ -34,7 +34,7 @@ fi if [ $ELAPSED -ge 5 ]; then echo "dd took $ELAPSED seconds to exit (>=3D 5s tolerance)!" ERR_CODE=3D255 fi =20 -_cleanup_test "fault_inject" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_07.sh b/tools/testin= g/selftests/ublk/test_generic_07.sh index 8dcfd8978f50..d2c5e65bd124 100755 --- a/tools/testing/selftests/ublk/test_generic_07.sh +++ b/tools/testing/selftests/ublk/test_generic_07.sh @@ -21,7 +21,7 @@ ERR_CODE=3D$? if [ "$ERR_CODE" -eq 0 ]; then _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? fi =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_08.sh b/tools/testin= g/selftests/ublk/test_generic_08.sh index ce88c31d6b9c..77a18b313f3d 100755 --- a/tools/testing/selftests/ublk/test_generic_08.sh +++ b/tools/testing/selftests/ublk/test_generic_08.sh @@ -16,16 +16,16 @@ _create_backfile 1 256M =20 dev_id=3D$(_add_ublk_dev -t loop -q 2 --auto_zc "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? =20 if ! _mkfs_mount_test /dev/ublkb"${dev_id}"; then - _cleanup_test "generic" + _cleanup_test _show_result $TID 255 fi =20 dev_id=3D$(_add_ublk_dev -t stripe --auto_zc "${UBLK_BACKFILES[0]}" "${UBL= K_BACKFILES[1]}") _check_add_dev $TID $? _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_09.sh b/tools/testin= g/selftests/ublk/test_generic_09.sh index 744d0cdaa242..6c25242f245f 100755 --- a/tools/testing/selftests/ublk/test_generic_09.sh +++ b/tools/testing/selftests/ublk/test_generic_09.sh @@ -20,8 +20,8 @@ _check_add_dev $TID $? =20 # run fio over the two disks fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite --iodepth=3D32 --size=3D256M > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "null" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_10.sh b/tools/testin= g/selftests/ublk/test_generic_10.sh index 4b4293b9081f..fdabc9d9075e 100755 --- a/tools/testing/selftests/ublk/test_generic_10.sh +++ b/tools/testing/selftests/ublk/test_generic_10.sh @@ -23,7 +23,7 @@ fi new_size=3D$(_get_disk_size /dev/ublkb"${dev_id}") if [ "$new_size" !=3D "$size" ]; then ERR_CODE=3D255 fi =20 -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_12.sh b/tools/testin= g/selftests/ublk/test_generic_12.sh index 54b81ddfe9f9..435497f8da8d 100755 --- a/tools/testing/selftests/ublk/test_generic_12.sh +++ b/tools/testing/selftests/ublk/test_generic_12.sh @@ -23,11 +23,11 @@ dev_t=3D$(_get_disk_dev_t "$dev_id") bpftrace trace/count_ios_per_tid.bt "$dev_t" > "$UBLK_TMP" 2>&1 & btrace_pid=3D$! sleep 2 =20 if ! kill -0 "$btrace_pid" > /dev/null 2>&1; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi =20 # do imbalanced I/O on the ublk device # pin to cpu 0 to prevent migration/only target one queue @@ -52,7 +52,7 @@ if [[ $NR_THREADS_THAT_HANDLED_IO -ne $NTHREADS ]]; then echo "only $NR_THREADS_THAT_HANDLED_IO handled I/O! expected $NTHR= EADS" cat "$UBLK_TMP" ERR_CODE=3D255 fi =20 -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_13.sh b/tools/testin= g/selftests/ublk/test_generic_13.sh index 922115aa14f4..2c1be6286db8 100755 --- a/tools/testing/selftests/ublk/test_generic_13.sh +++ b/tools/testing/selftests/ublk/test_generic_13.sh @@ -13,7 +13,7 @@ if ${UBLK_PROG} features | grep -q unknown; then echo "# this failure is expected if running an older test suite ag= ainst" echo "# a newer kernel with new features added" ERR_CODE=3D255 fi =20 -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_16.sh b/tools/testin= g/selftests/ublk/test_generic_16.sh index 3ef367836ac5..6a4952146ea1 100755 --- a/tools/testing/selftests/ublk/test_generic_16.sh +++ b/tools/testing/selftests/ublk/test_generic_16.sh @@ -7,11 +7,11 @@ ERR_CODE=3D0 =20 _prep_test "null" "stop --safe command" =20 # Check if SAFE_STOP_DEV feature is supported if ! _have_feature "SAFE_STOP_DEV"; then - _cleanup_test "null" + _cleanup_test exit "$UBLK_SKIP_CODE" fi =20 # Test 1: stop --safe on idle device should succeed dev_id=3D$(_add_ublk_dev -t null -q 2 -d 32) @@ -50,7 +50,7 @@ wait $dd_pid 2>/dev/null =20 # Now device should be idle, regular delete should work _ublk_del_dev "${dev_id}" udevadm settle =20 -_cleanup_test "null" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_generic_17.sh b/tools/testin= g/selftests/ublk/test_generic_17.sh index 2278b5fc9dba..b483d53a897a 100755 --- a/tools/testing/selftests/ublk/test_generic_17.sh +++ b/tools/testing/selftests/ublk/test_generic_17.sh @@ -29,7 +29,7 @@ fi # Clean up the device. This can only succeed once teardown of the above # exited ublk server completes. So if teardown never completes, we will # time out here _ublk_del_dev "${dev_id}" =20 -_cleanup_test "fault_inject" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_01.sh b/tools/testing/s= elftests/ublk/test_loop_01.sh index 338a235fd82a..c0f5b619ad6e 100755 --- a/tools/testing/selftests/ublk/test_loop_01.sh +++ b/tools/testing/selftests/ublk/test_loop_01.sh @@ -18,8 +18,8 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D256M ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_02.sh b/tools/testing/s= elftests/ublk/test_loop_02.sh index 04c52454e2ec..f4191ea71f50 100755 --- a/tools/testing/selftests/ublk/test_loop_02.sh +++ b/tools/testing/selftests/ublk/test_loop_02.sh @@ -12,8 +12,8 @@ dev_id=3D$(_add_ublk_dev -t loop "${UBLK_BACKFILES[0]}") _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_03.sh b/tools/testing/s= elftests/ublk/test_loop_03.sh index 6e8f649fe93d..aaac0c59a5ad 100755 --- a/tools/testing/selftests/ublk/test_loop_03.sh +++ b/tools/testing/selftests/ublk/test_loop_03.sh @@ -17,8 +17,8 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D256M ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_04.sh b/tools/testing/s= elftests/ublk/test_loop_04.sh index 9f6774ec0de6..f584c119f1d2 100755 --- a/tools/testing/selftests/ublk/test_loop_04.sh +++ b/tools/testing/selftests/ublk/test_loop_04.sh @@ -13,8 +13,8 @@ dev_id=3D$(_add_ublk_dev -t loop -z "${UBLK_BACKFILES[0]}= ") _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_05.sh b/tools/testing/s= elftests/ublk/test_loop_05.sh index 2b8d99e007be..ca1a5df5f9de 100755 --- a/tools/testing/selftests/ublk/test_loop_05.sh +++ b/tools/testing/selftests/ublk/test_loop_05.sh @@ -18,8 +18,8 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D256M ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_06.sh b/tools/testing/s= elftests/ublk/test_loop_06.sh index e73f6f4844db..26f710ba9db7 100755 --- a/tools/testing/selftests/ublk/test_loop_06.sh +++ b/tools/testing/selftests/ublk/test_loop_06.sh @@ -17,8 +17,8 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D256M ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_loop_07.sh b/tools/testing/s= elftests/ublk/test_loop_07.sh index 264d20e7c530..a9ab0b671cb2 100755 --- a/tools/testing/selftests/ublk/test_loop_07.sh +++ b/tools/testing/selftests/ublk/test_loop_07.sh @@ -13,8 +13,8 @@ dev_id=3D$(_add_ublk_dev -t loop -u "${UBLK_BACKFILES[0]}= ") _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "loop" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_null_01.sh b/tools/testing/s= elftests/ublk/test_null_01.sh index eebce8076530..d2c38cbb2dd5 100755 --- a/tools/testing/selftests/ublk/test_null_01.sh +++ b/tools/testing/selftests/ublk/test_null_01.sh @@ -16,8 +16,8 @@ _check_add_dev $TID $? =20 # run fio over the two disks fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite --iodepth=3D32 --size=3D256M > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "null" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_null_02.sh b/tools/testing/s= elftests/ublk/test_null_02.sh index 654bdff39664..7b205ca56367 100755 --- a/tools/testing/selftests/ublk/test_null_02.sh +++ b/tools/testing/selftests/ublk/test_null_02.sh @@ -16,8 +16,8 @@ _check_add_dev $TID $? =20 # run fio over the two disks fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite --iodepth=3D32 --size=3D256M > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "null" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_null_03.sh b/tools/testing/s= elftests/ublk/test_null_03.sh index 29cd09f06672..eee7a87a60da 100755 --- a/tools/testing/selftests/ublk/test_null_03.sh +++ b/tools/testing/selftests/ublk/test_null_03.sh @@ -16,8 +16,8 @@ _check_add_dev $TID $? =20 # run fio over the two disks fio --name=3Djob1 --filename=3D/dev/ublkb"${dev_id}" --ioengine=3Dlibaio -= -rw=3Dreadwrite --iodepth=3D32 --size=3D256M > /dev/null 2>&1 ERR_CODE=3D$? =20 -_cleanup_test "null" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_part_01.sh b/tools/testing/s= elftests/ublk/test_part_01.sh index 8028f6e4b3a5..fa3b1a9af894 100755 --- a/tools/testing/selftests/ublk/test_part_01.sh +++ b/tools/testing/selftests/ublk/test_part_01.sh @@ -80,11 +80,11 @@ if ! _have_program sfdisk || ! _have_program blockdev; = then fi =20 _prep_test "generic" "test UBLK_F_NO_AUTO_PART_SCAN" =20 if ! _have_feature "UBLK_F_NO_AUTO_PART_SCAN"; then - _cleanup_test "generic" + _cleanup_test exit "$UBLK_SKIP_CODE" fi =20 =20 # Create and format backing file with partition table @@ -98,7 +98,7 @@ format_backing_file "${UBLK_BACKFILES[0]}" =20 # Test no auto partition scan with manual scan [ "$ERR_CODE" -eq 0 ] && test_no_auto_part_scan "${UBLK_BACKFILES[0]}" [ $? -ne 0 ] && ERR_CODE=3D255 =20 -_cleanup_test "generic" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_part_02.sh b/tools/testing/s= elftests/ublk/test_part_02.sh index 7d42ab4d6e83..d9ec06f36aee 100755 --- a/tools/testing/selftests/ublk/test_part_02.sh +++ b/tools/testing/selftests/ublk/test_part_02.sh @@ -61,7 +61,7 @@ _prep_test "partition_scan" "verify async partition scan = prevents IO hang" _test_partition_scan_no_hang "no" "DEAD" =20 # Test 2: With recovery support - should transition to QUIESCED _test_partition_scan_no_hang "yes" "QUIESCED" =20 -_cleanup_test "partition_scan" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_recover_01.sh b/tools/testin= g/selftests/ublk/test_recover_01.sh index 2672f9c40fa8..1cddc2345dab 100755 --- a/tools/testing/selftests/ublk/test_recover_01.sh +++ b/tools/testing/selftests/ublk/test_recover_01.sh @@ -38,7 +38,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "${U= BLK_BACKFILES[2]}" & wait =20 -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_recover_02.sh b/tools/testin= g/selftests/ublk/test_recover_02.sh index bda5064bc31f..9c3f481880d3 100755 --- a/tools/testing/selftests/ublk/test_recover_02.sh +++ b/tools/testing/selftests/ublk/test_recover_02.sh @@ -42,7 +42,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -z -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -z -i 1 "${UBLK_BACKFILES[1]}" "= ${UBLK_BACKFILES[2]}" & wait =20 -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_recover_03.sh b/tools/testin= g/selftests/ublk/test_recover_03.sh index e0dc0b8fe5d6..2554805e5b02 100755 --- a/tools/testing/selftests/ublk/test_recover_03.sh +++ b/tools/testing/selftests/ublk/test_recover_03.sh @@ -37,7 +37,7 @@ wait ublk_run_quiesce_recover -t null -q 2 -r 1 -i 1 & ublk_run_quiesce_recover -t loop -q 2 -r 1 -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_quiesce_recover -t stripe -q 2 -r 1 -i 1 "${UBLK_BACKFILES[1]}" "= ${UBLK_BACKFILES[2]}" & wait =20 -_cleanup_test "quiesce" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_recover_04.sh b/tools/testin= g/selftests/ublk/test_recover_04.sh index 178443394ca5..4c83c1840c68 100755 --- a/tools/testing/selftests/ublk/test_recover_04.sh +++ b/tools/testing/selftests/ublk/test_recover_04.sh @@ -33,7 +33,7 @@ wait ublk_run_recover_test -t null -q 2 -r 1 -u -i 1 & ublk_run_recover_test -t loop -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[0]}" & ublk_run_recover_test -t stripe -q 2 -r 1 -u -i 1 "${UBLK_BACKFILES[1]}" "= ${UBLK_BACKFILES[2]}" & wait =20 -_cleanup_test "recover" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_shmemzc_01.sh b/tools/testin= g/selftests/ublk/test_shmemzc_01.sh index 47210af2aa20..b244ab3479a2 100755 --- a/tools/testing/selftests/ublk/test_shmemzc_01.sh +++ b/tools/testing/selftests/ublk/test_shmemzc_01.sh @@ -65,8 +65,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages =20 -_cleanup_test "shmem_zc" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_shmemzc_02.sh b/tools/testin= g/selftests/ublk/test_shmemzc_02.sh index aed9262494e9..810dccba6d84 100755 --- a/tools/testing/selftests/ublk/test_shmemzc_02.sh +++ b/tools/testing/selftests/ublk/test_shmemzc_02.sh @@ -61,8 +61,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages =20 -_cleanup_test "shmem_zc" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_shmemzc_03.sh b/tools/testin= g/selftests/ublk/test_shmemzc_03.sh index db967a9ffe81..606362491a32 100755 --- a/tools/testing/selftests/ublk/test_shmemzc_03.sh +++ b/tools/testing/selftests/ublk/test_shmemzc_03.sh @@ -62,8 +62,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages =20 -_cleanup_test "shmem_zc" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_shmemzc_04.sh b/tools/testin= g/selftests/ublk/test_shmemzc_04.sh index 899de088ece4..9a2a6c2e8abe 100755 --- a/tools/testing/selftests/ublk/test_shmemzc_04.sh +++ b/tools/testing/selftests/ublk/test_shmemzc_04.sh @@ -65,8 +65,8 @@ _ublk_del_dev "${dev_id}" rm -f "$HTLB_FILE" umount "$HTLB_MNT" rmdir "$HTLB_MNT" echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages =20 -_cleanup_test "shmem_zc" +_cleanup_test =20 _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_01.sh b/tools/testing= /selftests/ublk/test_stress_01.sh index a9322ce496e9..f91783f27649 100755 --- a/tools/testing/selftests/ublk/test_stress_01.sh +++ b/tools/testing/selftests/ublk/test_stress_01.sh @@ -27,7 +27,7 @@ _create_backfile 2 128M ublk_io_and_remove 8G -t null -q 4 & ublk_io_and_remove 256M -t loop -q 4 "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 "${UBLK_BACKFILES[1]}" "${UBLK_BACK= FILES[2]}" & wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_02.sh b/tools/testing= /selftests/ublk/test_stress_02.sh index 6c114194f9c9..b128d11658a8 100755 --- a/tools/testing/selftests/ublk/test_stress_02.sh +++ b/tools/testing/selftests/ublk/test_stress_02.sh @@ -29,7 +29,7 @@ for nr_queue in 1 4; do ublk_io_and_kill_daemon 256M -t loop -q "$nr_queue" "${UBLK_BACKFILES[0]}= " & ublk_io_and_kill_daemon 256M -t stripe -q "$nr_queue" "${UBLK_BACKFILES[1= ]}" "${UBLK_BACKFILES[2]}" & wait done =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_03.sh b/tools/testing= /selftests/ublk/test_stress_03.sh index 4e81ca0db758..a0f0aba8eebc 100755 --- a/tools/testing/selftests/ublk/test_stress_03.sh +++ b/tools/testing/selftests/ublk/test_stress_03.sh @@ -47,7 +47,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_remove 256M -t stripe -q 4 --auto_zc --nthreads 8 --per_io_ta= sks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback --nthr= eads 8 --per_io_tasks & wait fi =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_04.sh b/tools/testing= /selftests/ublk/test_stress_04.sh index 6c6f44b172bc..896eae68d444 100755 --- a/tools/testing/selftests/ublk/test_stress_04.sh +++ b/tools/testing/selftests/ublk/test_stress_04.sh @@ -46,7 +46,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_kill_daemon 256M -t stripe -q 4 --auto_zc --nthreads 8 --per_= io_tasks "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -= -nthreads 8 --per_io_tasks & wait fi =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_05.sh b/tools/testing= /selftests/ublk/test_stress_05.sh index 7e9324de2030..d6c00c72080d 100755 --- a/tools/testing/selftests/ublk/test_stress_05.sh +++ b/tools/testing/selftests/ublk/test_stress_05.sh @@ -77,7 +77,7 @@ if _have_feature "PER_IO_DAEMON"; then ublk_io_and_remove 256M -t loop -q 4 --nthreads 8 --per_io_tasks -r 1 -i = "$reissue" "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 8G -t null -q 4 --nthreads 8 --per_io_tasks -r 1 -i "$= reissue" & fi wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_06.sh b/tools/testing= /selftests/ublk/test_stress_06.sh index c72e5d0b14be..9481a273a4b4 100755 --- a/tools/testing/selftests/ublk/test_stress_06.sh +++ b/tools/testing/selftests/ublk/test_stress_06.sh @@ -32,7 +32,7 @@ wait ublk_io_and_remove 8G -t null -q 4 -u --nthreads 8 --per_io_tasks & ublk_io_and_remove 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "${UBL= K_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks "${U= BLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_07.sh b/tools/testing= /selftests/ublk/test_stress_07.sh index 04c2764d5238..3e01c037cffb 100755 --- a/tools/testing/selftests/ublk/test_stress_07.sh +++ b/tools/testing/selftests/ublk/test_stress_07.sh @@ -32,7 +32,7 @@ wait ublk_io_and_kill_daemon 8G -t null -q 4 -u --nthreads 8 --per_io_tasks & ublk_io_and_kill_daemon 256M -t loop -q 4 -u --nthreads 8 --per_io_tasks "= ${UBLK_BACKFILES[0]}" & ublk_io_and_kill_daemon 256M -t stripe -q 4 -u --nthreads 8 --per_io_tasks= "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_08.sh b/tools/testing= /selftests/ublk/test_stress_08.sh index 37f7d204879a..5f32424d2892 100755 --- a/tools/testing/selftests/ublk/test_stress_08.sh +++ b/tools/testing/selftests/ublk/test_stress_08.sh @@ -38,7 +38,7 @@ ublk_io_and_remove 8G -t null -q 4 -b & ublk_io_and_remove 256M -t loop -q 4 --auto_zc -b "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 --auto_zc -b "${UBLK_BACKFILES[1]}"= "${UBLK_BACKFILES[2]}" & ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b & wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stress_09.sh b/tools/testing= /selftests/ublk/test_stress_09.sh index 53c1e3b2ab30..64cb8d9b0438 100755 --- a/tools/testing/selftests/ublk/test_stress_09.sh +++ b/tools/testing/selftests/ublk/test_stress_09.sh @@ -37,7 +37,7 @@ ublk_io_and_kill_daemon 8G -t null -q 4 -z -b & ublk_io_and_kill_daemon 256M -t loop -q 4 --auto_zc -b "${UBLK_BACKFILES[0= ]}" & ublk_io_and_kill_daemon 256M -t stripe -q 4 -b "${UBLK_BACKFILES[1]}" "${U= BLK_BACKFILES[2]}" & ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback -b= & wait =20 -_cleanup_test "stress" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_01.sh b/tools/testing= /selftests/ublk/test_stripe_01.sh index 3bc821aadad8..9ffce477b461 100755 --- a/tools/testing/selftests/ublk/test_stripe_01.sh +++ b/tools/testing/selftests/ublk/test_stripe_01.sh @@ -19,7 +19,7 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D512M ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_02.sh b/tools/testing= /selftests/ublk/test_stripe_02.sh index 4a7d2b21a6bf..4c172950a247 100755 --- a/tools/testing/selftests/ublk/test_stripe_02.sh +++ b/tools/testing/selftests/ublk/test_stripe_02.sh @@ -14,7 +14,7 @@ dev_id=3D$(_add_ublk_dev -t stripe "${UBLK_BACKFILES[0]}"= "${UBLK_BACKFILES[1]}") _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_03.sh b/tools/testing= /selftests/ublk/test_stripe_03.sh index a1c159d54e53..2cdf9f958988 100755 --- a/tools/testing/selftests/ublk/test_stripe_03.sh +++ b/tools/testing/selftests/ublk/test_stripe_03.sh @@ -19,7 +19,7 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D512M ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_04.sh b/tools/testing= /selftests/ublk/test_stripe_04.sh index 0c30bd6c2b3b..e24120eaca0e 100755 --- a/tools/testing/selftests/ublk/test_stripe_04.sh +++ b/tools/testing/selftests/ublk/test_stripe_04.sh @@ -14,7 +14,7 @@ dev_id=3D$(_add_ublk_dev -t stripe -z -q 2 "${UBLK_BACKFI= LES[0]}" "${UBLK_BACKFILE _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_05.sh b/tools/testing= /selftests/ublk/test_stripe_05.sh index 6ddfa88ad226..f3de2d5cdfe4 100755 --- a/tools/testing/selftests/ublk/test_stripe_05.sh +++ b/tools/testing/selftests/ublk/test_stripe_05.sh @@ -19,7 +19,7 @@ _check_add_dev $TID $? =20 # run fio over the ublk disk _run_fio_verify_io --filename=3D/dev/ublkb"${dev_id}" --size=3D512M ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE diff --git a/tools/testing/selftests/ublk/test_stripe_06.sh b/tools/testing= /selftests/ublk/test_stripe_06.sh index a2c7bf4cc613..3fd5cd902956 100755 --- a/tools/testing/selftests/ublk/test_stripe_06.sh +++ b/tools/testing/selftests/ublk/test_stripe_06.sh @@ -14,7 +14,7 @@ dev_id=3D$(_add_ublk_dev -t stripe -u -q 2 "${UBLK_BACKFI= LES[0]}" "${UBLK_BACKFILE _check_add_dev $TID $? =20 _mkfs_mount_test /dev/ublkb"${dev_id}" ERR_CODE=3D$? =20 -_cleanup_test "stripe" +_cleanup_test _show_result $TID $ERR_CODE --=20 2.45.2 From nobody Wed Jun 17 02:50:49 2026 Received: from mail-oa1-f98.google.com (mail-oa1-f98.google.com [209.85.160.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EBA56388E77 for ; Tue, 21 Apr 2026 20:09:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.98 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802152; cv=none; b=Ncl7TbjEPiDQoqmcId/O6dLe132m54rntmFv474hXZGAw7OIy9WKP2IPt3oHvUt+VgmwdhWstYsgCgTe4j/hKCfHU1LP0How75Mc6Kp5WbCzY2eRUKBRS3XYlEDnLZWUngYn6wQ804DWV6OkrhufEHJXjjIE4aRB7AFlIcl2egg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802152; c=relaxed/simple; bh=LjMorJ6vF8quAushze9k3CNaQKh5hY1aR3keeBr1Dcw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HvZcKfplvM9xgdNnG51KUN2N+pwRxJ6/f0eweXWZSg0qgKljrsX5NfJ6r25TKGa/53zk3/1yR9gbV1vpbZNQk8XO4B2csf4dgdRdFgNgoMMOz5tuY9VpEXGiM/7XN+mqloJNgckuAh5RXixCWZIHzVAJuBvSXfb/UT0w9XbTtJg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=S42DLqwI; arc=none smtp.client-ip=209.85.160.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="S42DLqwI" Received: by mail-oa1-f98.google.com with SMTP id 586e51a60fabf-42c0b8878aaso236959fac.0 for ; Tue, 21 Apr 2026 13:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1776802146; x=1777406946; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UR844bpygXZBYChnXrR6i7D8NGvSxmnDO/I//llhVrM=; b=S42DLqwIkwus1hreF24/aEivbgQYW+1i2gQx2c6KGWWhn5jiyWmcyLOac6DGLhIY8x 2o2d7D9rXKMcLvgVgPyGhqK7d/zRlA2OM+qBTG7XYZE3tGoV1Oct2agFepEFJXVWNJnx YGx9GzwyhuYK0crLOZixF42Rr6zUrsUh1DvbXbDpd3eLuBFhOMaE4bvjYHg25lC/HJI3 FJXg7xI3i4olFMBpMETwKAiRiPGnGx7hZN+BtmoP8zKmrg7d8TIqOZJokMDLVU4VSrxc mKONqr5am+hY9qRBNugID1TjDnwMsiaweruSjtd6mC5NDEMuZtyVp4e+au8rPV0Us3ik Fotg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776802146; x=1777406946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UR844bpygXZBYChnXrR6i7D8NGvSxmnDO/I//llhVrM=; b=XKCCOlYkG5/7i3RIIZxMtUzDbPidPnJlVZFgE4kI4kwP81/1jPTJKqLgr/6povi56E VIBQ8MqL78UIzFkVojJLCNkxjPBY8nvrhQT3TaeG7qatji9ZjvO96QG2PhpwGk7ooMJK 4OEIzgdFW9pVoq2HvCSJUsBsdo5/YqQqqcwAiSv2u8ac62g1h3ONeADHWZXtgthlp37i bOvjTQeAO/iHE/EEawdcScGHeAQsgijRVYFpWC3uQn8IfR+w4tqG7moeEBMHmerl0GG+ BMzOqVez9RUj56XwFg1/zG3WWlg5tayj+kurljpkUiELNfssTXVcG2FumDcWzO6KDgCf BXYg== X-Gm-Message-State: AOJu0YxmEPomuujDNYCDmJvJ1AYyQ/KIOPrfdMRFbrB9TezstcxPyqPr JCmorBF9qZRIVUj9DDZN+xSnz3YfOJcrXEzCeaqOFx+vEhG0gZQ1xmkZ21+Gn6S62JBMX/+cUx1 Od+3ckqFl1bT+Z8jXNBNnY5wzL9xewubtlHC4hCjGg5ZnS6uemBcD X-Gm-Gg: AeBDiesax+0juOAYKNUCKZtx6Y81xwb6g3RJIrsMEjj+G3/Fzw6SEmLNtmRR2t9lhkS Wc+IVflSuwATVCBVWrypcGbIaWt+4A5j+xpoSXBbj5jUq9mqleqtyMt2NYtLpqv3lljjg/vUO68 neIeLqFJWlxcE9f4uD9bQPAELjPWjcWj3dMY8Tt6uOe5m5LV2Y9qdvKNdUDzgawo4s0aOIP5rV1 73dzhmoUc4aoFSYF2ycSd0m0YErVoBBNWkkePmQ1gQInBq0StALxJysNLkMx0Suak0v3HY7xZD7 LIIrOBkelc7QVQPxXIIimt2xYvqJ9Y24zWPvhgE3jwN0BT8ON5V5T9wcEuBhm0Cpb0R7rUmRVku /rq664f2mbwvSDnO8boPuEZ57Ira8ifRp6ACY8u0sb3ItZh4WmQ== X-Received: by 2002:a05:6830:4493:b0:7d8:9844:b8d2 with SMTP id 46e09a7af769-7dc951b74cbmr7466806a34.4.1776802145912; Tue, 21 Apr 2026 13:09:05 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id 46e09a7af769-7dcc327622esm462221a34.4.2026.04.21.13.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 13:09:05 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id 850C23407AD; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id 801E6E41A9F; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 2/3] selftests: ublk: enable test_integrity_02.sh on fio 3.42 Date: Tue, 21 Apr 2026 14:09:00 -0600 Message-ID: <20260421200901.1528842-3-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260421200901.1528842-1-csander@purestorage.com> References: <20260421200901.1528842-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" fio 3.42 was released with the needed fix for test_integrity_02.sh. Allow 3.42 and newer in the fio version check. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/test_integrity_02.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/ublk/test_integrity_02.sh b/tools/test= ing/selftests/ublk/test_integrity_02.sh index aaf1f52da559..2c35fbc8a7cc 100755 --- a/tools/testing/selftests/ublk/test_integrity_02.sh +++ b/tools/testing/selftests/ublk/test_integrity_02.sh @@ -5,13 +5,14 @@ =20 if ! _have_program fio; then exit $UBLK_SKIP_CODE fi =20 +min_fio_version=3Dfio-3.42 fio_version=3D$(fio --version) -if [[ "$fio_version" =3D~ fio-[0-9]+\.[0-9]+$ ]]; then - echo "Requires development fio version with https://github.com/axboe/fio/= pull/1992" +if ! sort --version-sort --check=3Dquiet <(printf "%s\n%s\n" "$min_fio_ver= sion" "$fio_version"); then + echo "Requires fio version with https://github.com/axboe/fio/pull/1992" exit $UBLK_SKIP_CODE fi =20 ERR_CODE=3D0 =20 --=20 2.45.2 From nobody Wed Jun 17 02:50:49 2026 Received: from mail-qk1-f227.google.com (mail-qk1-f227.google.com [209.85.222.227]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14044382391 for ; Tue, 21 Apr 2026 20:09:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.227 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802153; cv=none; b=BHzecQuUsFQAp04MMNUoitWakMNqYtthmaxLi6AYdxSZvSDiyo4B4eDRA2CQcBo8Zn1Ju80SaRqU+ZzJLPRP8rN4PgpfiOJX4IZmZZcvr/VopsmqWt8m8yiyRI8QtZgkxsW1mizJOvmyASZvMHMo1oBE2NRWwhh3iqi07W3Wur0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776802153; c=relaxed/simple; bh=lwAa3zZY4dUx5e7J56G35xKAUJYH+Ib6EeZjW3NXaCw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sPGcklY+L/Hp67JJBpVc2pKcv8XOuK2aPlIxT9vByX5PJSHyMj6YePYcYGcD065AM7Qxp9P52y/Y6mzU0SBouDwQuBgRygWUzcCEAJklMc82iTB8f8pweKK1XSgIIt9rBJv4pctS6rA7crmaYYdL/dsDKxy25nxAoJ5oQjjZjII= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com; spf=fail smtp.mailfrom=purestorage.com; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b=fDVuRrh7; arc=none smtp.client-ip=209.85.222.227 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=purestorage.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=purestorage.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=purestorage.com header.i=@purestorage.com header.b="fDVuRrh7" Received: by mail-qk1-f227.google.com with SMTP id af79cd13be357-8cd7457d0bcso93049285a.3 for ; Tue, 21 Apr 2026 13:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1776802146; x=1777406946; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jAZHQPO98mzj8j7p5PPgcZ6Q+1cUZmFim3S2B/NBScE=; b=fDVuRrh7vEW/l9fQocW4FHVypEZGVgI4FiTpGyY+cqZVRX9fNPcfXvpzpnGqoTQtQz BZgQhsotZW5EBxLWs0psFttANvEh0FFgydxgLMAfQzRKZZpSuH5owTMSTtLUsd+1H2Fm rVXe8+h4Xe2biJ131NW5ARocVo7XqcBsTjA3K3mDSkywQnn2tIJE2aDeB/1HbFkDYgfp tzMa+5cqXGGBjvE1qNKwip4RW0NclSMeWi2uB2lI4SgqUEvQlhpNPDox09/sprDa0Hma LVSJ7gXu44umBAWQQVAs7N8spKPGbSOgcBOQ+9Tdfg6JH2RaCjGj8AOQ4zm8wjP1Mh1P HnXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776802146; x=1777406946; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=jAZHQPO98mzj8j7p5PPgcZ6Q+1cUZmFim3S2B/NBScE=; b=QRrZ/DMDYHR0IAAF8d2PSS5eyiNQF2A3+3CpO1AT5h5P4pbZuUD/8bJbzrgvf23t3z SSjQXd3FyzAoJBBWIWrxFVqGK8Zq/bIUPneM9tTqZB41E9XXwYug7+QHJ3blCQQisZHU Uao3CQ8HnYXHASAGRqB3Q1nPeuVFKyuRIhe6pZbmDaBTWDIuP1mWXMo9ZZL8q+woj3KX vKqrvcmxq4JdEAblzXzxwG4RRAoITh9PwW2umlJ0F7GajwEHNPZtITph27+QQr701y0P 4gbWHP+fcIWsV0X93r3MXNoLPwk+I3lvOAzQ6cUKfAbaSBKO3NOOhj+h59mulJJu2WFc z7nA== X-Gm-Message-State: AOJu0Yzttbgp4iKxNaVm25I4Fe7UM6uX7qzJpDnN9irxcCQYPn+M9f+o cxOiaeU+MTsNti9NoqFWEjvHgeRDCUqsd63Sf2GLrykqjFthYQcYbtUBbOwt9pJODpDpOogQ/tB CRaX/g/KPoa0qDuAMBa46G8O+IWIGxKM4LTlH X-Gm-Gg: AeBDieu+SQmrx1wszVVtDnGc8JMmuapU46WGs1en9Mo8rgFvIB+g1DkWU7rAKvOJrF8 zH5BWRPM8W6+sOYG6ducM9VB8REUDRYQiqPVB3Wj63vVxXJymaiuywnOt6K+g5KQxSnstUW8VQh qaEAmkB1HyeNDwTmXJR7o4UjKzORBMhqIS7DVuBKpynwFKL7dOlS2/lfaVKc3dEwirAkIqCphgO nz18GjZ0BI7S8H6egPFKC7eYLCuA7ItXvCs2TPhctsD+o31iTLzBmdpnPgmtUbnx2UtIjLj04bf WQK91Ek/A7AUeMvPR5UZ1YNAPd21j5JLBwiQ73gmA4s4FLZYO2zAb03PTKpUKVX/WFuTlhkRvEu LkDRKc/c2ePOsVBnUa4JKx4fOXrzrT3SxZp3vUtbNK8unE8GE7LCS1IIim9qQfT1d X-Received: by 2002:a05:6214:518c:b0:8ac:b300:c558 with SMTP id 6a1803df08f44-8b028023a33mr204724176d6.2.1776802146333; Tue, 21 Apr 2026 13:09:06 -0700 (PDT) Received: from c7-smtp-2023.dev.purestorage.com ([208.88.159.128]) by smtp-relay.gmail.com with ESMTPS id 6a1803df08f44-8b02ac7bba3sm10611586d6.11.2026.04.21.13.09.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 13:09:06 -0700 (PDT) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.112.29.101]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id BEAA0340576; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id B9EDDE41A9F; Tue, 21 Apr 2026 14:09:05 -0600 (MDT) From: Caleb Sander Mateos To: Ming Lei , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 3/3] selftests: ublk: add ublk auto integrity test Date: Tue, 21 Apr 2026 14:09:01 -0600 Message-ID: <20260421200901.1528842-4-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20260421200901.1528842-1-csander@purestorage.com> References: <20260421200901.1528842-1-csander@purestorage.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The end-to-end integrity ublk selftest test_integrity_02 requires a relatively recent fio version to support I/O with integrity buffers. Add a version test_integrity_03 that uses the block layer's auto integrity path instead. The auto integrity code doesn't check the application tag, and doesn't indicate the bad guard/ref tag (just returns EILSEQ). But it's a good smoke-test of the ublk integrity code and provides coverage of the auto integrity path as well. Signed-off-by: Caleb Sander Mateos Reviewed-by: Ming Lei --- tools/testing/selftests/ublk/Makefile | 1 + .../selftests/ublk/test_integrity_03.sh | 103 ++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100755 tools/testing/selftests/ublk/test_integrity_03.sh diff --git a/tools/testing/selftests/ublk/Makefile b/tools/testing/selftest= s/ublk/Makefile index ec6a8ce83d38..6e4fe8d1fed1 100644 --- a/tools/testing/selftests/ublk/Makefile +++ b/tools/testing/selftests/ublk/Makefile @@ -35,10 +35,11 @@ TEST_PROGS +=3D test_loop_05.sh TEST_PROGS +=3D test_loop_06.sh TEST_PROGS +=3D test_loop_07.sh =20 TEST_PROGS +=3D test_integrity_01.sh TEST_PROGS +=3D test_integrity_02.sh +TEST_PROGS +=3D test_integrity_03.sh =20 TEST_PROGS +=3D test_recover_01.sh TEST_PROGS +=3D test_recover_02.sh TEST_PROGS +=3D test_recover_03.sh TEST_PROGS +=3D test_recover_04.sh diff --git a/tools/testing/selftests/ublk/test_integrity_03.sh b/tools/test= ing/selftests/ublk/test_integrity_03.sh new file mode 100755 index 000000000000..10f02339ea2d --- /dev/null +++ b/tools/testing/selftests/ublk/test_integrity_03.sh @@ -0,0 +1,103 @@ +#!/bin/bash +# SPDX-License-Identifier: GPL-2.0 + +. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh + +if ! _have_program fio; then + exit $UBLK_SKIP_CODE +fi + +_test_fill_and_verify() { + fio --name fill --rw randwrite $fio_args > /dev/null + if [ $? !=3D 0 ]; then + echo "fio fill failed" + ERR_CODE=3D255 + return 1 + fi + + fio --name verify --rw randread $fio_args > /dev/null + if [ $? !=3D 0 ]; then + echo "fio verify failed" + ERR_CODE=3D255 + return 1 + fi +} + +_test_corrupted_reftag() { + local dd_reftag_args=3D"bs=3D1 seek=3D58 count=3D6 oflag=3Ddsync conv=3Dn= otrunc status=3Dnone" + + # Overwrite 6-byte reftag at offset 48 + 10 =3D 58 + dd if=3D/dev/urandom "of=3D${UBLK_BACKFILES[1]}" $dd_reftag_args + if [ $? !=3D 0 ]; then + echo "dd corrupted_reftag failed" + ERR_CODE=3D255 + return 1 + fi + + if fio --name corrupted_reftag --rw randread $fio_args > /dev/null 2> "$f= io_err"; then + echo "fio corrupted_reftag unexpectedly succeeded" + ERR_CODE=3D255 + return 1 + fi + + if ! grep -q "$expected_err" "$fio_err"; then + echo "fio corrupted_reftag message not found: $expected_err" + ERR_CODE=3D255 + return 1 + fi + + # Reset to 0 + dd if=3D/dev/zero "of=3D${UBLK_BACKFILES[1]}" $dd_reftag_args + if [ $? !=3D 0 ]; then + echo "dd restore corrupted_reftag failed" + ERR_CODE=3D255 + return 1 + fi +} + +_test_corrupted_data() { + local dd_data_args=3D"bs=3D512 count=3D1 oflag=3Ddirect,dsync conv=3Dnotr= unc status=3Dnone" + + dd if=3D/dev/zero "of=3D${UBLK_BACKFILES[0]}" $dd_data_args + if [ $? !=3D 0 ]; then + echo "dd corrupted_data failed" + ERR_CODE=3D255 + return 1 + fi + + if fio --name corrupted_data --rw randread $fio_args > /dev/null 2> "$fio= _err"; then + echo "fio corrupted_data unexpectedly succeeded" + ERR_CODE=3D255 + return 1 + fi + + if ! grep -q "$expected_err" "$fio_err"; then + echo "fio corrupted_data message not found: $expected_err" + ERR_CODE=3D255 + return 1 + fi +} + +_prep_test "loop" "end-to-end auto integrity" + +_create_backfile 0 256M +_create_backfile 1 32M # 256M * (64 integrity bytes / 512 data bytes) +integrity_params=3D"--integrity_capable --integrity_reftag + --metadata_size 64 --pi_offset 48 --csum_type nvme" +dev_id=3D$(_add_ublk_dev -t loop -u $integrity_params "${UBLK_BACKFILES[@]= }") +_check_add_dev "$TID" $? + +fio_args=3D"--ioengine libaio --direct 1 --bsrange 512-1M --iodepth 32 + --filename /dev/ublkb$dev_id" +fio_err=3D$(mktemp "${UBLK_TEST_DIR}"/fio_err_XXXXX) +ERR_CODE=3D0 + +expected_err=3D"Invalid or incomplete multibyte or wide character: read of= fset=3D0" +_test_fill_and_verify && \ +_test_corrupted_reftag && \ +_test_corrupted_data + +rm -f "$fio_err" + +_cleanup_test +_show_result "$TID" $ERR_CODE --=20 2.45.2