From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Gao Xiang <hsiangkao@redhat.com>
Cc: linux-xfs@vger.kernel.org, Brian Foster <bfoster@redhat.com>,
Dave Chinner <david@fromorbit.com>
Subject: Re: [PATCH v3.2] xfs: clean up calculation of LR header blocks
Date: Wed, 23 Sep 2020 09:32:57 -0700 [thread overview]
Message-ID: <20200923163257.GT7955@magnolia> (raw)
In-Reply-To: <20200922155316.31275-1-hsiangkao@redhat.com>
On Tue, Sep 22, 2020 at 11:53:16PM +0800, Gao Xiang wrote:
> Let's use DIV_ROUND_UP() to calculate log record header
> blocks as what did in xlog_get_iclog_buffer_size() and
> wrap up a common helper for log recovery.
>
> Reviewed-by: Brian Foster <bfoster@redhat.com>
> Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> changelog:
> - 'xlog_rec_header_t' => 'struct xlog_rec_header' to eliminate
> various structure typedefs (Brian).
>
> fs/xfs/xfs_log.c | 4 +---
> fs/xfs/xfs_log_recover.c | 49 ++++++++++++++--------------------------
> 2 files changed, 18 insertions(+), 35 deletions(-)
>
> diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
> index ad0c69ee8947..7a4ba408a3a2 100644
> --- a/fs/xfs/xfs_log.c
> +++ b/fs/xfs/xfs_log.c
> @@ -1604,9 +1604,7 @@ xlog_cksum(
> int i;
> int xheads;
>
> - xheads = size / XLOG_HEADER_CYCLE_SIZE;
> - if (size % XLOG_HEADER_CYCLE_SIZE)
> - xheads++;
> + xheads = DIV_ROUND_UP(size, XLOG_HEADER_CYCLE_SIZE);
>
> for (i = 1; i < xheads; i++) {
> crc = crc32c(crc, &xhdr[i].hic_xheader,
> diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
> index 782ec3eeab4d..12cde89c090b 100644
> --- a/fs/xfs/xfs_log_recover.c
> +++ b/fs/xfs/xfs_log_recover.c
> @@ -371,6 +371,19 @@ xlog_find_verify_cycle(
> return error;
> }
>
> +static inline int
> +xlog_logrec_hblks(struct xlog *log, struct xlog_rec_header *rh)
> +{
> + if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) {
> + int h_size = be32_to_cpu(rh->h_size);
> +
> + if ((be32_to_cpu(rh->h_version) & XLOG_VERSION_2) &&
> + h_size > XLOG_HEADER_CYCLE_SIZE)
> + return DIV_ROUND_UP(h_size, XLOG_HEADER_CYCLE_SIZE);
> + }
> + return 1;
> +}
> +
> /*
> * Potentially backup over partial log record write.
> *
> @@ -463,15 +476,7 @@ xlog_find_verify_log_record(
> * reset last_blk. Only when last_blk points in the middle of a log
> * record do we update last_blk.
> */
> - if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) {
> - uint h_size = be32_to_cpu(head->h_size);
> -
> - xhdrs = h_size / XLOG_HEADER_CYCLE_SIZE;
> - if (h_size % XLOG_HEADER_CYCLE_SIZE)
> - xhdrs++;
> - } else {
> - xhdrs = 1;
> - }
> + xhdrs = xlog_logrec_hblks(log, head);
>
> if (*last_blk - i + extra_bblks !=
> BTOBB(be32_to_cpu(head->h_len)) + xhdrs)
> @@ -1158,22 +1163,7 @@ xlog_check_unmount_rec(
> * below. We won't want to clear the unmount record if there is one, so
> * we pass the lsn of the unmount record rather than the block after it.
> */
> - if (xfs_sb_version_haslogv2(&log->l_mp->m_sb)) {
> - int h_size = be32_to_cpu(rhead->h_size);
> - int h_version = be32_to_cpu(rhead->h_version);
> -
> - if ((h_version & XLOG_VERSION_2) &&
> - (h_size > XLOG_HEADER_CYCLE_SIZE)) {
> - hblks = h_size / XLOG_HEADER_CYCLE_SIZE;
> - if (h_size % XLOG_HEADER_CYCLE_SIZE)
> - hblks++;
> - } else {
> - hblks = 1;
> - }
> - } else {
> - hblks = 1;
> - }
> -
> + hblks = xlog_logrec_hblks(log, rhead);
> after_umount_blk = xlog_wrap_logbno(log,
> rhead_blk + hblks + BTOBB(be32_to_cpu(rhead->h_len)));
>
> @@ -2989,15 +2979,10 @@ xlog_do_recovery_pass(
> if (error)
> goto bread_err1;
>
> - if ((be32_to_cpu(rhead->h_version) & XLOG_VERSION_2) &&
> - (h_size > XLOG_HEADER_CYCLE_SIZE)) {
> - hblks = h_size / XLOG_HEADER_CYCLE_SIZE;
> - if (h_size % XLOG_HEADER_CYCLE_SIZE)
> - hblks++;
> + hblks = xlog_logrec_hblks(log, rhead);
> + if (hblks != 1) {
> kmem_free(hbp);
> hbp = xlog_alloc_buffer(log, hblks);
> - } else {
> - hblks = 1;
> }
> } else {
> ASSERT(log->l_sectBBsize == 1);
> --
> 2.18.1
>
prev parent reply other threads:[~2020-09-23 16:33 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-17 5:13 [PATCH v2 0/2] xfs: random patches on log recovery Gao Xiang
2020-09-17 5:13 ` [PATCH v4 1/2] xfs: avoid LR buffer overrun due to crafted h_len Gao Xiang
2020-09-22 15:22 ` Brian Foster
2020-09-22 15:28 ` Gao Xiang
2020-09-23 16:35 ` Darrick J. Wong
2020-09-23 16:52 ` Gao Xiang
2020-09-17 5:13 ` [PATCH v3 2/2] xfs: clean up calculation of LR header blocks Gao Xiang
2020-09-22 15:22 ` Brian Foster
2020-09-22 15:32 ` Gao Xiang
2020-09-22 15:53 ` [PATCH v3.2] " Gao Xiang
2020-09-23 16:32 ` Darrick J. Wong [this message]
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=20200923163257.GT7955@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=david@fromorbit.com \
--cc=hsiangkao@redhat.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