From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Chandan Babu R <chandanrlinux@gmail.com>
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com,
hch@infradead.org, allison.henderson@oracle.com
Subject: Re: [PATCH V9 12/14] xfs: Compute bmap extent alignments in a separate function
Date: Mon, 2 Nov 2020 09:05:28 -0800 [thread overview]
Message-ID: <20201102170528.GC7123@magnolia> (raw)
In-Reply-To: <20201102095048.100956-13-chandanrlinux@gmail.com>
On Mon, Nov 02, 2020 at 03:20:46PM +0530, Chandan Babu R wrote:
> This commit moves over the code which computes stripe alignment and
> extent size hint alignment into a separate function. Apart from
> xfs_bmap_btalloc(), the new function will be used by another function
> introduced in a future commit.
>
> Signed-off-by: Chandan Babu R <chandanrlinux@gmail.com>
> ---
> fs/xfs/libxfs/xfs_bmap.c | 88 +++++++++++++++++++++++-----------------
> 1 file changed, 51 insertions(+), 37 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 64c4d0e384a5..935f2d506748 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3463,13 +3463,58 @@ xfs_bmap_btalloc_accounting(
> args->len);
> }
>
> +static void
> +xfs_bmap_compute_alignments(
> + struct xfs_bmalloca *ap,
> + struct xfs_alloc_arg *args,
> + int *stripe_align)
Uh were you going to change this to return stripe_align?
--D
> +{
> + struct xfs_mount *mp = args->mp;
> + xfs_extlen_t align = 0; /* minimum allocation alignment */
> + int error;
> +
> + /* stripe alignment for allocation is determined by mount parameters */
> + *stripe_align = 0;
> + if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC))
> + *stripe_align = mp->m_swidth;
> + else if (mp->m_dalign)
> + *stripe_align = mp->m_dalign;
> +
> + if (ap->flags & XFS_BMAPI_COWFORK)
> + align = xfs_get_cowextsz_hint(ap->ip);
> + else if (ap->datatype & XFS_ALLOC_USERDATA)
> + align = xfs_get_extsz_hint(ap->ip);
> + if (align) {
> + error = xfs_bmap_extsize_align(mp, &ap->got, &ap->prev,
> + align, 0, ap->eof, 0, ap->conv,
> + &ap->offset, &ap->length);
> + ASSERT(!error);
> + ASSERT(ap->length);
> + }
> +
> + /* apply extent size hints if obtained earlier */
> + if (align) {
> + args->prod = align;
> + div_u64_rem(ap->offset, args->prod, &args->mod);
> + if (args->mod)
> + args->mod = args->prod - args->mod;
> + } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) {
> + args->prod = 1;
> + args->mod = 0;
> + } else {
> + args->prod = PAGE_SIZE >> mp->m_sb.sb_blocklog;
> + div_u64_rem(ap->offset, args->prod, &args->mod);
> + if (args->mod)
> + args->mod = args->prod - args->mod;
> + }
> +}
> +
> STATIC int
> xfs_bmap_btalloc(
> struct xfs_bmalloca *ap) /* bmap alloc argument struct */
> {
> xfs_mount_t *mp; /* mount point structure */
> xfs_alloctype_t atype = 0; /* type for allocation routines */
> - xfs_extlen_t align = 0; /* minimum allocation alignment */
> xfs_agnumber_t fb_agno; /* ag number of ap->firstblock */
> xfs_agnumber_t ag;
> xfs_alloc_arg_t args;
> @@ -3489,25 +3534,11 @@ xfs_bmap_btalloc(
>
> mp = ap->ip->i_mount;
>
> - /* stripe alignment for allocation is determined by mount parameters */
> - stripe_align = 0;
> - if (mp->m_swidth && (mp->m_flags & XFS_MOUNT_SWALLOC))
> - stripe_align = mp->m_swidth;
> - else if (mp->m_dalign)
> - stripe_align = mp->m_dalign;
> -
> - if (ap->flags & XFS_BMAPI_COWFORK)
> - align = xfs_get_cowextsz_hint(ap->ip);
> - else if (ap->datatype & XFS_ALLOC_USERDATA)
> - align = xfs_get_extsz_hint(ap->ip);
> - if (align) {
> - error = xfs_bmap_extsize_align(mp, &ap->got, &ap->prev,
> - align, 0, ap->eof, 0, ap->conv,
> - &ap->offset, &ap->length);
> - ASSERT(!error);
> - ASSERT(ap->length);
> - }
> + memset(&args, 0, sizeof(args));
> + args.tp = ap->tp;
> + args.mp = mp;
>
> + xfs_bmap_compute_alignments(ap, &args, &stripe_align);
>
> nullfb = ap->tp->t_firstblock == NULLFSBLOCK;
> fb_agno = nullfb ? NULLAGNUMBER : XFS_FSB_TO_AGNO(mp,
> @@ -3538,9 +3569,6 @@ xfs_bmap_btalloc(
> * Normal allocation, done through xfs_alloc_vextent.
> */
> tryagain = isaligned = 0;
> - memset(&args, 0, sizeof(args));
> - args.tp = ap->tp;
> - args.mp = mp;
> args.fsbno = ap->blkno;
> args.oinfo = XFS_RMAP_OINFO_SKIP_UPDATE;
>
> @@ -3571,21 +3599,7 @@ xfs_bmap_btalloc(
> args.total = ap->total;
> args.minlen = ap->minlen;
> }
> - /* apply extent size hints if obtained earlier */
> - if (align) {
> - args.prod = align;
> - div_u64_rem(ap->offset, args.prod, &args.mod);
> - if (args.mod)
> - args.mod = args.prod - args.mod;
> - } else if (mp->m_sb.sb_blocksize >= PAGE_SIZE) {
> - args.prod = 1;
> - args.mod = 0;
> - } else {
> - args.prod = PAGE_SIZE >> mp->m_sb.sb_blocklog;
> - div_u64_rem(ap->offset, args.prod, &args.mod);
> - if (args.mod)
> - args.mod = args.prod - args.mod;
> - }
> +
> /*
> * If we are not low on available data blocks, and the underlying
> * logical volume manager is a stripe, and the file offset is zero then
> --
> 2.28.0
>
next prev parent reply other threads:[~2020-11-02 17:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 9:50 [PATCH V9 00/14] Bail out if transaction can cause extent count to overflow Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 01/14] xfs: Add helper for checking per-inode extent count overflow Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 02/14] xfs: Check for extent overflow when trivally adding a new extent Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 03/14] xfs: Check for extent overflow when punching a hole Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 04/14] xfs: Check for extent overflow when adding/removing xattrs Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 05/14] xfs: Check for extent overflow when adding/removing dir entries Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 06/14] xfs: Check for extent overflow when writing to unwritten extent Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 07/14] xfs: Check for extent overflow when moving extent from cow to data fork Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 08/14] xfs: Check for extent overflow when remapping an extent Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 09/14] xfs: Check for extent overflow when swapping extents Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 10/14] xfs: Introduce error injection to reduce maximum inode fork extent count Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 11/14] xfs: Remove duplicate assert statement in xfs_bmap_btalloc() Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 12/14] xfs: Compute bmap extent alignments in a separate function Chandan Babu R
2020-11-02 17:05 ` Darrick J. Wong [this message]
2020-11-03 3:56 ` Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 13/14] xfs: Process allocated extent " Chandan Babu R
2020-11-02 9:50 ` [PATCH V9 14/14] xfs: Introduce error injection to allocate only minlen size extents for files Chandan Babu R
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=20201102170528.GC7123@magnolia \
--to=darrick.wong@oracle.com \
--cc=allison.henderson@oracle.com \
--cc=chandanrlinux@gmail.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--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