implement metadata_ra in btrfs
Subsystems (4)
RFC 4/5 implement metadata_ra in btrfs
Implementation btrfs .metadata_readahead. In btrfs, all metadata pages are in a special btree_inode. We do readahead in it.
--- fs/btrfs/disk-io.c | 10 ++++++++++ fs/btrfs/super.c | 13 +++++++++++++ mm/readahead.c | 1 + 3 files changed, 24 insertions(+)
fs/btrfs/disk-io.c +10 -0
@@ -776,6 +776,15 @@ static int btree_readpage(struct file *freturn extent_read_full_page (tree, page, btree_get_extent); } +static int btree_readpages (struct file *file,struct address_space *mapping, +struct list_head *pages,unsigned nr_pages) +{ +struct extent_io_tree *tree; + tree = &BTRFS_I (mapping->host)->io_tree; +return extent_readpages (tree, mapping, pages, nr_pages, + btree_get_extent); +} +static int btree_releasepage (struct page *page,gfp_t gfp_flags) {struct extent_io_tree *tree;
@@ -819,6 +828,7 @@ static void btree_invalidatepage(structstatic const struct address_space_operations btree_aops = { .readpage = btree_readpage, + .readpages = btree_readpages, .writepage = btree_writepage, .writepages = btree_writepages, .releasepage = btree_releasepage,
fs/btrfs/super.c +13 -0
@@ -892,6 +892,18 @@ out:return -ENOENT ; } +static int btrfs_metadata_readahead (struct super_block *sb,loff_t offset, +ssize_t size) +{ +struct btrfs_root *tree_root =btrfs_sb (sb); +struct inode *btree_inode = tree_root->fs_info->btree_inode; +struct address_space *mapping = btree_inode->i_mapping; + +force_page_cache_readahead (mapping,NULL , offset >>PAGE_CACHE_SHIFT , + size >>PAGE_CACHE_SHIFT ); +return 0 ; +} +static const struct super_operations btrfs_super_ops = { .drop_inode = btrfs_drop_inode, .evict_inode = btrfs_evict_inode,
@@ -907,6 +919,7 @@ static const struct super_operations btr .freeze_fs = btrfs_freeze, .unfreeze_fs = btrfs_unfreeze, .metadata_incore = btrfs_metadata_incore, + .metadata_readahead = btrfs_metadata_readahead, };static const struct file_operations btrfs_ctl_fops = {
mm/readahead.c +1 -0
@@ -228,6 +228,7 @@ int force_page_cache_readahead(struct ad }return ret; } +EXPORT_SYMBOL_GPL (force_page_cache_readahead);/* * Given a desired number of PAGE_CACHE_SIZE readahead pages, return a
On Mon, Dec 13, 2010 at 3:22 PM, Shaohua Li <[email protected]> wrot= e:
Quoted 1 line
Implementation btrfs .metadata_readahead. In btrfs, all metadata page=
s are in a
Quoted 4 lines
special
btree_inode. We do readahead in it.Signed-off-by Shaohua Li <[email protected]>
Quoted 8 lines
---
=A0fs/btrfs/disk-io.c | =A0 10 ++++++++++
=A0fs/btrfs/super.c =A0 | =A0 13 +++++++++++++
=A0mm/readahead.c =A0 =A0 | =A0 =A01 +
=A03 files changed, 24 insertions(+)Index:
linux/fs/btrfs/disk-io.c=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
Quoted 1 line
---
linux.orig/fs/btrfs/disk-io.c=A0 =A0 =A0 2010-12-07 13:32:24.000=
000000 +0800
Quoted 1 line
+++
linux/fs/btrfs/disk-io.c=A0 =A02010-12-07 13:33:08.000000000 +08=
00
Quoted 2 lines
(quoted diff) +0
-0@@ -776,6 +776,15 @@ static int btree_readpage(struct file *f=A0 =A0 =A0 =A0return extent_read_full_page(tree, page, btree_get_ext=
ent);
Quoted 3 lines
=A0}
+static int btree_readpages(struct file *file, struct
address_space*=
mapping,
Quoted 1 line
+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 struct
list_head*pages, unsigned nr_pa=
ges)
Quoted 18 lines
(quoted diff) +7
-0+{ + =A0 =A0 =A0 struct extent_io_tree *tree; + =A0 =A0 =A0 tree =3D &BTRFS_I(mapping->host)->io_tree; + =A0 =A0 =A0 return extent_readpages(tree, mapping, pages, nr_pages, + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 btree_get_extent); +} +=A0static int
btree_releasepage(struct page *page, gfp_t gfp_flags)=A0{
=A0 =A0 =A0 =A0structextent_io_tree*tree;(quoted diff) +1
-0@@ -819,6 +828,7 @@ static void btree_invalidatepage(struct =A0static const struct address_space_operations btree_aops =3D { =A0 =A0 =A0 =A0.readpage =A0 =A0 =A0 =3D btree_readpage, + =A0 =A0 =A0 .readpages =A0 =A0 =A0=3D btree_readpages, =A0 =A0 =A0 =A0.writepage =A0 =A0 =A0=3D btree_writepage, =A0 =A0 =A0 =A0.writepages =A0 =A0 =3D btree_writepages, =A0 =A0 =A0 =A0.releasepage =A0 =A0=3D btree_releasepage,
Quoted 2 lines
Index:
linux/fs/btrfs/super.c=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 +=
Quoted 2 lines
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +0
-0
0800
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += out: · line 895
Quoted 5 lines
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +1
-0@@ -892,6 +892,18 @@ out: =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0return -ENOENT; =A0} +static int btrfs_metadata_readahead(struct super_block *sb, loff_t o=
ffset,
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += out: · line 899
Quoted 4 lines
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +4
-0+ =A0 =A0 =A0 ssize_t size) +{ + =A0 =A0 =A0 struct btrfs_root *tree_root =3D btrfs_sb(sb); + =A0 =A0 =A0 struct inode *btree_inode =3D tree_root->fs_info->btree=
_inode;
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += out: · line 900
Quoted 1 line
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +1
-0+ =A0 =A0 =A0 struct address_space *mapping =3D btree_inode->i_mappin=
g;
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += out: · line 902
Quoted 2 lines
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +2
-0+ + =A0 =A0 =A0 force_page_cache_readahead(mapping, NULL, offset >> PAG=
E_CACHE_SHIFT,
Quoted 15 lines
fs/btrfs/super.c =A0 =A0 =A02010-12-07 13:33:08.000000000 += renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +5
-0+ =A0 =A0 =A0 =A0 =A0 =A0 =A0 size >> PAGE_CACHE_SHIFT); + =A0 =A0 =A0 return 0; +} + =A0static const struct super_operations btrfs_super_ops =3D { =A0 =A0 =A0 =A0.drop_inode =A0 =A0 =3D btrfs_drop_inode, =A0 =A0 =A0 =A0.evict_inode =A0 =A0=3D btrfs_evict_inode,@@ -907,6 +919,7 @@ static const struct super_operations btr =A0 =A0 =A0 =A0.freeze_fs =A0 =A0 =A0=3D btrfs_freeze, =A0 =A0 =A0 =A0.unfreeze_fs =A0 =A0=3D btrfs_unfreeze, =A0 =A0 =A0 =A0.metadata_incore =3D btrfs_metadata_incore, + =A0 =A0 =A0 .metadata_readahead =3D btrfs_metadata_readahead, =A0}; =A0static const struct file_operations btrfs_ctl_fops =3D {
Quoted 2 lines
Index:
linux/mm/readahead.c=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
mm/readahead.c =A0 =A0 =A0 =A02010-12-07 13:33:08.000000000=
Quoted 2 lines
mm/readahead.c =A0 =A0 =A0 =A02010-12-07 13:33:08.000000000= renamed from mm/readahead.c =A0 2010-12-07 13:32:24.000000000 +0800 +0
-0
+0800
Quoted 8 lines
mm/readahead.c =A0 =A0 =A0 =A02010-12-07 13:33:08.000000000= renamed from mm/readahead.c =A0 2010-12-07 13:32:24.000000000 +0800 +1
-0@@ -228,6 +228,7 @@ int force_page_cache_readahead(struct ad =A0 =A0 =A0 =A0} =A0 =A0 =A0 =A0return ret; =A0} +EXPORT_SYMBOL_GPL(force_page_cache_readahead);=A0/*
=A0* Given a desired number ofPAGE_CACHE_SIZEreadahead pages, retur=
n a
Quoted 2 lines
btrfs will crash If the read-ahead range falls into unallocated chunk. need code to check validity of the user input.
Yan, Zheng
--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel= " in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 81 lines · Zheng
Quoted 80 lines · Shaohua Li
Implementation btrfs .metadata_readahead. In btrfs, all metadata pages are in a special
btree_inode. We do readahead in it.Signed-off-by Shaohua Li <[email protected]>--- fs/btrfs/disk-io.c | 10 ++++++++++ fs/btrfs/super.c | 13 +++++++++++++ mm/readahead.c | 1 + 3 files changed, 24 insertions(+)Index:
linux/fs/btrfs/disk-io.c
===================================================================fs/btrfs/disk-io.c 2010-12-07 13:33:08.000000000 +0800 renamed from fs/btrfs/disk-io.c 2010-12-07 13:32:24.000000000 +0800 +10
-0@@ -776,6 +776,15 @@ static int btree_readpage(struct file *f return extent_read_full_page(tree, page, btree_get_extent); } +static int btree_readpages(struct file *file, struct address_space *mapping, + struct list_head *pages, unsigned nr_pages) +{ + struct extent_io_tree *tree; + tree = &BTRFS_I(mapping->host)->io_tree; + return extent_readpages(tree, mapping, pages, nr_pages, + btree_get_extent); +} + static int btree_releasepage(struct page *page, gfp_t gfp_flags) { struct extent_io_tree *tree;@@ -819,6 +828,7 @@ static void btree_invalidatepage(struct static const struct address_space_operations btree_aops = { .readpage = btree_readpage, + .readpages = btree_readpages, .writepage = btree_writepage, .writepages = btree_writepages, .releasepage = btree_releasepage,Index:
linux/fs/btrfs/super.c
===================================================================fs/btrfs/super.c 2010-12-07 13:33:08.000000000 +0800 renamed from fs/btrfs/super.c 2010-12-07 13:32:24.000000000 +0800 +13
-0@@ -892,6 +892,18 @@ out: return -ENOENT; } +static int btrfs_metadata_readahead(struct super_block *sb, loff_t offset, + ssize_t size) +{ + struct btrfs_root *tree_root = btrfs_sb(sb); + struct inode *btree_inode = tree_root->fs_info->btree_inode; + struct address_space *mapping = btree_inode->i_mapping; + + force_page_cache_readahead(mapping, NULL, offset >> PAGE_CACHE_SHIFT, + size >> PAGE_CACHE_SHIFT); + return 0; +} + static const struct super_operations btrfs_super_ops = { .drop_inode = btrfs_drop_inode, .evict_inode = btrfs_evict_inode,@@ -907,6 +919,7 @@ static const struct super_operations btr .freeze_fs = btrfs_freeze, .unfreeze_fs = btrfs_unfreeze, .metadata_incore = btrfs_metadata_incore, + .metadata_readahead = btrfs_metadata_readahead, }; static const struct file_operations btrfs_ctl_fops = {Index:
linux/mm/readahead.c
===================================================================mm/readahead.c 2010-12-07 13:33:08.000000000 +0800 renamed from mm/readahead.c 2010-12-07 13:32:24.000000000 +0800 +1
-0@@ -228,6 +228,7 @@ int force_page_cache_readahead(struct ad } return ret; } +EXPORT_SYMBOL_GPL(force_page_cache_readahead);
Quoted 7 lines
mm/readahead.c 2010-12-07 13:33:08.000000000 +0800 int force_page_cache_readahead(struct ad · line 234
Quoted 4 lines
mm/readahead.c 2010-12-07 13:33:08.000000000 +0800 renamed from mm/readahead.c 2010-12-07 13:32:24.000000000 +0800 +0
-0/* * Given a desired number of PAGE_CACHE_SIZE readahead pages, return abtrfs will crash If the read-ahead range falls into unallocated chunk. need code to check validity of the user input.
didn't hit this, maybe I'm lucky. I'll double check this.
Thanks,
Shaohua