summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2010-08-23 18:47:55 +0400
committerAl Viro <viro@zeniv.linux.org.uk>2010-10-26 05:18:23 +0400
commit306fb0979443419288594446a348155a8027dcf2 (patch)
tree757dc3d7fa87ad693ac40860d996349dc277872b
parente1455d1bdccbe056ba53479741b1452106ce59aa (diff)
downloadlinux-306fb0979443419288594446a348155a8027dcf2.tar.xz
aio: bump i_count instead of using igrab
The aio batching code is using igrab to get an extra reference on the inode so it can safely batch. igrab will go ahead and take the global inode spinlock, which can be a bottleneck on large machines doing lots of AIO. In this case, igrab isn't required because we already have a reference on the file handle. It is safe to just bump the i_count directly on the inode. Benchmarking shows this patch brings IOP/s on tons of flash up by about 2.5X. Signed-off-by: Chris Mason <chris.mason@oracle.com>
-rw-r--r--fs/aio.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 250b0a73c8a8..9e319a04780e 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1543,7 +1543,20 @@ static void aio_batch_add(struct address_space *mapping,
}
abe = mempool_alloc(abe_pool, GFP_KERNEL);
- BUG_ON(!igrab(mapping->host));
+
+ /*
+ * we should be using igrab here, but
+ * we don't want to hammer on the global
+ * inode spinlock just to take an extra
+ * reference on a file that we must already
+ * have a reference to.
+ *
+ * When we're called, we always have a reference
+ * on the file, so we must always have a reference
+ * on the inode, so igrab must always just
+ * bump the count and move on.
+ */
+ atomic_inc(&mapping->host->i_count);
abe->mapping = mapping;
hlist_add_head(&abe->list, &batch_hash[bucket]);
return;