Commit 7df7c204 authored by Pankaj Raghav's avatar Pankaj Raghav Committed by Christian Brauner
Browse files

xfs: enable block size larger than page size support 



Page cache now has the ability to have a minimum order when allocating
a folio which is a prerequisite to add support for block size > page
size.

Signed-off-by: default avatarPankaj Raghav <p.raghav@samsung.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20240827-xfs-fix-wformat-bs-gt-ps-v1-1-aec6717609e0@kernel.org # fix folded
Link: https://lore.kernel.org/r/20240822135018.1931258-11-kernel@pankajraghav.com


Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent cebf9dac

fs/xfs/libxfs/xfs_ialloc.c

+5 −0
Original line number Diff line number Diff line
@@ -3033,6 +3033,11 @@ xfs_ialloc_setup_geometry( 
		igeo->ialloc_align = mp->m_dalign;

	else

		igeo->ialloc_align = 0;



	if (mp->m_sb.sb_blocksize > PAGE_SIZE)

		igeo->min_folio_order = mp->m_sb.sb_blocklog - PAGE_SHIFT;

	else

		igeo->min_folio_order = 0;

}



/* Compute the location of the root directory inode that is laid out by mkfs. */

fs/xfs/libxfs/xfs_shared.h

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,9 @@ struct xfs_ino_geometry { 
	/* precomputed value for di_flags2 */

	uint64_t	new_diflags2;



	/* minimum folio order of a page cache allocation */

	unsigned int	min_folio_order;



};



#endif /* __XFS_SHARED_H__ */

fs/xfs/xfs_icache.c

+4 −2
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ xfs_inode_alloc( 


	/* VFS doesn't initialise i_mode! */

	VFS_I(ip)->i_mode = 0;

	mapping_set_large_folios(VFS_I(ip)->i_mapping);

	mapping_set_folio_min_order(VFS_I(ip)->i_mapping,

				    M_IGEO(mp)->min_folio_order);



	XFS_STATS_INC(mp, vn_active);

	ASSERT(atomic_read(&ip->i_pincount) == 0);
@@ -325,7 +326,8 @@ xfs_reinit_inode( 
	inode->i_uid = uid;

	inode->i_gid = gid;

	inode->i_state = state;

	mapping_set_large_folios(inode->i_mapping);

	mapping_set_folio_min_order(inode->i_mapping,

				    M_IGEO(mp)->min_folio_order);

	return error;

}

fs/xfs/xfs_mount.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ xfs_sb_validate_fsb_count( 
{

	uint64_t		max_bytes;



	ASSERT(PAGE_SHIFT >= sbp->sb_blocklog);

	ASSERT(sbp->sb_blocklog >= BBSHIFT);



	if (check_shl_overflow(nblocks, sbp->sb_blocklog, &max_bytes))

fs/xfs/xfs_super.c

+20 −8
Original line number Diff line number Diff line
@@ -1638,18 +1638,30 @@ xfs_fs_fill_super( 
		goto out_free_sb;

	}



	/*

	 * Until this is fixed only page-sized or smaller data blocks work.

	 */

	if (mp->m_sb.sb_blocksize > PAGE_SIZE) {

		size_t max_folio_size = mapping_max_folio_size_supported();



		if (!xfs_has_crc(mp)) {

			xfs_warn(mp,

		"File system with blocksize %d bytes. "

		"Only pagesize (%ld) or less will currently work.",

"V4 Filesystem with blocksize %d bytes. Only pagesize (%ld) or less is supported.",

				mp->m_sb.sb_blocksize, PAGE_SIZE);

			error = -ENOSYS;

			goto out_free_sb;

		}



		if (mp->m_sb.sb_blocksize > max_folio_size) {

			xfs_warn(mp,

"block size (%u bytes) not supported; Only block size (%zu) or less is supported",

				mp->m_sb.sb_blocksize, max_folio_size);

			error = -ENOSYS;

			goto out_free_sb;

		}



		xfs_warn(mp,

"EXPERIMENTAL: V5 Filesystem with Large Block Size (%d bytes) enabled.",

			mp->m_sb.sb_blocksize);

	}



	/* Ensure this filesystem fits in the page cache limits */

	if (xfs_sb_validate_fsb_count(&mp->m_sb, mp->m_sb.sb_dblocks) ||

	    xfs_sb_validate_fsb_count(&mp->m_sb, mp->m_sb.sb_rblocks)) {