Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 486aff5e authored by Dan Williams's avatar Dan Williams
Browse files

xfs: perform dax_device lookup at mount 



The ->iomap_begin() operation is a hot path, so cache the
fs_dax_get_by_host() result at mount time to avoid the incurring the
hash lookup overhead on a per-i/o basis.

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 78f35473

fs/xfs/xfs_aops.c

+13 −0
Original line number Diff line number Diff line
@@ -80,6 +80,19 @@ xfs_find_bdev_for_inode( 
		return mp->m_ddev_targp->bt_bdev;

}



struct dax_device *

xfs_find_daxdev_for_inode(

	struct inode		*inode)

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;



	if (XFS_IS_REALTIME_INODE(ip))

		return mp->m_rtdev_targp->bt_daxdev;

	else

		return mp->m_ddev_targp->bt_daxdev;

}



/*

 * We're now finished for good with this page.  Update the page state via the

 * associated buffer_heads, paying attention to the start and end offsets that

fs/xfs/xfs_aops.h

+1 −0
Original line number Diff line number Diff line
@@ -59,5 +59,6 @@ int xfs_setfilesize(struct xfs_inode *ip, xfs_off_t offset, size_t size); 


extern void xfs_count_page_state(struct page *, int *, int *);

extern struct block_device *xfs_find_bdev_for_inode(struct inode *);

extern struct dax_device *xfs_find_daxdev_for_inode(struct inode *);



#endif /* __XFS_AOPS_H__ */

fs/xfs/xfs_buf.c

+3 −1
Original line number Diff line number Diff line
@@ -1802,7 +1802,8 @@ xfs_setsize_buftarg_early( 
xfs_buftarg_t *

xfs_alloc_buftarg(

	struct xfs_mount	*mp,

	struct block_device	*bdev)

	struct block_device	*bdev,

	struct dax_device	*dax_dev)

{

	xfs_buftarg_t		*btp;
@@ -1811,6 +1812,7 @@ xfs_alloc_buftarg( 
	btp->bt_mount = mp;

	btp->bt_dev =  bdev->bd_dev;

	btp->bt_bdev = bdev;

	btp->bt_daxdev = dax_dev;



	if (xfs_setsize_buftarg_early(btp, bdev))

		goto error;

fs/xfs/xfs_buf.h

+2 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ typedef unsigned int xfs_buf_flags_t; 
typedef struct xfs_buftarg {

	dev_t			bt_dev;

	struct block_device	*bt_bdev;

	struct dax_device	*bt_daxdev;

	struct xfs_mount	*bt_mount;

	unsigned int		bt_meta_sectorsize;

	size_t			bt_meta_sectormask;
@@ -385,7 +386,7 @@ xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset) 
 *	Handling of buftargs.

 */

extern xfs_buftarg_t *xfs_alloc_buftarg(struct xfs_mount *,

			struct block_device *);

			struct block_device *, struct dax_device *);

extern void xfs_free_buftarg(struct xfs_mount *, struct xfs_buftarg *);

extern void xfs_wait_buftarg(xfs_buftarg_t *);

extern int xfs_setsize_buftarg(xfs_buftarg_t *, unsigned int);

fs/xfs/xfs_iomap.c

+1 −9
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ xfs_bmbt_to_iomap( 
	iomap->offset = XFS_FSB_TO_B(mp, imap->br_startoff);

	iomap->length = XFS_FSB_TO_B(mp, imap->br_blockcount);

	iomap->bdev = xfs_find_bdev_for_inode(VFS_I(ip));

	iomap->dax_dev = xfs_find_daxdev_for_inode(VFS_I(ip));

}



xfs_extlen_t
@@ -976,7 +977,6 @@ xfs_file_iomap_begin( 
	int			nimaps = 1, error = 0;

	bool			shared = false, trimmed = false;

	unsigned		lockmode;

	struct block_device	*bdev;



	if (XFS_FORCED_SHUTDOWN(mp))

		return -EIO;
@@ -1087,13 +1087,6 @@ xfs_file_iomap_begin( 


	xfs_bmbt_to_iomap(ip, iomap, &imap);



	/* optionally associate a dax device with the iomap bdev */

	bdev = iomap->bdev;

	if (blk_queue_dax(bdev->bd_queue))

		iomap->dax_dev = fs_dax_get_by_host(bdev->bd_disk->disk_name);

	else

		iomap->dax_dev = NULL;



	if (shared)

		iomap->flags |= IOMAP_F_SHARED;

	return 0;
@@ -1171,7 +1164,6 @@ xfs_file_iomap_end( 
	unsigned		flags,

	struct iomap		*iomap)

{

	fs_put_dax(iomap->dax_dev);

	if ((flags & IOMAP_WRITE) && iomap->type == IOMAP_DELALLOC)

		return xfs_file_iomap_end_delalloc(XFS_I(inode), offset,

				length, written, iomap);