From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2CBA38F82; Wed, 5 Feb 2025 19:20:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738783240; cv=none; b=t3wtrRRZpW0VXT6edZPTVwyyq2AfJ7m4K2B1QJ/EyDvGJknF5PUBvDwNHpPvPZex+9zCur3W//yklD2kqxY3hbyGn5EHTxOcuVOYKFDD9y/Tl5yfj4ynXBLG14lw7U7kwzG+++DXMrQtsijb8l9ShBRBRVGeN6hmESUTWwUkeo4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738783240; c=relaxed/simple; bh=FXPG38E+cOITfwQN1B7FhCwJ0s8mSHsbSHIGisi/d4k=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=EE14sK1r19AIx1rf/C6TQqAU+FBjyDZFl2gWdWZ8OxhBuY0kOYjk+1ViPVUh+yy0UN5KDDzQ+y4Bub3KukN7iJSND3qzKyU/kop2XcQICrQzSWg+EeboTdvhFM9IpmzzGSHC9gA8K5y6SJa65MnOfokWqSRcqg/OhhL7bSe4tP4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OSC15uXU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OSC15uXU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2121AC4CED1; Wed, 5 Feb 2025 19:20:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1738783240; bh=FXPG38E+cOITfwQN1B7FhCwJ0s8mSHsbSHIGisi/d4k=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=OSC15uXUxXy/aU+/7rLkK0yI6ApEEoMQOFVEraEwz2lAlGuXEA0j5jK5Qssix5s0s zM5LC18x7RGGbiiMroH2Lvuyw3l0X4W9NBt23vJAnQ6qEzmIrQMeLyh6GcFxEqcRc+ cbe/ZyZgqtqJv+JE0XnkRDNvcw993VfxTUUyFnUCyX2M4G/URdBksJBkqs5NEiHpqp qspao8+VQKVCHClPpcdAoOaU6c4l7oHBuT85iZbWv+V1vkNnDHVOGBqaFLmfOPBs3P dJZhfKKXyIY+HA1y4ta7EZv2RThTFaj/FTuSkUNSJpI9bmHtkhOwTdQRebDm53geA/ 7lIpw9dJHVgNA== Date: Wed, 5 Feb 2025 11:20:39 -0800 From: "Darrick J. Wong" To: John Garry Cc: brauner@kernel.org, cem@kernel.org, dchinner@redhat.com, hch@lst.de, linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ojaswin@linux.ibm.com, ritesh.list@gmail.com, martin.petersen@oracle.com Subject: Re: [PATCH RFC 10/10] xfs: Allow block allocator to take an alignment hint Message-ID: <20250205192039.GU21808@frogsfrogsfrogs> References: <20250204120127.2396727-1-john.g.garry@oracle.com> <20250204120127.2396727-11-john.g.garry@oracle.com> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250204120127.2396727-11-john.g.garry@oracle.com> On Tue, Feb 04, 2025 at 12:01:27PM +0000, John Garry wrote: > When issuing an atomic write by the CoW method, give the block allocator a > hint to naturally align the data blocks. > > This means that we have a better chance to issuing the atomic write via > HW offload next time. > > Signed-off-by: John Garry > --- > fs/xfs/libxfs/xfs_bmap.c | 7 ++++++- > fs/xfs/libxfs/xfs_bmap.h | 6 +++++- > fs/xfs/xfs_reflink.c | 8 ++++++-- > 3 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c > index 40ad22fb808b..7a3910018dee 100644 > --- a/fs/xfs/libxfs/xfs_bmap.c > +++ b/fs/xfs/libxfs/xfs_bmap.c > @@ -3454,6 +3454,12 @@ xfs_bmap_compute_alignments( > align = xfs_get_cowextsz_hint(ap->ip); > else if (ap->datatype & XFS_ALLOC_USERDATA) > align = xfs_get_extsz_hint(ap->ip); > + > + if (align > 1 && ap->flags & XFS_BMAPI_NALIGN) > + args->alignment = align; > + else > + args->alignment = 1; > + > if (align) { > if (xfs_bmap_extsize_align(mp, &ap->got, &ap->prev, align, 0, > ap->eof, 0, ap->conv, &ap->offset, > @@ -3781,7 +3787,6 @@ xfs_bmap_btalloc( > .wasdel = ap->wasdel, > .resv = XFS_AG_RESV_NONE, > .datatype = ap->datatype, > - .alignment = 1, > .minalignslop = 0, > }; > xfs_fileoff_t orig_offset; > diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h > index 4b721d935994..d68b594c3fa2 100644 > --- a/fs/xfs/libxfs/xfs_bmap.h > +++ b/fs/xfs/libxfs/xfs_bmap.h > @@ -87,6 +87,9 @@ struct xfs_bmalloca { > /* Do not update the rmap btree. Used for reconstructing bmbt from rmapbt. */ > #define XFS_BMAPI_NORMAP (1u << 10) > > +/* Try to naturally align allocations */ > +#define XFS_BMAPI_NALIGN (1u << 11) > + > #define XFS_BMAPI_FLAGS \ > { XFS_BMAPI_ENTIRE, "ENTIRE" }, \ > { XFS_BMAPI_METADATA, "METADATA" }, \ > @@ -98,7 +101,8 @@ struct xfs_bmalloca { > { XFS_BMAPI_REMAP, "REMAP" }, \ > { XFS_BMAPI_COWFORK, "COWFORK" }, \ > { XFS_BMAPI_NODISCARD, "NODISCARD" }, \ > - { XFS_BMAPI_NORMAP, "NORMAP" } > + { XFS_BMAPI_NORMAP, "NORMAP" },\ > + { XFS_BMAPI_NALIGN, "NALIGN" } Tihs isn't really "naturally" aligned, is it? It really means "try to align allocations to the extent size hint", which isn't required to be a power of two. --D > > > static inline int xfs_bmapi_aflag(int w) > diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c > index 60c986300faa..198fb5372f10 100644 > --- a/fs/xfs/xfs_reflink.c > +++ b/fs/xfs/xfs_reflink.c > @@ -445,6 +445,11 @@ xfs_reflink_fill_cow_hole( > int nimaps; > int error; > bool found; > + uint32_t bmapi_flags = XFS_BMAPI_COWFORK | > + XFS_BMAPI_PREALLOC; > + > + if (atomic) > + bmapi_flags |= XFS_BMAPI_NALIGN; > > resaligned = xfs_aligned_fsb_count(imap->br_startoff, > imap->br_blockcount, xfs_get_cowextsz_hint(ip)); > @@ -478,8 +483,7 @@ xfs_reflink_fill_cow_hole( > /* Allocate the entire reservation as unwritten blocks. */ > nimaps = 1; > error = xfs_bmapi_write(tp, ip, imap->br_startoff, imap->br_blockcount, > - XFS_BMAPI_COWFORK | XFS_BMAPI_PREALLOC, 0, cmap, > - &nimaps); > + bmapi_flags, 0, cmap, &nimaps); > if (error) > goto out_trans_cancel; > > -- > 2.31.1 > >