From: Brian Foster <bfoster@redhat.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: Christoph Hellwig <hch@lst.de>, linux-xfs@vger.kernel.org
Subject: Re: [PATCH 07/10] xfs: hoist recovered extent-free intent checks out of xfs_efi_item_recover
Date: Fri, 4 Dec 2020 09:00:19 -0500 [thread overview]
Message-ID: <20201204140019.GI1404170@bfoster> (raw)
In-Reply-To: <160704433854.734470.16229052921938871989.stgit@magnolia>
On Thu, Dec 03, 2020 at 05:12:18PM -0800, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> When we recover a extent-free intent from the log, we need to validate
> its contents before we try to replay them. Hoist the checking code into
> a separate function in preparation to refactor this code to use
> validation helpers.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
> ---
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_extfree_item.c | 31 +++++++++++++++++++++++--------
> 1 file changed, 23 insertions(+), 8 deletions(-)
>
>
> diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c
> index 6c11bfc3d452..5e0f0b0a6c83 100644
> --- a/fs/xfs/xfs_extfree_item.c
> +++ b/fs/xfs/xfs_extfree_item.c
> @@ -578,6 +578,25 @@ const struct xfs_defer_op_type xfs_agfl_free_defer_type = {
> .cancel_item = xfs_extent_free_cancel_item,
> };
>
> +/* Is this recovered EFI ok? */
> +static inline bool
> +xfs_efi_validate_ext(
> + struct xfs_mount *mp,
> + struct xfs_extent *extp)
> +{
> + xfs_fsblock_t startblock_fsb;
> +
> + startblock_fsb = XFS_BB_TO_FSB(mp,
> + XFS_FSB_TO_DADDR(mp, extp->ext_start));
> + if (startblock_fsb == 0 ||
> + extp->ext_len == 0 ||
> + startblock_fsb >= mp->m_sb.sb_dblocks ||
> + extp->ext_len >= mp->m_sb.sb_agblocks)
> + return false;
> +
> + return true;
> +}
> +
> /*
> * Process an extent free intent item that was recovered from
> * the log. We need to free the extents that it describes.
> @@ -592,7 +611,6 @@ xfs_efi_item_recover(
> struct xfs_efd_log_item *efdp;
> struct xfs_trans *tp;
> struct xfs_extent *extp;
> - xfs_fsblock_t startblock_fsb;
> int i;
> int error = 0;
>
> @@ -602,14 +620,11 @@ xfs_efi_item_recover(
> * just toss the EFI.
> */
> for (i = 0; i < efip->efi_format.efi_nextents; i++) {
> - extp = &efip->efi_format.efi_extents[i];
> - startblock_fsb = XFS_BB_TO_FSB(mp,
> - XFS_FSB_TO_DADDR(mp, extp->ext_start));
> - if (startblock_fsb == 0 ||
> - extp->ext_len == 0 ||
> - startblock_fsb >= mp->m_sb.sb_dblocks ||
> - extp->ext_len >= mp->m_sb.sb_agblocks)
> + if (!xfs_efi_validate_ext(mp,
> + &efip->efi_format.efi_extents[i])) {
> + XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp);
> return -EFSCORRUPTED;
> + }
> }
>
> error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, 0, 0, 0, &tp);
>
next prev parent reply other threads:[~2020-12-04 14:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-04 1:11 [PATCH v2 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-04 1:11 ` [PATCH 01/10] xfs: hoist recovered bmap intent checks out of xfs_bui_item_recover Darrick J. Wong
2020-12-04 13:55 ` Brian Foster
2020-12-04 1:11 ` [PATCH 02/10] xfs: improve the code that checks recovered bmap intent items Darrick J. Wong
2020-12-04 13:56 ` Brian Foster
2020-12-04 19:54 ` Darrick J. Wong
2020-12-04 1:11 ` [PATCH 03/10] xfs: hoist recovered rmap intent checks out of xfs_rui_item_recover Darrick J. Wong
2020-12-04 13:59 ` Brian Foster
2020-12-04 1:12 ` [PATCH 04/10] xfs: improve the code that checks recovered rmap intent items Darrick J. Wong
2020-12-04 13:59 ` Brian Foster
2020-12-04 1:12 ` [PATCH 05/10] xfs: hoist recovered refcount intent checks out of xfs_cui_item_recover Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 06/10] xfs: improve the code that checks recovered refcount intent items Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 07/10] xfs: hoist recovered extent-free intent checks out of xfs_efi_item_recover Darrick J. Wong
2020-12-04 14:00 ` Brian Foster [this message]
2020-12-04 1:12 ` [PATCH 08/10] xfs: improve the code that checks recovered extent-free intent items Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 1:12 ` [PATCH 09/10] xfs: validate feature support when recovering rmap/refcount/bmap intents Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-06 23:08 ` Darrick J. Wong
2020-12-07 14:02 ` Brian Foster
2020-12-07 16:50 ` Darrick J. Wong
2020-12-04 1:12 ` [PATCH 10/10] xfs: trace log intent item recovery failures Darrick J. Wong
2020-12-04 14:00 ` Brian Foster
2020-12-04 19:57 ` Darrick J. Wong
-- strict thread matches above, loose matches on Subject: below --
2020-12-06 23:09 [PATCH v3 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-06 23:10 ` [PATCH 07/10] xfs: hoist recovered extent-free intent checks out of xfs_efi_item_recover Darrick J. Wong
2020-12-01 3:37 [PATCH 00/10] xfs: strengthen log intent validation Darrick J. Wong
2020-12-01 3:38 ` [PATCH 07/10] xfs: hoist recovered extent-free intent checks out of xfs_efi_item_recover Darrick J. Wong
2020-12-01 10:06 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201204140019.GI1404170@bfoster \
--to=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=hch@lst.de \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).