diff options
author | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:49:49 -0500 |
---|---|---|
committer | Nick Piggin <npiggin@kernel.dk> | 2011-01-07 01:50:26 -0500 |
commit | fa0d7e3de6d6fc5004ad9dea0dd6b286af8f03e9 (patch) | |
tree | 203e0f73883e4c26b5597e36042386a1237dab35 /fs/ocfs2 | |
parent | 77812a1ef139d84270d27faacc0630c887411013 (diff) |
fs: icache RCU free inodes
RCU free the struct inode. This will allow:
- Subsequent store-free path walking patch. The inode must be consulted for
permissions when walking, so an RCU inode reference is a must.
- sb_inode_list_lock to be moved inside i_lock because sb list walkers who want
to take i_lock no longer need to take sb_inode_list_lock to walk the list in
the first place. This will simplify and optimize locking.
- Could remove some nested trylock loops in dcache code
- Could potentially simplify things a bit in VM land. Do not need to take the
page lock to follow page->mapping.
The downsides of this is the performance cost of using RCU. In a simple
creat/unlink microbenchmark, performance drops by about 10% due to inability to
reuse cache-hot slab objects. As iterations increase and RCU freeing starts
kicking over, this increases to about 20%.
In cases where inode lifetimes are longer (ie. many inodes may be allocated
during the average life span of a single inode), a lot of this cache reuse is
not applicable, so the regression caused by this patch is smaller.
The cache-hot regression could largely be avoided by using SLAB_DESTROY_BY_RCU,
however this adds some complexity to list walking and store-free path walking,
so I prefer to implement this at a later date, if it is shown to be a win in
real situations. I haven't found a regression in any non-micro benchmark so I
doubt it will be a problem.
Signed-off-by: Nick Piggin <npiggin@kernel.dk>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r-- | fs/ocfs2/dlmfs/dlmfs.c | 9 | ||||
-rw-r--r-- | fs/ocfs2/super.c | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/fs/ocfs2/dlmfs/dlmfs.c b/fs/ocfs2/dlmfs/dlmfs.c index b2df490a19ed..8c5c0eddc365 100644 --- a/fs/ocfs2/dlmfs/dlmfs.c +++ b/fs/ocfs2/dlmfs/dlmfs.c | |||
@@ -351,11 +351,18 @@ static struct inode *dlmfs_alloc_inode(struct super_block *sb) | |||
351 | return &ip->ip_vfs_inode; | 351 | return &ip->ip_vfs_inode; |
352 | } | 352 | } |
353 | 353 | ||
354 | static void dlmfs_destroy_inode(struct inode *inode) | 354 | static void dlmfs_i_callback(struct rcu_head *head) |
355 | { | 355 | { |
356 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
357 | INIT_LIST_HEAD(&inode->i_dentry); | ||
356 | kmem_cache_free(dlmfs_inode_cache, DLMFS_I(inode)); | 358 | kmem_cache_free(dlmfs_inode_cache, DLMFS_I(inode)); |
357 | } | 359 | } |
358 | 360 | ||
361 | static void dlmfs_destroy_inode(struct inode *inode) | ||
362 | { | ||
363 | call_rcu(&inode->i_rcu, dlmfs_i_callback); | ||
364 | } | ||
365 | |||
359 | static void dlmfs_evict_inode(struct inode *inode) | 366 | static void dlmfs_evict_inode(struct inode *inode) |
360 | { | 367 | { |
361 | int status; | 368 | int status; |
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index cfeab7ce3697..17ff46fa8a10 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c | |||
@@ -569,11 +569,18 @@ static struct inode *ocfs2_alloc_inode(struct super_block *sb) | |||
569 | return &oi->vfs_inode; | 569 | return &oi->vfs_inode; |
570 | } | 570 | } |
571 | 571 | ||
572 | static void ocfs2_destroy_inode(struct inode *inode) | 572 | static void ocfs2_i_callback(struct rcu_head *head) |
573 | { | 573 | { |
574 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
575 | INIT_LIST_HEAD(&inode->i_dentry); | ||
574 | kmem_cache_free(ocfs2_inode_cachep, OCFS2_I(inode)); | 576 | kmem_cache_free(ocfs2_inode_cachep, OCFS2_I(inode)); |
575 | } | 577 | } |
576 | 578 | ||
579 | static void ocfs2_destroy_inode(struct inode *inode) | ||
580 | { | ||
581 | call_rcu(&inode->i_rcu, ocfs2_i_callback); | ||
582 | } | ||
583 | |||
577 | static unsigned long long ocfs2_max_file_offset(unsigned int bbits, | 584 | static unsigned long long ocfs2_max_file_offset(unsigned int bbits, |
578 | unsigned int cbits) | 585 | unsigned int cbits) |
579 | { | 586 | { |