From: Allison Collins <allison.henderson@oracle.com>
To: "Darrick J. Wong" <darrick.wong@oracle.com>, sandeen@sandeen.net
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH 6/9] libfrog: create online fs geometry converters
Date: Fri, 30 Aug 2019 22:11:32 -0700 [thread overview]
Message-ID: <78fe4231-da82-1bfa-62a6-b8827e73d5be@oracle.com> (raw)
In-Reply-To: <156713886338.386621.8386764562465509319.stgit@magnolia>
On 8/29/19 9:21 PM, Darrick J. Wong wrote:
> From: Darrick J. Wong <darrick.wong@oracle.com>
>
> Create helper functions to perform unit conversions against a runtime
> filesystem, then remove the open-coded versions in scrub.
>
> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Looks good. I think the helpers make the logic more readable.
Reviewed-by: Allison Collins <allison.henderson@oracle.com>
> ---
> include/xfrog.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> libfrog/fsgeom.c | 1 +
> scrub/fscounters.c | 4 ++--
> scrub/inodes.c | 4 ++--
> scrub/phase3.c | 6 +++--
> scrub/phase5.c | 4 ++--
> scrub/phase6.c | 3 ++-
> scrub/phase7.c | 6 +++--
> 8 files changed, 72 insertions(+), 13 deletions(-)
>
>
> diff --git a/include/xfrog.h b/include/xfrog.h
> index 008cc155..a08f6464 100644
> --- a/include/xfrog.h
> +++ b/include/xfrog.h
> @@ -42,6 +42,9 @@ struct xfs_fd {
>
> /* log2 of sb_inopblock */
> unsigned int inopblog;
> +
> + /* bits for agino in inum */
> + unsigned int aginolog;
> };
>
> /* Static initializers */
> @@ -51,4 +54,58 @@ struct xfs_fd {
> int xfd_prepare_geometry(struct xfs_fd *xfd);
> int xfd_close(struct xfs_fd *xfd);
>
> +/* Convert AG number and AG inode number into fs inode number. */
> +static inline uint64_t
> +cvt_agino_to_ino(
> + const struct xfs_fd *xfd,
> + uint32_t agno,
> + uint32_t agino)
> +{
> + return ((uint64_t)agno << xfd->aginolog) + agino;
> +}
> +
> +/* Convert fs inode number into AG number. */
> +static inline uint32_t
> +cvt_ino_to_agno(
> + const struct xfs_fd *xfd,
> + uint64_t ino)
> +{
> + return ino >> xfd->aginolog;
> +}
> +
> +/* Convert fs inode number into AG inode number. */
> +static inline uint32_t
> +cvt_ino_to_agino(
> + const struct xfs_fd *xfd,
> + uint64_t ino)
> +{
> + return ino & ((1ULL << xfd->aginolog) - 1);
> +}
> +
> +/*
> + * Convert a linear fs block offset number into bytes. This is the runtime
> + * equivalent of XFS_FSB_TO_B, which means that it is /not/ for segmented fsbno
> + * format (= agno | agbno) that we use internally for the data device.
> + */
> +static inline uint64_t
> +cvt_off_fsb_to_b(
> + const struct xfs_fd *xfd,
> + uint64_t fsb)
> +{
> + return fsb << xfd->blocklog;
> +}
> +
> +/*
> + * Convert bytes into a (rounded down) linear fs block offset number. This is
> + * the runtime equivalent of XFS_B_TO_FSBT. It does not produce segmented
> + * fsbno numbers (= agno | agbno).
> + */
> +static inline uint64_t
> +cvt_b_to_off_fsbt(
> + const struct xfs_fd *xfd,
> + uint64_t bytes)
> +{
> + return bytes >> xfd->blocklog;
> +}
> +
> #endif /* __XFROG_H__ */
> diff --git a/libfrog/fsgeom.c b/libfrog/fsgeom.c
> index b8873598..cf9323c1 100644
> --- a/libfrog/fsgeom.c
> +++ b/libfrog/fsgeom.c
> @@ -113,6 +113,7 @@ xfd_prepare_geometry(
> xfd->blocklog = highbit32(xfd->fsgeom.blocksize);
> xfd->inodelog = highbit32(xfd->fsgeom.inodesize);
> xfd->inopblog = xfd->blocklog - xfd->inodelog;
> + xfd->aginolog = xfd->agblklog + xfd->inopblog;
> return 0;
> }
>
> diff --git a/scrub/fscounters.c b/scrub/fscounters.c
> index ac898764..ea6af156 100644
> --- a/scrub/fscounters.c
> +++ b/scrub/fscounters.c
> @@ -91,8 +91,8 @@ xfs_count_ag_inodes(
> minor(ctx->fsinfo.fs_datadev),
> agno);
>
> - ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog);
> - next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog);
> + ag_ino = cvt_agino_to_ino(&ctx->mnt, agno, 0);
> + next_ag_ino = cvt_agino_to_ino(&ctx->mnt, agno + 1, 0);
>
> moveon = xfs_count_inodes_range(ctx, descr, ag_ino, next_ag_ino - 1,
> &ci->counters[agno]);
> diff --git a/scrub/inodes.c b/scrub/inodes.c
> index 873ad425..700e5200 100644
> --- a/scrub/inodes.c
> +++ b/scrub/inodes.c
> @@ -228,8 +228,8 @@ xfs_scan_ag_inodes(
> minor(ctx->fsinfo.fs_datadev),
> agno);
>
> - ag_ino = (__u64)agno << (ctx->mnt.inopblog + ctx->mnt.agblklog);
> - next_ag_ino = (__u64)(agno + 1) << (ctx->mnt.inopblog + ctx->mnt.agblklog);
> + ag_ino = cvt_agino_to_ino(&ctx->mnt, agno, 0);
> + next_ag_ino = cvt_agino_to_ino(&ctx->mnt, agno + 1, 0);
>
> moveon = xfs_iterate_inodes_range(ctx, descr, ctx->fshandle, ag_ino,
> next_ag_ino - 1, si->fn, si->arg);
> diff --git a/scrub/phase3.c b/scrub/phase3.c
> index 579e08c3..8c02f1cb 100644
> --- a/scrub/phase3.c
> +++ b/scrub/phase3.c
> @@ -52,8 +52,8 @@ xfs_scrub_inode_vfs_error(
> xfs_agino_t agino;
> int old_errno = errno;
>
> - agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
> - agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
> + agno = cvt_ino_to_agno(&ctx->mnt, bstat->bs_ino);
> + agino = cvt_ino_to_agino(&ctx->mnt, bstat->bs_ino);
> snprintf(descr, DESCR_BUFSZ, _("inode %"PRIu64" (%u/%u)"),
> (uint64_t)bstat->bs_ino, agno, agino);
> errno = old_errno;
> @@ -77,7 +77,7 @@ xfs_scrub_inode(
> int error;
>
> xfs_action_list_init(&alist);
> - agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
> + agno = cvt_ino_to_agno(&ctx->mnt, bstat->bs_ino);
> background_sleep();
>
> /* Try to open the inode to pin it. */
> diff --git a/scrub/phase5.c b/scrub/phase5.c
> index 36ec27b3..f3ee22e6 100644
> --- a/scrub/phase5.c
> +++ b/scrub/phase5.c
> @@ -239,8 +239,8 @@ xfs_scrub_connections(
> int fd = -1;
> int error;
>
> - agno = bstat->bs_ino / (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
> - agino = bstat->bs_ino % (1ULL << (ctx->mnt.inopblog + ctx->mnt.agblklog));
> + agno = cvt_ino_to_agno(&ctx->mnt, bstat->bs_ino);
> + agino = cvt_ino_to_agino(&ctx->mnt, bstat->bs_ino);
> snprintf(descr, DESCR_BUFSZ, _("inode %"PRIu64" (%u/%u)"),
> (uint64_t)bstat->bs_ino, agno, agino);
> background_sleep();
> diff --git a/scrub/phase6.c b/scrub/phase6.c
> index 48971270..5628b926 100644
> --- a/scrub/phase6.c
> +++ b/scrub/phase6.c
> @@ -547,7 +547,8 @@ xfs_estimate_verify_work(
> if (!moveon)
> return moveon;
>
> - *items = ((d_blocks - d_bfree) + (r_blocks - r_bfree)) << ctx->mnt.blocklog;
> + *items = cvt_off_fsb_to_b(&ctx->mnt,
> + (d_blocks - d_bfree) + (r_blocks - r_bfree));
> *nr_threads = disk_heads(ctx->datadev);
> *rshift = 20;
> return moveon;
> diff --git a/scrub/phase7.c b/scrub/phase7.c
> index 41a77356..8a028e19 100644
> --- a/scrub/phase7.c
> +++ b/scrub/phase7.c
> @@ -148,11 +148,11 @@ xfs_scan_summary(
> * filesystem treats them as "free", but since we scanned
> * them, we'll consider them used.
> */
> - d_bfree -= totalcount.agbytes >> ctx->mnt.blocklog;
> + d_bfree -= cvt_b_to_off_fsbt(&ctx->mnt, totalcount.agbytes);
>
> /* Report on what we found. */
> - used_data = (d_blocks - d_bfree) << ctx->mnt.blocklog;
> - used_rt = (r_blocks - r_bfree) << ctx->mnt.blocklog;
> + used_data = cvt_off_fsb_to_b(&ctx->mnt, d_blocks - d_bfree);
> + used_rt = cvt_off_fsb_to_b(&ctx->mnt, r_blocks - r_bfree);
> used_files = f_files - f_free;
> stat_data = totalcount.dbytes;
> stat_rt = totalcount.rbytes;
>
next prev parent reply other threads:[~2019-08-31 5:11 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-30 4:20 [PATCH v2 0/9] libxfrog: wrap version ioctl calls Darrick J. Wong
2019-08-30 4:20 ` [PATCH 1/9] libxfs: revert FSGEOMETRY v5 -> v4 hack Darrick J. Wong
2019-08-30 21:03 ` Allison Collins
2019-09-02 22:49 ` Dave Chinner
2019-09-03 6:14 ` Christoph Hellwig
2019-08-30 4:20 ` [PATCH 2/9] xfsprogs: update spdx tags in LICENSES/ Darrick J. Wong
2019-08-30 21:03 ` Allison Collins
2019-08-30 4:20 ` [PATCH 3/9] libfrog: refactor online geometry queries Darrick J. Wong
2019-08-30 21:03 ` Allison Collins
2019-09-03 22:51 ` Dave Chinner
2019-08-30 4:20 ` [PATCH 4/9] libfrog: introduce xfs_fd to wrap an fd to a file on an xfs filesystem Darrick J. Wong
2019-08-30 23:29 ` Allison Collins
2019-08-30 23:31 ` Darrick J. Wong
2019-09-03 22:53 ` Dave Chinner
2019-08-30 4:20 ` [PATCH 5/9] libfrog: store more inode and block geometry in struct xfs_fd Darrick J. Wong
2019-08-31 0:37 ` Allison Collins
2019-08-30 4:21 ` [PATCH 6/9] libfrog: create online fs geometry converters Darrick J. Wong
2019-08-31 5:11 ` Allison Collins [this message]
2019-09-03 22:55 ` Dave Chinner
2019-08-30 4:21 ` [PATCH 7/9] libfrog: refactor open-coded bulkstat calls Darrick J. Wong
2019-08-30 23:26 ` Darrick J. Wong
2019-08-31 0:42 ` [PATCH v2 " Darrick J. Wong
2019-09-03 22:57 ` Dave Chinner
2019-09-01 20:55 ` [PATCH " Allison Collins
2019-09-01 21:05 ` Darrick J. Wong
2019-08-30 4:21 ` [PATCH 8/9] libfrog: create xfd_open function Darrick J. Wong
2019-09-01 20:55 ` Allison Collins
2019-09-03 23:01 ` Dave Chinner
2019-09-03 23:37 ` Darrick J. Wong
2019-08-30 4:21 ` [PATCH 9/9] libfrog: refactor open-coded INUMBERS calls Darrick J. Wong
2019-09-01 20:55 ` Allison Collins
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=78fe4231-da82-1bfa-62a6-b8827e73d5be@oracle.com \
--to=allison.henderson@oracle.com \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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).