From patchwork Mon Nov 20 19:35:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13461951 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 74A8BC2BB3F for ; Mon, 20 Nov 2023 19:35:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229564AbjKTTfX (ORCPT ); Mon, 20 Nov 2023 14:35:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjKTTfS (ORCPT ); Mon, 20 Nov 2023 14:35:18 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59CDCA0 for ; Mon, 20 Nov 2023 11:35:15 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F09A1C433C8; Mon, 20 Nov 2023 19:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700508915; bh=PuKyNt2mW9SnCcQNDJmo2iPmqHw7enIHKt7zC4/1cZY=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=FILf+W9ihDhwTRPc5WAJT3E8Scl7Q+Rh5mzRCjiUnSctS4wZvjHKA8I80o/FS8Hr1 tRD6hui52uy8k96mIopoyGitUDaXKyuMAS0JZmqg1cZCNpDXyE77BwjKLSz7smOQ6x 2KYabiiBbci/tivG5EzfYwS2rYHuWqjVMJFhTkXWJJAmAJHLbH67eNUV32c3XqFWhy xFYWp4xWghV2gFQtn0YWC6z3CZ+sXGOtdvktDCvcByeDM6wBiPw3o4caoWH2zMzKCA vILJQZZ+FnRRblvVlmLYoHFSQiZ4IZOa/RohK4wsL6PFHkhr49384HcPP8XXyK2DD+ iFUyxC2lJhuQA== Subject: [PATCH 1/2] xfs/601: move this to tests/generic From: "Darrick J. Wong" To: djwong@kernel.org, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, guan@eryu.me, fstests@vger.kernel.org Date: Mon, 20 Nov 2023 11:35:14 -0800 Message-ID: <170050891446.536459.11166010762932928186.stgit@frogsfrogsfrogs> In-Reply-To: <170050890870.536459.4420904342934916414.stgit@frogsfrogsfrogs> References: <170050890870.536459.4420904342934916414.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong As per last week's discussion, xfs/601 doesn't have any xfs-specific functionality in it. Turn it into a generic test. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/generic/734 | 3 ++- tests/generic/734.out | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) rename tests/{xfs/601 => generic/734} (98%) rename tests/{xfs/601.out => generic/734.out} (78%) diff --git a/tests/xfs/601 b/tests/generic/734 similarity index 98% rename from tests/xfs/601 rename to tests/generic/734 index 9df46e5ebe..93c2ad90e3 100755 --- a/tests/xfs/601 +++ b/tests/generic/734 @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # Copyright (c) 2023 Oracle. All Rights Reserved. # -# FS QA Test No. 601 +# FS QA Test No. 734 # # This is a regression test for the kernel commit noted below. The stale # memory exposure can be exploited by creating a file with shared blocks, @@ -29,6 +29,7 @@ _fixed_by_git_commit kernel 35d30c9cf127 \ "iomap: don't skip reading in !uptodate folios when unsharing a range" # real QA test starts here +_supported_fs generic _require_test_reflink _require_cp_reflink _require_xfs_io_command "funshare" diff --git a/tests/xfs/601.out b/tests/generic/734.out similarity index 78% rename from tests/xfs/601.out rename to tests/generic/734.out index 34d519ca46..174c3f82cb 100644 --- a/tests/xfs/601.out +++ b/tests/generic/734.out @@ -1,4 +1,4 @@ -QA output created by 601 +QA output created by 734 Create the original file and a clone Funshare at least one pagecache page Check contents From patchwork Mon Nov 20 19:35:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13461952 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 ABD8BC197A0 for ; Mon, 20 Nov 2023 19:35:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229570AbjKTTfZ (ORCPT ); Mon, 20 Nov 2023 14:35:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbjKTTfY (ORCPT ); Mon, 20 Nov 2023 14:35:24 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3611BB9 for ; Mon, 20 Nov 2023 11:35:21 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6177C433C8; Mon, 20 Nov 2023 19:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700508920; bh=Oyk70GbW6Tj0CE5UHvYe7fszuQmextVmqY/WFoNDt6w=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=JvWfvxv2PzsaviUjgyubDrOxzn82b/2DPAi0eG30NMDQ7J7IcaehUsJB8KomxImlY qFgADVt+mZ+ajnOZfxlmoYPH1D/PlC/AaU5EmNlRfPTVXua/ugr/PQ5L3fIgi+0UxN Bpmj06BNevsRIsVgk6jofA4Siin/5NVeCKnMIBig683VU8Ixv/502CCEvhwjtaRPWx 8AR4hXw0dd9WgTLo/8FtQLE2UR1si/3JLCjAFqzI5lIKnZGOSg04U11sjUxZQYiSdO +hTovDlSMx7ye8nojwgp7TT3Y020KB6dkNTTY8Nf5Ut6Lof2gzlsg4kd8nPLQnJlvO 52mNAcHUJbH+Q== Subject: [PATCH 2/2] xfs/604: add missing falloc test From: "Darrick J. Wong" To: djwong@kernel.org, zlang@redhat.com Cc: linux-xfs@vger.kernel.org, guan@eryu.me, fstests@vger.kernel.org Date: Mon, 20 Nov 2023 11:35:20 -0800 Message-ID: <170050892015.536459.5750821914760062267.stgit@frogsfrogsfrogs> In-Reply-To: <170050890870.536459.4420904342934916414.stgit@frogsfrogsfrogs> References: <170050890870.536459.4420904342934916414.stgit@frogsfrogsfrogs> User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org From: Darrick J. Wong This test requires both the xfs_io falloc and fpunch commands to run. falloc isn't supported on alwayscow=1 mounts, which means this test fails there. While we're at it, update the commit id since the fix was committed to 6.7-rc2. Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- tests/xfs/604 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/xfs/604 b/tests/xfs/604 index 50cdebcd50..bb6db797e5 100755 --- a/tests/xfs/604 +++ b/tests/xfs/604 @@ -13,9 +13,10 @@ _begin_fstest auto prealloc punch _supported_fs xfs _require_scratch +_require_xfs_io_command "falloc" _require_xfs_io_command "fpunch" _require_test_program punch-alternating -_fixed_by_kernel_commit XXXXXXXXXXXX "xfs: fix internal error from AGFL exhaustion" +_fixed_by_kernel_commit f63a5b3769ad "xfs: fix internal error from AGFL exhaustion" # Disable the rmapbt so we only need to worry about splitting the bnobt and # cntbt at the same time.