From: Chandan Rajendra <chandan@linux.ibm.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 02/21] xfs: refactor log recovery item dispatch for pass2 readhead functions
Date: Fri, 01 May 2020 17:40:02 +0530 [thread overview]
Message-ID: <4890365.NoYZ9p2UQH@localhost.localdomain> (raw)
In-Reply-To: <158820766792.467894.3995732139270270438.stgit@magnolia>
On Thursday, April 30, 2020 6:17 AM Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Move the pass2 readhead code into the per-item source code files and use
> the dispatch function to call them.
>
Readahead is issued for buf, inode and dquot items similar to how it is done in
the present code.
Reviewed-by: Chandan Rajendra <chandanrlinux@gmail.com>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
> fs/xfs/libxfs/xfs_log_recover.h | 6 ++
> fs/xfs/xfs_buf_item_recover.c | 11 +++++
> fs/xfs/xfs_dquot_item.c | 34 ++++++++++++++
> fs/xfs/xfs_inode_item_recover.c | 19 ++++++++
> fs/xfs/xfs_log_recover.c | 95 +--------------------------------------
> 5 files changed, 73 insertions(+), 92 deletions(-)
>
>
> diff --git a/fs/xfs/libxfs/xfs_log_recover.h b/fs/xfs/libxfs/xfs_log_recover.h
> index 38ae9c371edb..1463eba47254 100644
> --- a/fs/xfs/libxfs/xfs_log_recover.h
> +++ b/fs/xfs/libxfs/xfs_log_recover.h
> @@ -29,6 +29,9 @@ struct xlog_recover_item_type {
> * values mean.
> */
> enum xlog_recover_reorder (*reorder_fn)(struct xlog_recover_item *item);
> +
> + /* Start readahead for pass2, if provided. */
> + void (*ra_pass2_fn)(struct xlog *log, struct xlog_recover_item *item);
> };
>
> extern const struct xlog_recover_item_type xlog_icreate_item_type;
> @@ -90,4 +93,7 @@ struct xlog_recover {
> #define XLOG_RECOVER_PASS1 1
> #define XLOG_RECOVER_PASS2 2
>
> +void xlog_buf_readahead(struct xlog *log, xfs_daddr_t blkno, uint len,
> + const struct xfs_buf_ops *ops);
> +
> #endif /* __XFS_LOG_RECOVER_H__ */
> diff --git a/fs/xfs/xfs_buf_item_recover.c b/fs/xfs/xfs_buf_item_recover.c
> index 07ddf58209c3..c756b8e55fde 100644
> --- a/fs/xfs/xfs_buf_item_recover.c
> +++ b/fs/xfs/xfs_buf_item_recover.c
> @@ -32,6 +32,17 @@ xlog_buf_reorder_fn(
> return XLOG_REORDER_BUFFER_LIST;
> }
>
> +STATIC void
> +xlog_recover_buffer_ra_pass2(
> + struct xlog *log,
> + struct xlog_recover_item *item)
> +{
> + struct xfs_buf_log_format *buf_f = item->ri_buf[0].i_addr;
> +
> + xlog_buf_readahead(log, buf_f->blf_blkno, buf_f->blf_len, NULL);
> +}
> +
> const struct xlog_recover_item_type xlog_buf_item_type = {
> .reorder_fn = xlog_buf_reorder_fn,
> + .ra_pass2_fn = xlog_recover_buffer_ra_pass2,
> };
> diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c
> index 3bd5b6c7e235..2a05d1239423 100644
> --- a/fs/xfs/xfs_dquot_item.c
> +++ b/fs/xfs/xfs_dquot_item.c
> @@ -386,7 +386,41 @@ xfs_qm_qoff_logitem_init(
> return qf;
> }
>
> +STATIC void
> +xlog_recover_dquot_ra_pass2(
> + struct xlog *log,
> + struct xlog_recover_item *item)
> +{
> + struct xfs_mount *mp = log->l_mp;
> + struct xfs_disk_dquot *recddq;
> + struct xfs_dq_logformat *dq_f;
> + uint type;
> +
> + if (mp->m_qflags == 0)
> + return;
> +
> + recddq = item->ri_buf[1].i_addr;
> + if (recddq == NULL)
> + return;
> + if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot))
> + return;
> +
> + type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP);
> + ASSERT(type);
> + if (log->l_quotaoffs_flag & type)
> + return;
> +
> + dq_f = item->ri_buf[0].i_addr;
> + ASSERT(dq_f);
> + ASSERT(dq_f->qlf_len == 1);
> +
> + xlog_buf_readahead(log, dq_f->qlf_blkno,
> + XFS_FSB_TO_BB(mp, dq_f->qlf_len),
> + &xfs_dquot_buf_ra_ops);
> +}
> +
> const struct xlog_recover_item_type xlog_dquot_item_type = {
> + .ra_pass2_fn = xlog_recover_dquot_ra_pass2,
> };
>
> const struct xlog_recover_item_type xlog_quotaoff_item_type = {
> diff --git a/fs/xfs/xfs_inode_item_recover.c b/fs/xfs/xfs_inode_item_recover.c
> index 478f0a5c08ab..d97d8caa4652 100644
> --- a/fs/xfs/xfs_inode_item_recover.c
> +++ b/fs/xfs/xfs_inode_item_recover.c
> @@ -21,5 +21,24 @@
> #include "xfs_log_priv.h"
> #include "xfs_log_recover.h"
>
> +STATIC void
> +xlog_recover_inode_ra_pass2(
> + struct xlog *log,
> + struct xlog_recover_item *item)
> +{
> + if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) {
> + struct xfs_inode_log_format *ilfp = item->ri_buf[0].i_addr;
> +
> + xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len,
> + &xfs_inode_buf_ra_ops);
> + } else {
> + struct xfs_inode_log_format_32 *ilfp = item->ri_buf[0].i_addr;
> +
> + xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len,
> + &xfs_inode_buf_ra_ops);
> + }
> +}
> +
> const struct xlog_recover_item_type xlog_inode_item_type = {
> + .ra_pass2_fn = xlog_recover_inode_ra_pass2,
> };
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 8ab107680883..b61323cc5a11 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -2045,7 +2045,7 @@ xlog_put_buffer_cancelled(
> return true;
> }
>
> -static void
> +void
> xlog_buf_readahead(
> struct xlog *log,
> xfs_daddr_t blkno,
> @@ -3912,96 +3912,6 @@ xlog_recover_do_icreate_pass2(
> length, be32_to_cpu(icl->icl_gen));
> }
>
> -STATIC void
> -xlog_recover_buffer_ra_pass2(
> - struct xlog *log,
> - struct xlog_recover_item *item)
> -{
> - struct xfs_buf_log_format *buf_f = item->ri_buf[0].i_addr;
> -
> - xlog_buf_readahead(log, buf_f->blf_blkno, buf_f->blf_len, NULL);
> -}
> -
> -STATIC void
> -xlog_recover_inode_ra_pass2(
> - struct xlog *log,
> - struct xlog_recover_item *item)
> -{
> - if (item->ri_buf[0].i_len == sizeof(struct xfs_inode_log_format)) {
> - struct xfs_inode_log_format *ilfp = item->ri_buf[0].i_addr;
> -
> - xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len,
> - &xfs_inode_buf_ra_ops);
> - } else {
> - struct xfs_inode_log_format_32 *ilfp = item->ri_buf[0].i_addr;
> -
> - xlog_buf_readahead(log, ilfp->ilf_blkno, ilfp->ilf_len,
> - &xfs_inode_buf_ra_ops);
> - }
> -}
> -
> -STATIC void
> -xlog_recover_dquot_ra_pass2(
> - struct xlog *log,
> - struct xlog_recover_item *item)
> -{
> - struct xfs_mount *mp = log->l_mp;
> - struct xfs_disk_dquot *recddq;
> - struct xfs_dq_logformat *dq_f;
> - uint type;
> -
> - if (mp->m_qflags == 0)
> - return;
> -
> - recddq = item->ri_buf[1].i_addr;
> - if (recddq == NULL)
> - return;
> - if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot))
> - return;
> -
> - type = recddq->d_flags & (XFS_DQ_USER | XFS_DQ_PROJ | XFS_DQ_GROUP);
> - ASSERT(type);
> - if (log->l_quotaoffs_flag & type)
> - return;
> -
> - dq_f = item->ri_buf[0].i_addr;
> - ASSERT(dq_f);
> - ASSERT(dq_f->qlf_len == 1);
> -
> - xlog_buf_readahead(log, dq_f->qlf_blkno,
> - XFS_FSB_TO_BB(mp, dq_f->qlf_len),
> - &xfs_dquot_buf_ra_ops);
> -}
> -
> -STATIC void
> -xlog_recover_ra_pass2(
> - struct xlog *log,
> - struct xlog_recover_item *item)
> -{
> - switch (ITEM_TYPE(item)) {
> - case XFS_LI_BUF:
> - xlog_recover_buffer_ra_pass2(log, item);
> - break;
> - case XFS_LI_INODE:
> - xlog_recover_inode_ra_pass2(log, item);
> - break;
> - case XFS_LI_DQUOT:
> - xlog_recover_dquot_ra_pass2(log, item);
> - break;
> - case XFS_LI_EFI:
> - case XFS_LI_EFD:
> - case XFS_LI_QUOTAOFF:
> - case XFS_LI_RUI:
> - case XFS_LI_RUD:
> - case XFS_LI_CUI:
> - case XFS_LI_CUD:
> - case XFS_LI_BUI:
> - case XFS_LI_BUD:
> - default:
> - break;
> - }
> -}
> -
> STATIC int
> xlog_recover_commit_pass1(
> struct xlog *log,
> @@ -4138,7 +4048,8 @@ xlog_recover_commit_trans(
> error = xlog_recover_commit_pass1(log, trans, item);
> break;
> case XLOG_RECOVER_PASS2:
> - xlog_recover_ra_pass2(log, item);
> + if (item->ri_type && item->ri_type->ra_pass2_fn)
> + item->ri_type->ra_pass2_fn(log, item);
> list_move_tail(&item->ri_list, &ra_list);
> items_queued++;
> if (items_queued >= XLOG_RECOVER_COMMIT_QUEUE_MAX) {
>
>
--
chandan
next prev parent reply other threads:[~2020-05-01 12:07 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-30 0:47 [PATCH v2 00/21] xfs: refactor log recovery Darrick J. Wong
2020-04-30 0:47 ` [PATCH 01/21] xfs: refactor log recovery item sorting into a generic dispatch structure Darrick J. Wong
2020-04-30 5:53 ` Christoph Hellwig
2020-04-30 15:08 ` Darrick J. Wong
2020-04-30 18:16 ` Darrick J. Wong
2020-05-01 8:08 ` Christoph Hellwig
2020-05-01 10:40 ` Chandan Rajendra
2020-04-30 0:47 ` [PATCH 02/21] xfs: refactor log recovery item dispatch for pass2 readhead functions Darrick J. Wong
2020-05-01 12:10 ` Chandan Rajendra [this message]
2020-04-30 0:47 ` [PATCH 03/21] xfs: refactor log recovery item dispatch for pass1 commit functions Darrick J. Wong
2020-04-30 0:48 ` [PATCH 04/21] xfs: refactor log recovery buffer item dispatch for pass2 " Darrick J. Wong
2020-05-01 13:43 ` Chandan Rajendra
2020-04-30 0:48 ` [PATCH 05/21] xfs: refactor log recovery inode " Darrick J. Wong
2020-05-01 14:03 ` Chandan Rajendra
2020-04-30 0:48 ` [PATCH 06/21] xfs: refactor log recovery dquot " Darrick J. Wong
2020-05-01 14:14 ` Chandan Rajendra
2020-04-30 0:48 ` [PATCH 07/21] xfs: refactor log recovery icreate " Darrick J. Wong
2020-05-01 14:18 ` Chandan Rajendra
2020-04-30 0:48 ` [PATCH 08/21] xfs: remove log recovery quotaoff " Darrick J. Wong
2020-05-01 15:09 ` Chandan Rajendra
2020-05-01 17:41 ` Darrick J. Wong
2020-04-30 0:48 ` [PATCH 09/21] xfs: refactor log recovery EFI " Darrick J. Wong
2020-05-01 10:28 ` Christoph Hellwig
2020-05-01 17:56 ` Darrick J. Wong
2020-04-30 0:48 ` [PATCH 10/21] xfs: refactor log recovery RUI " Darrick J. Wong
2020-04-30 0:48 ` [PATCH 11/21] xfs: refactor log recovery CUI " Darrick J. Wong
2020-04-30 0:48 ` [PATCH 12/21] xfs: refactor log recovery BUI " Darrick J. Wong
2020-04-30 0:48 ` [PATCH 13/21] xfs: refactor recovered EFI log item playback Darrick J. Wong
2020-05-01 10:19 ` Christoph Hellwig
2020-05-01 17:58 ` Darrick J. Wong
2020-04-30 0:49 ` [PATCH 14/21] xfs: refactor recovered RUI " Darrick J. Wong
2020-04-30 0:49 ` [PATCH 15/21] xfs: refactor recovered CUI " Darrick J. Wong
2020-04-30 0:49 ` [PATCH 16/21] xfs: refactor recovered BUI " Darrick J. Wong
2020-04-30 0:49 ` [PATCH 17/21] xfs: refactor releasing finished intents during log recovery Darrick J. Wong
2020-04-30 0:49 ` [PATCH 18/21] xfs: refactor adding recovered intent items to the log Darrick J. Wong
2020-04-30 0:49 ` [PATCH 19/21] xfs: refactor intent item RECOVERED flag into the log item Darrick J. Wong
2020-04-30 0:49 ` [PATCH 20/21] xfs: refactor intent item iop_recover calls Darrick J. Wong
2020-04-30 0:49 ` [PATCH 21/21] xfs: remove unnecessary includes from xfs_log_recover.c Darrick J. Wong
2020-05-01 10:15 ` [PATCH v2 00/21] xfs: refactor log recovery Christoph Hellwig
2020-05-01 16:53 ` Darrick J. Wong
2020-05-01 17:03 ` 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=4890365.NoYZ9p2UQH@localhost.localdomain \
--to=chandan@linux.ibm.com \
--cc=darrick.wong@oracle.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;
as well as URLs for NNTP newsgroup(s).