From patchwork Tue Feb 8 21:52:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 12739384 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 735DDC4332F for ; Tue, 8 Feb 2022 22:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386252AbiBHWXD (ORCPT ); Tue, 8 Feb 2022 17:23:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387069AbiBHVwj (ORCPT ); Tue, 8 Feb 2022 16:52:39 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14FE5C0612B8; Tue, 8 Feb 2022 13:52:39 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 67D5CCE1C9B; Tue, 8 Feb 2022 21:52:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E913C340EE; Tue, 8 Feb 2022 21:52:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644357155; bh=e2FM1V1/4GHLdTXW9RpgJI03OpLLahT/Clg2E6le/10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=poNWY/0HwItxg3uLd/DJwy3Epe1guC1sb9SZsJ8ORMxYUgCjiD2WoY+ufGDx6GGDJ O1BuHJh5tkDSJmlD+0WqEPOWTtmAuM+nVKfimhorM8EtDJqoUiS/vuoB84sSbwChLe RnXLyl9I4cNUY1Ci08CwQPce9OyHsnDT09j/UKHKlCDuht+RZG2Rp7fjExuGQbWRG6 KLwfauqHZ9/NILCUiHg/XBvfIUiWQQUU17MDVVohrQyJJSQkprw/8itFDXpmMYXMM7 j/LCikKLIJy/1OWX5pV3ROkQ+ryT4SaYAHCnvmlRzDHZvFCN9xVvM2LQ+YjIa2VOop QU7FENANL0JeQ== From: Anna Schumaker To: fstests@vger.kernel.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 1/4] check: Export CHECK_OPTIONS and PLATFORM for Xunit Reporting Date: Tue, 8 Feb 2022 16:52:29 -0500 Message-Id: <20220208215232.491780-2-anna@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208215232.491780-1-anna@kernel.org> References: <20220208215232.491780-1-anna@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker I found that running ./check by hand with Xunit reporting enabled caused the PLATFORM variable to be unset, and the CHECK_OPTIONS was the default "-g auto" instead of the "-g quick" that I also passed in. This patch sets both variables so Xunit reporting is accurate. Signed-off-by: Anna Schumaker --- Maybe there is a better way to do this? If so please let me know! --- check | 2 ++ 1 file changed, 2 insertions(+) diff --git a/check b/check index a08631213cbb..c8a38345123a 100755 --- a/check +++ b/check @@ -273,6 +273,7 @@ _prepare_test_list() } # Process command arguments first. +export CHECK_OPTIONS="$*" while [ $# -gt 0 ]; do case "$1" in -\? | -h | --help) usage ;; @@ -360,6 +361,7 @@ if ! . ./common/rc; then echo "check: failed to source common/rc" exit 1 fi +export PLATFORM=$(_full_platform_details) if [ -n "$subdir_xfile" ]; then for d in $SRC_GROUPS $FSTYP; do From patchwork Tue Feb 8 21:52:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 12739385 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24250C433F5 for ; Tue, 8 Feb 2022 22:23:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1386232AbiBHWXI (ORCPT ); Tue, 8 Feb 2022 17:23:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387065AbiBHVwh (ORCPT ); Tue, 8 Feb 2022 16:52:37 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 621E0C0612BC; Tue, 8 Feb 2022 13:52:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id EB51A61626; Tue, 8 Feb 2022 21:52:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17F54C004E1; Tue, 8 Feb 2022 21:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644357156; bh=PNKEwm3u3qaphqcUfnN5Rn9BnqIaKAN9u5zK4UEZcG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nwm3nIHNGtSDa0xGGHTizO5yZQ9gz3c4msKmGTkm/lrFNR8QeDDBffdrJpSqzfFns llCxH7oV4j17JzMuSAJFra3uOJI7wRAQyIJEMRSthOnv6Xqe9FLhTle9S4Rxkznsk8 Zo6oNAgD3Rd9Nib3tHdDCLoNZpXWa3a2jKndt/1FA8AlJ9NIFppHEsAnXTjvVVeeW9 MOuaPlW3fNrX2mZcvTuX7do4ebaXpVwoIoaL2uZ96FDSN96h/WPnH1UpsOx7rpUaeY qkHDC92I4nWpGz1p5qGCqC2kvpdHVaFR4bWxBQrLuLiNnU+NmoE4WtWh/kQ3CNhvcO rCcH/B6Nk+8EA== From: Anna Schumaker To: fstests@vger.kernel.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 2/4] generic/531: Move test from 'quick' group to 'stress' Date: Tue, 8 Feb 2022 16:52:30 -0500 Message-Id: <20220208215232.491780-3-anna@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208215232.491780-1-anna@kernel.org> References: <20220208215232.491780-1-anna@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker The comment up top says this is a stress test, so at the very least it should be added to this group. As for removing it from the quick group, making this test variable on the number of CPUs means this test could take a very long time to finish (I'm unsure exactly how long on NFS v4.1 because I usually kill it after a half hour or so) Signed-off-by: Anna Schumaker Reviewed-by: Darrick J. Wong --- I have thought of two alternatives to this patch that would work for me: 1) Could we add an _unsupported_fs function which is the opposite of _supported_fs to prevent tests from running on specific filesystems? 2) Would it be okay to check if $FSTYP == "nfs" when setting nr_cpus, and set it to 1 instead? Perhaps through a function in common/rc that other tests can use if they scale work based on cpu-count? --- tests/generic/531 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/generic/531 b/tests/generic/531 index 5e84ca977b44..62e3cac92423 100755 --- a/tests/generic/531 +++ b/tests/generic/531 @@ -12,7 +12,7 @@ # Use every CPU possible to stress the filesystem. # . ./common/preamble -_begin_fstest auto quick unlink +_begin_fstest auto stress unlink testfile=$TEST_DIR/$seq.txt # Import common functions. From patchwork Tue Feb 8 21:52:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 12739379 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00416C433FE for ; Tue, 8 Feb 2022 22:22:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236350AbiBHWWH (ORCPT ); Tue, 8 Feb 2022 17:22:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387066AbiBHVwi (ORCPT ); Tue, 8 Feb 2022 16:52:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0EBEC0612B8; Tue, 8 Feb 2022 13:52:37 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6F551614EB; Tue, 8 Feb 2022 21:52:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 950D3C340ED; Tue, 8 Feb 2022 21:52:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644357156; bh=GQz3JfLCbgqUTE9TZ0VpJ50qY7zv4DMdazCVVpVHhcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TFtnYarSxBmL58Mrgd8oESMDznJ+DtgfRN9wWOgwTJ6/2g2dx20CbUolyVbkqP74H Zr9NY4JjJmafq1WmkZhk2/hzGCA7+haQEt+gpVUN44LcIREhQfk1qEa/cPwskrsLTx 2K0tHnFWwCHPRYoZWmjyjoEYjJI2r1bRZJzsr8vI6+LdUX+sM03ET4/U71OWJEO/Tp dxARA/J6CR/f/EqVd0CH2Etx9fm6wxniE7QW6Gwit+M13tOOEZ838tadGRId6u+6Jn ngibnZ1iSnOq+kS7upHX7AKkgikoKs8FlSU1dGoYywPmz5g7M8Yh/5UK5sddin7Tsf CPV48kPgbQA2Q== From: Anna Schumaker To: fstests@vger.kernel.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 3/4] generic/578: Test that filefrag is supported before running Date: Tue, 8 Feb 2022 16:52:31 -0500 Message-Id: <20220208215232.491780-4-anna@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208215232.491780-1-anna@kernel.org> References: <20220208215232.491780-1-anna@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker NFS does not support FIBMAP/FIEMAP, so the check for non-shared extents on NFS v4.2 always fails with the message: "FIBMAP/FIEMAP unsupported". I added the _require_filefrag check for NFS and other filesystems that don't have FIEMAP or FIBMAP support. Signed-off-by: Anna Schumaker --- common/rc | 14 ++++++++++++++ tests/generic/578 | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/common/rc b/common/rc index b3289de985d8..73d17da9430e 100644 --- a/common/rc +++ b/common/rc @@ -4673,6 +4673,20 @@ _require_inode_limits() fi } +_require_filefrag() +{ + _require_command "$FILEFRAG_PROG" filefrag + + local file="$TEST_DIR/filefrag_testfile" + + echo "XX" > $file + ${FILEFRAG_PROG} $file 2>&1 | grep -q "FIBMAP/FIEMAP[[:space:]]*unsupported" + if [ $? -eq 0 ]; then + _notrun "FIBMAP/FIEMAP not supported by this filesystem" + fi + rm -f $file +} + _require_filefrag_options() { _require_command "$FILEFRAG_PROG" filefrag diff --git a/tests/generic/578 b/tests/generic/578 index 01929a280f8c..64c813032cf8 100755 --- a/tests/generic/578 +++ b/tests/generic/578 @@ -23,7 +23,7 @@ _cleanup() # real QA test starts here _supported_fs generic _require_test_program "mmap-write-concurrent" -_require_command "$FILEFRAG_PROG" filefrag +_require_filefrag _require_test_reflink _require_cp_reflink From patchwork Tue Feb 8 21:52:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 12739383 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4D37C4167B for ; Tue, 8 Feb 2022 22:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381347AbiBHWXA (ORCPT ); Tue, 8 Feb 2022 17:23:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1387067AbiBHVwi (ORCPT ); Tue, 8 Feb 2022 16:52:38 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 182FCC0612BC; Tue, 8 Feb 2022 13:52:38 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A891461639; Tue, 8 Feb 2022 21:52:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BDBDC004E1; Tue, 8 Feb 2022 21:52:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1644357157; bh=BAtgUU3U8csDNJrdRd0bqKFRltZJKOy72p0vv/ao5ag=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vg4oLPConeciJzGtLQ8aVB4RaWswVkWuFoDcOH10QF/hFF3zGwZK5Ogx6c/XLWinT 5y2SG8NHqotuKAb5y394sOGumJxDvkiZTo9Zj3CgLzdiduk7kFKjKeagKdrX7/GlJr 9Q51ZUtNUjoU7wDY60t0Iqx3AnQk16cAQ1E+vqCbAVxabduUQXQ/O9R5jUc6klSoxn WcpZugxpdAB4fx2Atz3HYhG5rm/NWtCQbs2CXOq1600om5WbN9RPk14n1ZssbSm+QO 2tz7EbDaCfqzEPMQsLDAA/aP3v0Lx8ZxC01zKC+B5GJYWpO5RF4bhuAP8FdyDVKxcL YrZbpR3pkq79Q== From: Anna Schumaker To: fstests@vger.kernel.org Cc: linux-nfs@vger.kernel.org Subject: [PATCH 4/4] generic/633: Check if idmapped mounts are supported before running Date: Tue, 8 Feb 2022 16:52:32 -0500 Message-Id: <20220208215232.491780-5-anna@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220208215232.491780-1-anna@kernel.org> References: <20220208215232.491780-1-anna@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker This appears to have been missed when the test was added. Signed-off-by: Anna Schumaker --- tests/generic/633 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/generic/633 b/tests/generic/633 index 382806471223..6750117735f7 100755 --- a/tests/generic/633 +++ b/tests/generic/633 @@ -15,6 +15,7 @@ _begin_fstest auto quick atime attr cap idmapped io_uring mount perms rw unlink # real QA test starts here _supported_fs generic +_require_idmapped_mounts _require_test echo "Silence is golden"