From: Christoph Hellwig <hch@lst.de>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com, hch@lst.de,
bfoster@redhat.com
Subject: Re: [PATCH 3/5] xfs: proper replay of deferred ops queued during log recovery
Date: Fri, 2 Oct 2020 09:18:38 +0200 [thread overview]
Message-ID: <20201002071838.GB9900@lst.de> (raw)
In-Reply-To: <160140141157.830233.8230232141442784711.stgit@magnolia>
On Tue, Sep 29, 2020 at 10:43:31AM -0700, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> When we replay unfinished intent items that have been recovered from the
> log, it's possible that the replay will cause the creation of more
> deferred work items. As outlined in commit 509955823cc9c ("xfs: log
> recovery should replay deferred ops in order"), later work items have an
> implicit ordering dependency on earlier work items. Therefore, recovery
> must replay the items (both recovered and created) in the same order
> that they would have been during normal operation.
>
> For log recovery, we enforce this ordering by using an empty transaction
> to collect deferred ops that get created in the process of recovering a
> log intent item to prevent them from being committed before the rest of
> the recovered intent items. After we finish committing all the
> recovered log items, we allocate a transaction with an enormous block
> reservation, splice our huge list of created deferred ops into that
> transaction, and commit it, thereby finishing all those ops.
>
> This is /really/ hokey -- it's the one place in XFS where we allow
> nested transactions; the splicing of the defer ops list is is inelegant
> and has to be done twice per recovery function; and the broken way we
> handle inode pointers and block reservations cause subtle use-after-free
> and allocator problems that will be fixed by this patch and the two
> patches after it.
>
> Therefore, replace the hokey empty transaction with a structure designed
> to capture each chain of deferred ops that are created as part of
> recovering a single unfinished log intent. Finally, refactor the loop
> that replays those chains to do so using one transaction per chain.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_defer.c | 89 +++++++++++++++++++++++++++++++--
> fs/xfs/libxfs/xfs_defer.h | 19 +++++++
> fs/xfs/xfs_bmap_item.c | 16 +-----
> fs/xfs/xfs_extfree_item.c | 7 +--
> fs/xfs/xfs_log_recover.c | 118 +++++++++++++++++++++++++-------------------
> fs/xfs/xfs_refcount_item.c | 16 +-----
> fs/xfs/xfs_rmap_item.c | 7 +--
> fs/xfs/xfs_trans.h | 3 +
> 8 files changed, 184 insertions(+), 91 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c
> index 36c103c14bc9..85c371d29e8d 100644
> --- a/fs/xfs/libxfs/xfs_defer.c
> +++ b/fs/xfs/libxfs/xfs_defer.c
> @@ -549,14 +549,89 @@ xfs_defer_move(
> *
> * Create and log intent items for all the work that we're capturing so that we
> * can be assured that the items will get replayed if the system goes down
> - * before log recovery gets a chance to finish the work it put off. Then we
> - * move the chain from stp to dtp.
> + * before log recovery gets a chance to finish the work it put off. The entire
> + * deferred ops state is transferred to the capture structure and the
> + * transaction is then ready for the caller to commit it. If there are no
> + * intent items to capture, this function returns NULL.
> + */
> +static struct xfs_defer_capture *
> +xfs_defer_ops_capture(
> + struct xfs_trans *tp)
> +{
> + struct xfs_defer_capture *dfc;
> +
> + if (list_empty(&tp->t_dfops))
> + return NULL;
Nit: keeping the list_empty check in the caller would seems more obvious
to me.
Otherwise looks good:
Reviewed-by: Christoph Hellwig <hch@lst.de>
next prev parent reply other threads:[~2020-10-02 7:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 17:43 [PATCH v4 0/5] xfs: fix how we deal with new intents during recovery Darrick J. Wong
2020-09-29 17:43 ` [PATCH 1/5] xfs: remove xfs_defer_reset Darrick J. Wong
2020-10-01 17:30 ` Brian Foster
2020-09-29 17:43 ` [PATCH 2/5] xfs: remove XFS_LI_RECOVERED Darrick J. Wong
2020-10-01 17:30 ` Brian Foster
2020-10-02 7:16 ` Christoph Hellwig
2020-09-29 17:43 ` [PATCH 3/5] xfs: proper replay of deferred ops queued during log recovery Darrick J. Wong
2020-10-01 17:31 ` Brian Foster
2020-10-01 17:41 ` Darrick J. Wong
2020-10-02 7:18 ` Christoph Hellwig [this message]
2020-09-29 17:43 ` [PATCH 4/5] xfs: xfs_defer_capture should absorb remaining block reservation Darrick J. Wong
2020-10-01 17:32 ` Brian Foster
2020-10-01 17:46 ` Darrick J. Wong
2020-10-02 4:20 ` [PATCH v4.2 " Darrick J. Wong
2020-10-02 7:22 ` Christoph Hellwig
2020-10-02 10:39 ` Brian Foster
2020-09-29 17:43 ` [PATCH 5/5] xfs: xfs_defer_capture should absorb remaining transaction reservation Darrick J. Wong
2020-10-01 17:32 ` Brian Foster
2020-10-01 17:52 ` Darrick J. Wong
2020-10-02 4:21 ` [PATCH v4.2 " Darrick J. Wong
2020-10-02 7:24 ` Christoph Hellwig
2020-10-02 7:32 ` Christoph Hellwig
2020-10-02 10:39 ` Brian Foster
-- strict thread matches above, loose matches on Subject: below --
2020-10-05 18:19 [PATCH v5 0/5] xfs: fix how we deal with new intents during recovery Darrick J. Wong
2020-10-05 18:20 ` [PATCH 3/5] xfs: proper replay of deferred ops queued during log recovery Darrick J. Wong
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=20201002071838.GB9900@lst.de \
--to=hch@lst.de \
--cc=bfoster@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--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