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

Commit 8cf037a8 authored by Dan Williams's avatar Dan Williams
Browse files

ext2: 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.

Cc: "Theodore Ts'o" <tytso@mit.edu>
Cc: Andreas Dilger <adilger.kernel@dilger.ca>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 486aff5e

fs/ext2/ext2.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -114,6 +114,7 @@ struct ext2_sb_info { 
	 */

	 */

	spinlock_t s_lock;

	spinlock_t s_lock;

	struct mb_cache *s_ea_block_cache;

	struct mb_cache *s_ea_block_cache;

	struct dax_device *s_daxdev;

};

};





static inline spinlock_t *

static inline spinlock_t *

fs/ext2/inode.c

+3 −8
Original line number Original line Diff line number Diff line
@@ -800,10 +800,10 @@ int ext2_get_block(struct inode *inode, sector_t iblock, 
static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length,

		unsigned flags, struct iomap *iomap)

		unsigned flags, struct iomap *iomap)

{

{

	struct block_device *bdev;

	unsigned int blkbits = inode->i_blkbits;

	unsigned int blkbits = inode->i_blkbits;

	unsigned long first_block = offset >> blkbits;

	unsigned long first_block = offset >> blkbits;

	unsigned long max_blocks = (length + (1 << blkbits) - 1) >> blkbits;

	unsigned long max_blocks = (length + (1 << blkbits) - 1) >> blkbits;

	struct ext2_sb_info *sbi = EXT2_SB(inode->i_sb);

	bool new = false, boundary = false;

	bool new = false, boundary = false;

	u32 bno;

	u32 bno;

	int ret;

	int ret;
@@ -814,13 +814,9 @@ static int ext2_iomap_begin(struct inode *inode, loff_t offset, loff_t length, 
		return ret;

		return ret;





	iomap->flags = 0;

	iomap->flags = 0;

	bdev = inode->i_sb->s_bdev;

	iomap->bdev = inode->i_sb->s_bdev;

	iomap->bdev = bdev;

	iomap->offset = (u64)first_block << blkbits;

	iomap->offset = (u64)first_block << blkbits;

	if (blk_queue_dax(bdev->bd_queue))

	iomap->dax_dev = sbi->s_daxdev;

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

	else

		iomap->dax_dev = NULL;





	if (ret == 0) {

	if (ret == 0) {

		iomap->type = IOMAP_HOLE;

		iomap->type = IOMAP_HOLE;
@@ -842,7 +838,6 @@ static int 
ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length,

ext2_iomap_end(struct inode *inode, loff_t offset, loff_t length,

		ssize_t written, unsigned flags, struct iomap *iomap)

		ssize_t written, unsigned flags, struct iomap *iomap)

{

{

	fs_put_dax(iomap->dax_dev);

	if (iomap->type == IOMAP_MAPPED &&

	if (iomap->type == IOMAP_MAPPED &&

	    written < length &&

	    written < length &&

	    (flags & IOMAP_WRITE))

	    (flags & IOMAP_WRITE))

fs/ext2/super.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -171,6 +171,7 @@ static void ext2_put_super (struct super_block * sb) 
	brelse (sbi->s_sbh);

	brelse (sbi->s_sbh);

	sb->s_fs_info = NULL;

	sb->s_fs_info = NULL;

	kfree(sbi->s_blockgroup_lock);

	kfree(sbi->s_blockgroup_lock);

	fs_put_dax(sbi->s_daxdev);

	kfree(sbi);

	kfree(sbi);

}

}
@@ -813,6 +814,7 @@ static unsigned long descriptor_loc(struct super_block *sb, 




static int ext2_fill_super(struct super_block *sb, void *data, int silent)

static int ext2_fill_super(struct super_block *sb, void *data, int silent)

{

{

	struct dax_device *dax_dev = fs_dax_get_by_bdev(sb->s_bdev);

	struct buffer_head * bh;

	struct buffer_head * bh;

	struct ext2_sb_info * sbi;

	struct ext2_sb_info * sbi;

	struct ext2_super_block * es;

	struct ext2_super_block * es;
@@ -842,6 +844,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	}

	}

	sb->s_fs_info = sbi;

	sb->s_fs_info = sbi;

	sbi->s_sb_block = sb_block;

	sbi->s_sb_block = sb_block;

	sbi->s_daxdev = dax_dev;





	spin_lock_init(&sbi->s_lock);

	spin_lock_init(&sbi->s_lock);
@@ -1200,6 +1203,7 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) 
	kfree(sbi->s_blockgroup_lock);

	kfree(sbi->s_blockgroup_lock);

	kfree(sbi);

	kfree(sbi);

failed:

failed:

	fs_put_dax(dax_dev);

	return ret;

	return ret;

}

}