From patchwork Wed Sep 8 08:37:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 12480609 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9B23CC433EF for ; Wed, 8 Sep 2021 08:37:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7E82C61165 for ; Wed, 8 Sep 2021 08:37:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348190AbhIHIi0 (ORCPT ); Wed, 8 Sep 2021 04:38:26 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:21649 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348087AbhIHIiZ (ORCPT ); Wed, 8 Sep 2021 04:38:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1631090238; x=1662626238; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ncRAqpPm84LmFkYJkcgyZX64ncaVLSHOCvLsCT1gNkI=; b=mWhPS2XU8RfCF1vUM0GBxpr93WbtgpvO1vvHmBAnCWJOJNVmMPR1zjRE nDeo3CwsRqexf+X4igCdwCCySQi28vpOcHIsjc6Z28qdnltt+/tYGmIXW pbeQWS3j2m8TdRptRxht33wal9gtp+u/yc6bavDAS7bahbe4bWAT2t6TO YlMDNpFjUl4TJUetn/+Gtr5ZRHk/5qV9CgmdVyubl7XllhbrDMLO84LNB Qa1S+X4W4P4wT/df1UgzhzxSfKP0SpW9QKfNS0m9m07/2KZVGcLwlUd4Q 1Ebv14jE/Rs3O6WEPezBwPBk6naQJ6UliViwIdchi89a2xHR86qgFsFh9 w==; X-IronPort-AV: E=Sophos;i="5.85,277,1624291200"; d="scan'208";a="291070124" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Sep 2021 16:37:18 +0800 IronPort-SDR: 7m9W0dhzQcl3V3c/0v2Gbmwi6qMA5AV/4Gaf9uFoIe/TeT+7mXiTK6pnDQKrq2QVnAYzF+ybH0 VNUXPb/xQIz6QJdivTt6eWvMnx8VQ49+OOKUuGyI0ft66jsHyyATO3nzRJe/J00eWLRjzY4EJ5 DjhUKt3XRoW/g4brLNfzgc1NcDI1D/DOEciGQ4som3RxFcJPv6cazW2+4F8EbAvMqYOqymLrDA tbW3PrDgixJLpsI2vBrxLjtB6KL31o38bzJAzHzMFUyxzcMjJgcT+7nWTOXPIwjbso5JqOFXtn MuRrtemgsKBCSRmEQvBm/vEv Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 01:13:55 -0700 IronPort-SDR: foXap7fki7GDoFHbTLGF1YSlDem/XcN7BQ8KpHRbXrv0MCjjQF+LriFgSqZhB1wJyUPUu5duRT lzt8aUfvpTphZlfKzWgWud0hhfhqSCTEo45sEHqV8XnHkwbAvsD+GwCisYF00MirloOqDofmPc 73uymfIy2S7Jslz3yyiz6S6l+XB++y6OeTklDGThCsiJdQbPOfgFAHw9PaDsbVcwepwSBtUK0h uTgE5y9OSiA4biGWKzuPWBDg32XiAkURvxthT3NVoqd4m+bI7GocQ46usPn62oGfKq1NMXRcGV EYA= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Sep 2021 01:37:18 -0700 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org Cc: Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shinichiro Kawasaki Subject: [PATCH v2 1/3] generic/{628,629}: Fix order of _require_scratch* and _require_dm_target Date: Wed, 8 Sep 2021 17:37:13 +0900 Message-Id: <20210908083715.1831067-2-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> References: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org Test cases with dm_target shall call _require_scratch* before _require_dm_target to ensure that valid SCRATCH_DEV is available for dm_target. However, the test cases generic/628 and generic/629 call _require_dm_target before _require_scratch*, then unexpected failure was reported when SCRATCH_DEV is not specified. Fix the order of function calls. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Johannes Thumshirn --- tests/generic/628 | 2 +- tests/generic/629 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/generic/628 b/tests/generic/628 index 2ccbbbdc..7dc6dfcd 100755 --- a/tests/generic/628 +++ b/tests/generic/628 @@ -29,8 +29,8 @@ _cleanup() # real QA test starts here _supported_fs generic -_require_dm_target error _require_scratch_reflink +_require_dm_target error _require_xfs_io_command "chattr" "s" _require_cp_reflink diff --git a/tests/generic/629 b/tests/generic/629 index abfa90ab..f501555e 100755 --- a/tests/generic/629 +++ b/tests/generic/629 @@ -28,10 +28,10 @@ _cleanup() # real QA test starts here _supported_fs generic +_require_scratch _require_dm_target error _require_xfs_io_command "chattr" "s" _require_xfs_io_command "copy_range" -_require_scratch # Format filesystem and set up quota limits _scratch_mkfs > $seqres.full From patchwork Wed Sep 8 08:37:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 12480611 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D631C433F5 for ; Wed, 8 Sep 2021 08:37:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2589B61155 for ; Wed, 8 Sep 2021 08:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348212AbhIHIi1 (ORCPT ); Wed, 8 Sep 2021 04:38:27 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:21649 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348087AbhIHIi1 (ORCPT ); Wed, 8 Sep 2021 04:38:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1631090239; x=1662626239; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jI559oOxWQ5A5QCbMq+iuxgSJhyw/Ttb4fecz/61RoQ=; b=W6uPIzut0HXH+eW/N3zX0uUEO3sktJE8A1AsuBzukpsrqJ2lVRzGkKQG Vz6ba7KbHfgBobG9Sz9j3nT6EQ0BlxExji1StObmIfq1UR7Yv0g58owCw iXCx+T1xcazk+ibQhLaFqPEGwOkePon0ZgWUo45NnQijCrPQQvlkiRoSg T1h+1dNnWgTUUBzJMM3I7pfaq/0wYFqR3iDicjyoLrW85DWDPTfEHpWi9 KR11k8KEaURCBE8iBib++9aWlz7ZYW+WiolbIu2u/eBXXDiMtBbwjkhr4 zISvWMRRZlcWUJZuJ7pWdXvBYRqfcY5JwceW95J4qsWGOlZCa0w7sGxPG w==; X-IronPort-AV: E=Sophos;i="5.85,277,1624291200"; d="scan'208";a="291070125" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Sep 2021 16:37:19 +0800 IronPort-SDR: NKYgN84jE4CEFwLNqBiPWxZhsBJNukr/JT0gwKsJb6Ede8h/74zi8NtoiUrJRFw644wdlXstLI YN3V/FW4YgRA/63+kMDVCawM2sE1rA54+10/9EcnJze1zNNhUMnfo4Nrl49KH0JiCgGWMDMstq U0z9iK1h7vKgb0i49flTgjpQtCt2JlfsjvuZRTZK4+Iwre/MJmjzsxC7BWbL1L/tL1eSYq4Q33 o14M6qsHxLZEdqfBwxegKVwgf2IfD5O8QposeupcbePkSqmaSVsV6/V87wAq3G9iGiDE7cPPVH riNmmpMFvvvImQi2/KhDQMza Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 01:13:56 -0700 IronPort-SDR: +G3fOFsCDBeDHpkR5P1aatEjrr8Mt9N/jg1y/9ikfuhQvGWBSUHb/ayW0XEEOdbAz1kkTsv5ee KCuUMhH9LJqEIkDYO4gcue1KFSGU/4HeY+TGwk7QWKo9SDulyoUpbKkaSstCQYOjbt0wARptsT 5KR/NuCrUVNuzI6d1x5+mG8gwM+F+KLy7TBJY751cL2l7y/VTavYiD4EjhoL2Co67snKd5uOpT AZuqnt+K9AE2Y1+8WaK9vjz7P30aymG5E6HXr5cYLddZmFuswSe6C0LKrjYYWwZEc74Oa7g/t8 uUk= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Sep 2021 01:37:19 -0700 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org Cc: Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shinichiro Kawasaki Subject: [PATCH v2 2/3] btrfs/146: Add _require_scratch_dev_pool before _require_dm_target Date: Wed, 8 Sep 2021 17:37:14 +0900 Message-Id: <20210908083715.1831067-3-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> References: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org The test case btrfs/146 calls _require_dm_target which depends on SCRATCH_DEV. The test case assumes that valid devices are set in SCRATCH_DEV_POOL, and one of the devices is propagated to SCRATCH_DEV. However, when SCRATCH_DEV_POOL is not set, valid value is not propagated to SCRATCH_DEV and _require_dm_target causes unexpected test case failure. To avoid the failure, add _require_scratch_dev_pool call before _require_dm_target call to detect invalid SCRATCH_DEV_POOL beforehand. Of note is that the test case replaces SCRATCH_DEV_POOL value internally and calls _require_scratch_dev_pool for the replaced SCRATCH_DEV_POOL. With this fix, the test case will call _require_scratch_dev_pool twice for the original SCRATCH_DEV_POOL and the replaced SCRATCH_DEV_POOL. Signed-off-by: Shin'ichiro Kawasaki Reviewed-by: Johannes Thumshirn --- tests/btrfs/146 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/btrfs/146 b/tests/btrfs/146 index 64c3513f..eee1a286 100755 --- a/tests/btrfs/146 +++ b/tests/btrfs/146 @@ -26,6 +26,7 @@ _cleanup() # real QA test starts here _supported_fs btrfs +_require_scratch_dev_pool _require_dm_target error _require_test_program fsync-err _require_test_program dmerror From patchwork Wed Sep 8 08:37:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shinichiro Kawasaki X-Patchwork-Id: 12480613 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 172F5C433EF for ; Wed, 8 Sep 2021 08:37:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 00ADC6113D for ; Wed, 8 Sep 2021 08:37:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348281AbhIHIia (ORCPT ); Wed, 8 Sep 2021 04:38:30 -0400 Received: from esa1.hgst.iphmx.com ([68.232.141.245]:21649 "EHLO esa1.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348087AbhIHIi2 (ORCPT ); Wed, 8 Sep 2021 04:38:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1631090240; x=1662626240; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xZZ0/y0TjEni4Q99AKjdi2P7L1OyvpXx+zfrLUNwk/k=; b=qZUmG+VmEZU74LRCMfT9vKQTfMeAl/i1+CGmNpOzDCpm6m9UXx5dRKhP KodgEj3m6dTzrBAJmu3epoqTERykjK6+h5JLq5nmqQpI1EiwzgEdXgpSZ rbRuqA0hmc7YT8soRdEu9NunHMzgnzlXgDPDbp0Zg2bO8LeKhbZlIf1Jp sCCvA190rWjk7em4nQK3fyPFZKWu23GaXgUIiorLhX/pn/StgBqMS7L1M FF72I8Wl7d+TKbjjztBWq6C94P8wEM4Gkc40LpdiEvjLzz0XCP6s9YYbR PguIoXgxe2onaE2Hx/gthGF25EkigBL9vrti3lzdGkU7hBzIXVC17x+3P A==; X-IronPort-AV: E=Sophos;i="5.85,277,1624291200"; d="scan'208";a="291070126" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Sep 2021 16:37:20 +0800 IronPort-SDR: 78HOqxLVOUHK0V2beEj8O4jKFjNXDVDuarXn/dLdsaDpYCFZp79wXzohssNv/d9tyS4urPpuc9 M9DqOlXgYHG0ZJfiCrRRS+nGx1FUQHDDY3BvpICS2RCn+8cEc9C+FtQd7NPiWJW3L4bHPVmVPN LBIuc5kWB336TbrCnL4fe7CIQFggaCrsJMMavCYwK4d4WCK7sNxjOu07FDv4ODrOjOlgYd31Mo zRF9w0tkngyf73Q05PDccEuxOgUdcCqkl9HVuwDxVqNR9/ppmF/f+9dFJj+SXDCugtpu6ZvC1t 8oAJG+V5WtuMcfGmkjl0oO+x Received: from uls-op-cesaip01.wdc.com ([10.248.3.36]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Sep 2021 01:13:57 -0700 IronPort-SDR: NLAuFsiQerUbUYFaRQPk4hqyUJQYSszNt3mRBQ3Zl9uu4DUWVfKLSRuMdsXSKCelEVFG1B710A Ienttn+J4eNo2roZU96vXXCpuMca0p6/Rg7edGWCQJLmjcCYddNwiEP45KHPBK6+C7MBhANQHL kuyvIp4+3doUCVtBV6o2w7BaL68y3NZOJuD6ugGHOFE4oUDNo3Equ+yulnbe+gsT4CRVhQW3kn dxXMsWOJWAslWykG7AmLP3AXtbydNaL8/qKjHhACF5eyGa7RpmUe0fn5SyKNlpILv4+Gt17KwJ Kcc= WDCIronportException: Internal Received: from shindev.dhcp.fujisawa.hgst.com (HELO shindev.fujisawa.hgst.com) ([10.149.52.173]) by uls-op-cesaip01.wdc.com with ESMTP; 08 Sep 2021 01:37:20 -0700 From: Shin'ichiro Kawasaki To: fstests@vger.kernel.org Cc: Naohiro Aota , Johannes Thumshirn , Damien Le Moal , Shinichiro Kawasaki Subject: [PATCH v2 3/3] common/rc: Check call order of _require_dm_target and _require_scratch* Date: Wed, 8 Sep 2021 17:37:15 +0900 Message-Id: <20210908083715.1831067-4-shinichiro.kawasaki@wdc.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> References: <20210908083715.1831067-1-shinichiro.kawasaki@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org When SCRATCH_DEV is not set and the test case does not call _require_scratch* before _require_dm_target, _require_block_device called from _require_dm_target fails to evaluate SCRATCH_DEV and results in the test case failure. This failure reason is not described in the error message and it takes some time to catch. To catch the failure reason easier, check SCRATCH_DEV in _require_dm_target. If SCRATCH_DEV is not set, fail the test case and print message which requests to fix call order of _require_scratch* and _require_dm_target. This improvement follows what _scratch_shutdown does for _require_scratch_shutdown. Signed-off-by: Shin'ichiro Kawasaki --- common/rc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/rc b/common/rc index dda5da06..cbec8aaa 100644 --- a/common/rc +++ b/common/rc @@ -1971,6 +1971,9 @@ _require_dm_target() # require SCRATCH_DEV to be a valid block device with sane BLKFLSBUF # behaviour + if [ -z "$SCRATCH_DEV" ]; then + _fail "_require_dm_target: call _require_scratch* first in test" + fi _require_block_device $SCRATCH_DEV _require_sane_bdev_flush $SCRATCH_DEV _require_command "$DMSETUP_PROG" dmsetup