From nobody Thu Dec 18 10:33:50 2025 Received: from mail-pf1-f226.google.com (mail-pf1-f226.google.com [209.85.210.226]) (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 38AE220C48A for ; Thu, 11 Dec 2025 05:16:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.226 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765430199; cv=none; b=LqwDG8RzjpVhNAge0tYOy7kCyN93Q9uWuYGCNpSOGdssBDpJmVW8lRSTudpeiFkta7X11dNzCDVo75oK0orM18p4PakZqve3rCQ0bE4wRhmLEiZJgNBp8vKiUu6hCdp1k/4qJpnBvkyhkup82W6NsyqHsivjbvQe3poXl2dyXwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765430199; c=relaxed/simple; bh=acykySZqQaZB1IYcjmApohtjhjnF/Dlf+Coyd9uZ2H4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=awvOnaYt/nVZwCz+cQ7RSP0ruB3gtrWZ98WONplQ8wRI6hdKKC25NRwFnY8uNJ/0NMeJY74aNrCmipeCYEelN6zE+RcV5Dr1d60CuHDindUwsRsfVqaTywFsbAjtSSkSixirur53ZF2HcUNmww1h60s04Mly9c7ebgNPeS3IYwE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject 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=SgciTSnM; arc=none smtp.client-ip=209.85.210.226 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject 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="SgciTSnM" Received: by mail-pf1-f226.google.com with SMTP id d2e1a72fcca58-7b8ba3c8ca1so94047b3a.2 for ; Wed, 10 Dec 2025 21:16:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=purestorage.com; s=google2022; t=1765430193; x=1766034993; 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=vnVfufvIYEdI8+hFNgHbkUqJ54wEbcXzUeKinX5SKcw=; b=SgciTSnMLWNdtYoA13frUMQy15TNmrrlUCCSfxc2A99pR9MJKfJq3KAFNOmL0h+xh6 nYgxDvhlhpoC5+ZeeGztXpz41ww4zYXigvnXPvVSyiJ9A9smMxoYRcdPleqiC8dn7Hhz 19VcudtbzvqDYxeTV56SjSokKMFhRcqswgHDK64AyIDZPIzAZs3NVzL2hueK7W4p9Epr A0M+DlQPdrIfw3kC+PH+zBvTb6HyujtE1GgzS1Zi2k6TJ1q1U0dxCxgSU8DS4R/L4cIP WHt2dihC47Q2mmxCUp6WOlQt/4ONFltxksTKFMc3zOuxNpBbuTpXfIOFv8k6bdVwhLuk nNkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765430193; x=1766034993; 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=vnVfufvIYEdI8+hFNgHbkUqJ54wEbcXzUeKinX5SKcw=; b=EiI8ihiPWkCWGjASYknQwgJw+I8DvoU6h9nMV7hjpg/+9DKQcCH4QLcLHWmQKWJqTC LnfBnuBGBtQowikX8QVpFHpMgY4uNnlgUly1jDBcVD3z2mgQmhYvbTHQeCaXCtz+UMv2 iJdG3sF+pHUfKSho09UMZPiuI2GIw1+hP4pKuPvjZSbodzvFHYG2Ct1ZSwvAjlnV9jjz i8Twkrm6KcxTzaZIq7CoPmrKpUKAihDSSn/Y176vpfCajHcWAh30K4Nc+xxnUG0FTuR1 Oxs9kQwoeJnd+MJB/fc02W/P6YJ28aK6FApSU6HRG1pHK0sB2Xg4bRh1dGL5SphIO4Tc Is8Q== X-Forwarded-Encrypted: i=1; AJvYcCUgXo/kF5FX+5cUSBaD+VmyZTqjIMkzLVtJrpRPr9+I+RTEpM1148/hkmrldfnDvUy0zIpaME7FgsWIj28=@vger.kernel.org X-Gm-Message-State: AOJu0YxD5BghDNIciTlz7ByuRT7Rdfsznjbti14ncepLv5aF14xlxAPh f+pUs3X5LWG8jyrRKydVdVZOtyMOoMU3bMYda2CbXTehAlGstjLazbPPos5L4nRMzzbbuXH4Byk 2DL1No3xJqUpsQngefji6zfLugWbJeOHx9Vrh3OQWaXpXNAGrXa8g X-Gm-Gg: ASbGncvjfg6jqOlYkevIzAAGmbIuV62NGLt/D9Hi+lDGkEH2zPsGjg7VEr7lpXkBXwf EAeyGea7g20E5kZW33Xioi599N8+5rtfOikkaEIwBhG58vDABTpMiAiKiW8l94vOcSeE3kpWKQZ Yj4MF5ujCVTGEuOHG14tWjiYLo7SDP+QrTGHLRdmnh2nAeJoGUXMr8kU5meys50sofs27sT5LZa JRCLqhgDMgCgpAkK1VU01s9Rgqud86ak1IZyGvWrGkX1ki2f03rYZx8qk2O1YU4CA+wt/Lqen7F 3XPrkm2scip6QsYT5wpppwjp3YzU9F4MzhmnLegJy+2Hgbzxiry9wmJJjUN6h2LoLKDpCfz1HpF ZV6ivSe5lGnDk6spBuHI34xfDha4= X-Google-Smtp-Source: AGHT+IHQphv4vwSDxzX++wJ7dkwR4fY5PmWaSMm5edn3a8fbf06IH7XN7suyTmn9yIsdflhRFlco/RysUZSQ X-Received: by 2002:a05:7022:ea55:10b0:119:e56b:46b7 with SMTP id a92af1059eb24-11f2e7f076fmr445366c88.1.1765430193256; Wed, 10 Dec 2025 21:16:33 -0800 (PST) Received: from c7-smtp-2023.dev.purestorage.com ([2620:125:9017:12:36:3:5:0]) by smtp-relay.gmail.com with ESMTPS id a92af1059eb24-11f2e30259bsm208476c88.8.2025.12.10.21.16.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Dec 2025 21:16:33 -0800 (PST) X-Relaying-Domain: purestorage.com Received: from dev-csander.dev.purestorage.com (dev-csander.dev.purestorage.com [10.7.70.37]) by c7-smtp-2023.dev.purestorage.com (Postfix) with ESMTP id A5DF83401CC; Wed, 10 Dec 2025 22:16:32 -0700 (MST) Received: by dev-csander.dev.purestorage.com (Postfix, from userid 1557716354) id A2B4BE41888; Wed, 10 Dec 2025 22:16:32 -0700 (MST) From: Caleb Sander Mateos To: Ming Lei , Shuah Khan Cc: linux-block@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Caleb Sander Mateos Subject: [PATCH 6/8] selftests: ublk: forbid multiple data copy modes Date: Wed, 10 Dec 2025 22:16:01 -0700 Message-ID: <20251211051603.1154841-7-csander@purestorage.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20251211051603.1154841-1-csander@purestorage.com> References: <20251211051603.1154841-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 kublk mock ublk server allows multiple data copy mode arguments to be passed on the command line (--zero_copy, --get_data, and --auto_zc). The ublk device will be created with all the requested feature flags, however kublk will only use one of the modes to interact with request data (arbitrarily preferring auto_zc over zero_copy over get_data). To clarify the intent of the test, don't allow multiple data copy modes to be specified. Don't set UBLK_F_USER_COPY for zero_copy, as it's an independent feature. Don't require zero_copy for auto_zc_fallback, as only auto_zc is needed. Fix the test cases passing multiple data copy mode arguments. Signed-off-by: Caleb Sander Mateos --- tools/testing/selftests/ublk/kublk.c | 21 ++++++++++++------- .../testing/selftests/ublk/test_generic_09.sh | 2 +- .../testing/selftests/ublk/test_stress_03.sh | 4 ++-- .../testing/selftests/ublk/test_stress_04.sh | 2 +- .../testing/selftests/ublk/test_stress_05.sh | 10 ++++----- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/ublk/kublk.c b/tools/testing/selftests= /ublk/kublk.c index f8fa102a627f..1765c4806523 100644 --- a/tools/testing/selftests/ublk/kublk.c +++ b/tools/testing/selftests/ublk/kublk.c @@ -1611,11 +1611,11 @@ int main(int argc, char *argv[]) break; case 'd': ctx.queue_depth =3D strtol(optarg, NULL, 10); break; case 'z': - ctx.flags |=3D UBLK_F_SUPPORT_ZERO_COPY | UBLK_F_USER_COPY; + ctx.flags |=3D UBLK_F_SUPPORT_ZERO_COPY; break; case 'r': value =3D strtol(optarg, NULL, 10); if (value) ctx.flags |=3D UBLK_F_USER_RECOVERY; @@ -1674,17 +1674,22 @@ int main(int argc, char *argv[]) optind +=3D 1; break; } } =20 - /* auto_zc_fallback depends on F_AUTO_BUF_REG & F_SUPPORT_ZERO_COPY */ - if (ctx.auto_zc_fallback && - !((ctx.flags & UBLK_F_AUTO_BUF_REG) && - (ctx.flags & UBLK_F_SUPPORT_ZERO_COPY))) { - ublk_err("%s: auto_zc_fallback is set but neither " - "F_AUTO_BUF_REG nor F_SUPPORT_ZERO_COPY is enabled\n", - __func__); + /* auto_zc_fallback depends on F_AUTO_BUF_REG */ + if (ctx.auto_zc_fallback && !(ctx.flags & UBLK_F_AUTO_BUF_REG)) { + ublk_err("%s: auto_zc_fallback is set but F_AUTO_BUF_REG is disabled\n", + __func__); + return -EINVAL; + } + + if (!!(ctx.flags & UBLK_F_SUPPORT_ZERO_COPY) + + !!(ctx.flags & UBLK_F_NEED_GET_DATA) + + !!(ctx.flags & UBLK_F_USER_COPY) + + !!(ctx.flags & UBLK_F_AUTO_BUF_REG) > 1) { + fprintf(stderr, "too many data copy modes specified\n"); return -EINVAL; } =20 i =3D optind; while (i < argc && ctx.nr_files < MAX_BACK_FILES) { diff --git a/tools/testing/selftests/ublk/test_generic_09.sh b/tools/testin= g/selftests/ublk/test_generic_09.sh index bb6f77ca5522..145e17b3d2b0 100755 --- a/tools/testing/selftests/ublk/test_generic_09.sh +++ b/tools/testing/selftests/ublk/test_generic_09.sh @@ -14,11 +14,11 @@ if ! _have_program fio; then exit "$UBLK_SKIP_CODE" fi =20 _prep_test "null" "basic IO test" =20 -dev_id=3D$(_add_ublk_dev -t null -z --auto_zc --auto_zc_fallback) +dev_id=3D$(_add_ublk_dev -t null --auto_zc --auto_zc_fallback) _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$? diff --git a/tools/testing/selftests/ublk/test_stress_03.sh b/tools/testing= /selftests/ublk/test_stress_03.sh index 3ed4c9b2d8c0..8e9f2786ef9c 100755 --- a/tools/testing/selftests/ublk/test_stress_03.sh +++ b/tools/testing/selftests/ublk/test_stress_03.sh @@ -36,19 +36,19 @@ wait =20 if _have_feature "AUTO_BUF_REG"; then ublk_io_and_remove 8G -t null -q 4 --auto_zc & ublk_io_and_remove 256M -t loop -q 4 --auto_zc "${UBLK_BACKFILES[0]}" & ublk_io_and_remove 256M -t stripe -q 4 --auto_zc "${UBLK_BACKFILES[1]}" "= ${UBLK_BACKFILES[2]}" & - ublk_io_and_remove 8G -t null -q 4 -z --auto_zc --auto_zc_fallback & + ublk_io_and_remove 8G -t null -q 4 --auto_zc --auto_zc_fallback & wait fi =20 if _have_feature "PER_IO_DAEMON"; then ublk_io_and_remove 8G -t null -q 4 --auto_zc --nthreads 8 --per_io_tasks & ublk_io_and_remove 256M -t loop -q 4 --auto_zc --nthreads 8 --per_io_task= s "${UBLK_BACKFILES[0]}" & 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 & + ublk_io_and_remove 8G -t null -q 4 --auto_zc --auto_zc_fallback --nthread= s 8 --per_io_tasks & wait fi =20 _cleanup_test "stress" _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 c7220723b537..6e165a1f90b4 100755 --- a/tools/testing/selftests/ublk/test_stress_04.sh +++ b/tools/testing/selftests/ublk/test_stress_04.sh @@ -35,11 +35,11 @@ wait =20 if _have_feature "AUTO_BUF_REG"; then ublk_io_and_kill_daemon 8G -t null -q 4 --auto_zc & ublk_io_and_kill_daemon 256M -t loop -q 4 --auto_zc "${UBLK_BACKFILES[0]}= " & ublk_io_and_kill_daemon 256M -t stripe -q 4 --auto_zc --no_ublk_fixed_fd = "${UBLK_BACKFILES[1]}" "${UBLK_BACKFILES[2]}" & - ublk_io_and_kill_daemon 8G -t null -q 4 -z --auto_zc --auto_zc_fallback & + ublk_io_and_kill_daemon 8G -t null -q 4 --auto_zc --auto_zc_fallback & wait fi =20 if _have_feature "PER_IO_DAEMON"; then ublk_io_and_kill_daemon 8G -t null -q 4 --auto_zc --nthreads 8 --per_io_t= asks & diff --git a/tools/testing/selftests/ublk/test_stress_05.sh b/tools/testing= /selftests/ublk/test_stress_05.sh index 274295061042..09b94c36f2ba 100755 --- a/tools/testing/selftests/ublk/test_stress_05.sh +++ b/tools/testing/selftests/ublk/test_stress_05.sh @@ -56,21 +56,21 @@ for reissue in $(seq 0 1); do wait done =20 if _have_feature "ZERO_COPY"; then for reissue in $(seq 0 1); do - ublk_io_and_remove 8G -t null -q 4 -g -z -r 1 -i "$reissue" & - ublk_io_and_remove 256M -t loop -q 4 -g -z -r 1 -i "$reissue" "${UBLK_BA= CKFILES[1]}" & + ublk_io_and_remove 8G -t null -q 4 -z -r 1 -i "$reissue" & + ublk_io_and_remove 256M -t loop -q 4 -z -r 1 -i "$reissue" "${UBLK_BACKF= ILES[1]}" & wait done fi =20 if _have_feature "AUTO_BUF_REG"; then for reissue in $(seq 0 1); do - ublk_io_and_remove 8G -t null -q 4 -g --auto_zc -r 1 -i "$reissue" & - ublk_io_and_remove 256M -t loop -q 4 -g --auto_zc -r 1 -i "$reissue" "${= UBLK_BACKFILES[1]}" & - ublk_io_and_remove 8G -t null -q 4 -g -z --auto_zc --auto_zc_fallback -r= 1 -i "$reissue" & + ublk_io_and_remove 8G -t null -q 4 --auto_zc -r 1 -i "$reissue" & + ublk_io_and_remove 256M -t loop -q 4 --auto_zc -r 1 -i "$reissue" "${UBL= K_BACKFILES[1]}" & + ublk_io_and_remove 8G -t null -q 4 --auto_zc --auto_zc_fallback -r 1 -i = "$reissue" & wait done fi =20 if _have_feature "PER_IO_DAEMON"; then --=20 2.45.2