From patchwork Fri Dec 30 22:11:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13084644 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 4F9B8C4332F for ; Fri, 30 Dec 2022 22:40:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229827AbiL3WkN (ORCPT ); Fri, 30 Dec 2022 17:40:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbiL3WkN (ORCPT ); Fri, 30 Dec 2022 17:40:13 -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 79D5217E33 for ; Fri, 30 Dec 2022 14:40:12 -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 1689E61C15 for ; Fri, 30 Dec 2022 22:40:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71C0EC433EF; Fri, 30 Dec 2022 22:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672440011; bh=0hh8Py0CHFO24hYEsFtArqreKNfCkWvzSnuLEwLMidQ=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=OYmEEUtomE/c45eL2rfBDv1umS/NJNb3pq5huLs3fdpdnieqE8EXz4Z0onfCwJqwz HbhBWdeC0ps3usjxRlWsNIIIbnyJvwJnNSBsDFnMrFW6QmBCYsTiTKi9buO33GzEmu x/aeDN5xRGwgYBRWmexP51lIL0rk5s0mcp+fLNsNeFBHk3aB87OmqUQ81J220u6S/l 1cGWALcIugb6ekQiAiK5wjh+TQdifegcfBWyFyoB/H0HHEAPhzPkkBfLoTWeb+gML7 5UiDWgF5tB/4zwFDrPu7OQAGB+d9qrBh5zPHpyEdh+RF1XZmntndVz0WS5a8KbFp09 kmTOG0p6thqOQ== Subject: [PATCH 1/3] xfs: hoist rmap record flag checks from scrub From: "Darrick J. Wong" To: djwong@kernel.org Cc: linux-xfs@vger.kernel.org Date: Fri, 30 Dec 2022 14:11:15 -0800 Message-ID: <167243827554.684088.17848836865268694140.stgit@magnolia> In-Reply-To: <167243827537.684088.11219968589590305107.stgit@magnolia> References: <167243827537.684088.11219968589590305107.stgit@magnolia> 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 Move the rmap record flag checks from xchk_rmapbt_rec into xfs_rmap_check_irec so that they are applied everywhere. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_rmap.c | 22 ++++++++++++++++++++++ fs/xfs/scrub/rmap.c | 22 ---------------------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c index 641114a023f2..e66ecd794a84 100644 --- a/fs/xfs/libxfs/xfs_rmap.c +++ b/fs/xfs/libxfs/xfs_rmap.c @@ -212,6 +212,10 @@ xfs_rmap_check_irec( const struct xfs_rmap_irec *irec) { struct xfs_mount *mp = cur->bc_mp; + bool is_inode; + bool is_unwritten; + bool is_bmbt; + bool is_attr; if (irec->rm_blockcount == 0) return __this_address; @@ -232,6 +236,24 @@ xfs_rmap_check_irec( irec->rm_owner >= XFS_RMAP_OWN_MIN))) return __this_address; + /* Check flags. */ + is_inode = !XFS_RMAP_NON_INODE_OWNER(irec->rm_owner); + is_bmbt = irec->rm_flags & XFS_RMAP_BMBT_BLOCK; + is_attr = irec->rm_flags & XFS_RMAP_ATTR_FORK; + is_unwritten = irec->rm_flags & XFS_RMAP_UNWRITTEN; + + if (is_bmbt && irec->rm_offset != 0) + return __this_address; + + if (!is_inode && irec->rm_offset != 0) + return __this_address; + + if (is_unwritten && (is_bmbt || !is_inode || is_attr)) + return __this_address; + + if (!is_inode && (is_bmbt || is_unwritten || is_attr)) + return __this_address; + return NULL; } diff --git a/fs/xfs/scrub/rmap.c b/fs/xfs/scrub/rmap.c index 610b16f77e7e..a039008dc078 100644 --- a/fs/xfs/scrub/rmap.c +++ b/fs/xfs/scrub/rmap.c @@ -94,10 +94,6 @@ xchk_rmapbt_rec( const union xfs_btree_rec *rec) { struct xfs_rmap_irec irec; - bool non_inode; - bool is_unwritten; - bool is_bmbt; - bool is_attr; if (xfs_rmap_btrec_to_irec(rec, &irec) != NULL || xfs_rmap_check_irec(bs->cur, &irec) != NULL) { @@ -105,24 +101,6 @@ xchk_rmapbt_rec( return 0; } - /* Check flags. */ - non_inode = XFS_RMAP_NON_INODE_OWNER(irec.rm_owner); - is_bmbt = irec.rm_flags & XFS_RMAP_BMBT_BLOCK; - is_attr = irec.rm_flags & XFS_RMAP_ATTR_FORK; - is_unwritten = irec.rm_flags & XFS_RMAP_UNWRITTEN; - - if (is_bmbt && irec.rm_offset != 0) - xchk_btree_set_corrupt(bs->sc, bs->cur, 0); - - if (non_inode && irec.rm_offset != 0) - xchk_btree_set_corrupt(bs->sc, bs->cur, 0); - - if (is_unwritten && (is_bmbt || non_inode || is_attr)) - xchk_btree_set_corrupt(bs->sc, bs->cur, 0); - - if (non_inode && (is_bmbt || is_unwritten || is_attr)) - xchk_btree_set_corrupt(bs->sc, bs->cur, 0); - xchk_rmapbt_xref(bs->sc, &irec); return 0; } From patchwork Fri Dec 30 22:11:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13084645 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 A1784C4332F for ; Fri, 30 Dec 2022 22:40:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229821AbiL3Wka (ORCPT ); Fri, 30 Dec 2022 17:40:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54572 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbiL3Wka (ORCPT ); Fri, 30 Dec 2022 17:40:30 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93F3C17E33 for ; Fri, 30 Dec 2022 14:40:29 -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 ams.source.kernel.org (Postfix) with ESMTPS id 40603B81C06 for ; Fri, 30 Dec 2022 22:40:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0D48C433EF; Fri, 30 Dec 2022 22:40:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672440027; bh=VRQ/6UlKzAiBE7yPzp4on35PfXVeqyFijwESNoPJjNo=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=AIgnwvfzty3nR4B9IWN8EGCdD2O/vY0amGeHYKYjRUl93D+QK1Ew6xJsaH6gs4Bt2 EoxwiraZKRVvQelHTHem0a148DwSB2ohTSQmDvixJaxN+9uMIsGeAy1qE2YeQAshXA wN9PB7SVOJU8p37j936ob5xKliCFct4H+Ri8z/6mX2ReY+SMb7K40469laNNinsWST byIuPadcKmlPNzn0zByVl1kgJLxm5naOuv9ccpTz9+P4jNpyXoebYnxKqF+R/GWGrH mACqZxCKNUhe4Ai0ihOnZiIYr/5VzWHjG7aJhKM4AiqR7/7dp5dYB1ZZlx3+a39lOd Y9XnKGeUdINOQ== Subject: [PATCH 2/3] xfs: hoist rmap record flag checks from scrub From: "Darrick J. Wong" To: djwong@kernel.org Cc: linux-xfs@vger.kernel.org Date: Fri, 30 Dec 2022 14:11:15 -0800 Message-ID: <167243827569.684088.7112623579861724945.stgit@magnolia> In-Reply-To: <167243827537.684088.11219968589590305107.stgit@magnolia> References: <167243827537.684088.11219968589590305107.stgit@magnolia> 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 Move the rmap record flag checks from xchk_rmapbt_rec into xfs_rmap_check_irec so that they are applied everywhere. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_rmap.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/fs/xfs/libxfs/xfs_rmap.c b/fs/xfs/libxfs/xfs_rmap.c index e66ecd794a84..da008d317f83 100644 --- a/fs/xfs/libxfs/xfs_rmap.c +++ b/fs/xfs/libxfs/xfs_rmap.c @@ -254,6 +254,11 @@ xfs_rmap_check_irec( if (!is_inode && (is_bmbt || is_unwritten || is_attr)) return __this_address; + /* Check for a valid fork offset, if applicable. */ + if (is_inode && !is_bmbt && + !xfs_verify_fileext(mp, irec->rm_offset, irec->rm_blockcount)) + return __this_address; + return NULL; } From patchwork Fri Dec 30 22:11:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 13084646 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 1C94DC4332F for ; Fri, 30 Dec 2022 22:40:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229733AbiL3Wkr (ORCPT ); Fri, 30 Dec 2022 17:40:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbiL3Wkq (ORCPT ); Fri, 30 Dec 2022 17:40:46 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1056CD63 for ; Fri, 30 Dec 2022 14:40:45 -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 ams.source.kernel.org (Postfix) with ESMTPS id C6F67B81C06 for ; Fri, 30 Dec 2022 22:40:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 868F0C433EF; Fri, 30 Dec 2022 22:40:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672440042; bh=NrxX+RtVCV+DTBmpO5khKdPGieXVCP6nhNg7YtB35fc=; h=Subject:From:To:Cc:Date:In-Reply-To:References:From; b=adJnoaBRng+ogHo58EGGUs+nsHzijA9EfluTA49ye93KYpMcNgg/+qNB7clNAgmpQ gS+PXTF5zxagV/DLNR6/ssM8YttM+Pk4bqK/R9kZKxHWMWMxIS3xiNl1pGs5tQJSpX /DzU53LmnqwpXZ+paLI5c/s5SW8bL+z0jgWzzgWHoxHtaa97jqzbBZEwxslPWUwLL3 PweCC7gbqtyRRr4T0WYaEp9jZDDWV/ifAkzNi1HgUy+78k38OhYgyBDOUMCFYAuyHd clwPGj9g6w9mjExKViBjsht4bLdncY4O06y1njsIXsWtaYz6Etbh3WVJkB+O7LrlNq Rk7MwnNbMyE/A== Subject: [PATCH 3/3] xfs: hoist inode record alignment checks from scrub From: "Darrick J. Wong" To: djwong@kernel.org Cc: linux-xfs@vger.kernel.org Date: Fri, 30 Dec 2022 14:11:15 -0800 Message-ID: <167243827583.684088.2409271075220837586.stgit@magnolia> In-Reply-To: <167243827537.684088.11219968589590305107.stgit@magnolia> References: <167243827537.684088.11219968589590305107.stgit@magnolia> 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 Move the inobt record alignment checks from xchk_iallocbt_rec into xfs_inobt_check_irec so that they are applied everywhere. Signed-off-by: Darrick J. Wong --- fs/xfs/libxfs/xfs_ialloc.c | 4 ++++ fs/xfs/scrub/ialloc.c | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index b6f76935504e..2451db4c687c 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c @@ -103,8 +103,12 @@ xfs_inobt_check_irec( { uint64_t realfree; + /* Record has to be properly aligned within the AG. */ if (!xfs_verify_agino(cur->bc_ag.pag, irec->ir_startino)) return __this_address; + if (!xfs_verify_agino(cur->bc_ag.pag, + irec->ir_startino + XFS_INODES_PER_CHUNK - 1)) + return __this_address; if (irec->ir_count < XFS_INODES_PER_HOLEMASK_BIT || irec->ir_count > XFS_INODES_PER_CHUNK) return __this_address; diff --git a/fs/xfs/scrub/ialloc.c b/fs/xfs/scrub/ialloc.c index 9aec5a793397..b85f0cd00bc2 100644 --- a/fs/xfs/scrub/ialloc.c +++ b/fs/xfs/scrub/ialloc.c @@ -413,7 +413,6 @@ xchk_iallocbt_rec( const union xfs_btree_rec *rec) { struct xfs_mount *mp = bs->cur->bc_mp; - struct xfs_perag *pag = bs->cur->bc_ag.pag; struct xchk_iallocbt *iabt = bs->private; struct xfs_inobt_rec_incore irec; uint64_t holes; @@ -431,11 +430,6 @@ xchk_iallocbt_rec( } agino = irec.ir_startino; - /* Record has to be properly aligned within the AG. */ - if (!xfs_verify_agino(pag, agino + XFS_INODES_PER_CHUNK - 1)) { - xchk_btree_set_corrupt(bs->sc, bs->cur, 0); - goto out; - } xchk_iallocbt_rec_alignment(bs, &irec); if (bs->sc->sm->sm_flags & XFS_SCRUB_OFLAG_CORRUPT)