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 /include | |
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 'include')
-rw-r--r-- | include/linux/fs.h | 5 | ||||
-rw-r--r-- | include/linux/net.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h index 296cf2fde945..1ff4d0a33b25 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -737,7 +737,10 @@ struct inode { | |||
737 | struct list_head i_wb_list; /* backing dev IO list */ | 737 | struct list_head i_wb_list; /* backing dev IO list */ |
738 | struct list_head i_lru; /* inode LRU list */ | 738 | struct list_head i_lru; /* inode LRU list */ |
739 | struct list_head i_sb_list; | 739 | struct list_head i_sb_list; |
740 | struct list_head i_dentry; | 740 | union { |
741 | struct list_head i_dentry; | ||
742 | struct rcu_head i_rcu; | ||
743 | }; | ||
741 | unsigned long i_ino; | 744 | unsigned long i_ino; |
742 | atomic_t i_count; | 745 | atomic_t i_count; |
743 | unsigned int i_nlink; | 746 | unsigned int i_nlink; |
diff --git a/include/linux/net.h b/include/linux/net.h index 16faa130088c..06bde4908473 100644 --- a/include/linux/net.h +++ b/include/linux/net.h | |||
@@ -120,7 +120,6 @@ enum sock_shutdown_cmd { | |||
120 | struct socket_wq { | 120 | struct socket_wq { |
121 | wait_queue_head_t wait; | 121 | wait_queue_head_t wait; |
122 | struct fasync_struct *fasync_list; | 122 | struct fasync_struct *fasync_list; |
123 | struct rcu_head rcu; | ||
124 | } ____cacheline_aligned_in_smp; | 123 | } ____cacheline_aligned_in_smp; |
125 | 124 | ||
126 | /** | 125 | /** |