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 /net | |
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 'net')
-rw-r--r-- | net/socket.c | 16 | ||||
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 10 |
2 files changed, 17 insertions, 9 deletions
diff --git a/net/socket.c b/net/socket.c index 088fb3fd45e0..97fff3a4e72f 100644 --- a/net/socket.c +++ b/net/socket.c | |||
@@ -262,20 +262,20 @@ static struct inode *sock_alloc_inode(struct super_block *sb) | |||
262 | } | 262 | } |
263 | 263 | ||
264 | 264 | ||
265 | static void wq_free_rcu(struct rcu_head *head) | 265 | static void sock_free_rcu(struct rcu_head *head) |
266 | { | 266 | { |
267 | struct socket_wq *wq = container_of(head, struct socket_wq, rcu); | 267 | struct inode *inode = container_of(head, struct inode, i_rcu); |
268 | struct socket_alloc *ei = container_of(inode, struct socket_alloc, | ||
269 | vfs_inode); | ||
268 | 270 | ||
269 | kfree(wq); | 271 | kfree(ei->socket.wq); |
272 | INIT_LIST_HEAD(&inode->i_dentry); | ||
273 | kmem_cache_free(sock_inode_cachep, ei); | ||
270 | } | 274 | } |
271 | 275 | ||
272 | static void sock_destroy_inode(struct inode *inode) | 276 | static void sock_destroy_inode(struct inode *inode) |
273 | { | 277 | { |
274 | struct socket_alloc *ei; | 278 | call_rcu(&inode->i_rcu, sock_free_rcu); |
275 | |||
276 | ei = container_of(inode, struct socket_alloc, vfs_inode); | ||
277 | call_rcu(&ei->socket.wq->rcu, wq_free_rcu); | ||
278 | kmem_cache_free(sock_inode_cachep, ei); | ||
279 | } | 279 | } |
280 | 280 | ||
281 | static void init_once(void *foo) | 281 | static void init_once(void *foo) |
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index a0dc1a86fcea..2899fe27f880 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -162,11 +162,19 @@ rpc_alloc_inode(struct super_block *sb) | |||
162 | } | 162 | } |
163 | 163 | ||
164 | static void | 164 | static void |
165 | rpc_destroy_inode(struct inode *inode) | 165 | rpc_i_callback(struct rcu_head *head) |
166 | { | 166 | { |
167 | struct inode *inode = container_of(head, struct inode, i_rcu); | ||
168 | INIT_LIST_HEAD(&inode->i_dentry); | ||
167 | kmem_cache_free(rpc_inode_cachep, RPC_I(inode)); | 169 | kmem_cache_free(rpc_inode_cachep, RPC_I(inode)); |
168 | } | 170 | } |
169 | 171 | ||
172 | static void | ||
173 | rpc_destroy_inode(struct inode *inode) | ||
174 | { | ||
175 | call_rcu(&inode->i_rcu, rpc_i_callback); | ||
176 | } | ||
177 | |||
170 | static int | 178 | static int |
171 | rpc_pipe_open(struct inode *inode, struct file *filp) | 179 | rpc_pipe_open(struct inode *inode, struct file *filp) |
172 | { | 180 | { |