Skip to content

Commit

Permalink
direct-io: use a slab cache for struct dio
Browse files Browse the repository at this point in the history
A direct slab call is slightly faster than kmalloc and can be better cached
per CPU. It also avoids rounding to the next kmalloc slab.

In addition this enforces cache line alignment for struct dio to avoid
any false sharing.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
  • Loading branch information
Andi Kleen authored and root committed Oct 28, 2011
1 parent 0dc2bc4 commit 6e8267f
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions fs/direct-io.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,9 @@ struct dio {
* wish that they not be zeroed.
*/
struct page *pages[DIO_PAGES]; /* page buffer */
};
} ____cacheline_aligned_in_smp;

static struct kmem_cache *dio_cache __read_mostly;

static void __inode_dio_wait(struct inode *inode)
{
Expand Down Expand Up @@ -330,7 +332,7 @@ static void dio_bio_end_aio(struct bio *bio, int error)

if (remaining == 0) {
dio_complete(dio, dio->iocb->ki_pos, 0, true);
kfree(dio);
kmem_cache_free(dio_cache, dio);
}
}

Expand Down Expand Up @@ -1180,7 +1182,7 @@ direct_io_worker(int rw, struct kiocb *iocb, struct inode *inode,

if (ret2 == 0) {
ret = dio_complete(dio, offset, ret, false);
kfree(dio);
kmem_cache_free(dio_cache, dio);
} else
BUG_ON(ret != -EIOCBQUEUED);

Expand Down Expand Up @@ -1256,7 +1258,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
if (rw == READ && end == offset)
return 0;

dio = kmalloc(sizeof(*dio), GFP_KERNEL);
dio = kmem_cache_alloc(dio_cache, GFP_KERNEL);
retval = -ENOMEM;
if (!dio)
goto out;
Expand All @@ -1280,7 +1282,7 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
end - 1);
if (retval) {
mutex_unlock(&inode->i_mutex);
kfree(dio);
kmem_cache_free(dio_cache, dio);
goto out;
}
}
Expand Down Expand Up @@ -1308,3 +1310,10 @@ __blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
return retval;
}
EXPORT_SYMBOL(__blockdev_direct_IO);

static __init int dio_init(void)
{
dio_cache = KMEM_CACHE(dio, SLAB_PANIC);
return 0;
}
module_init(dio_init)

0 comments on commit 6e8267f

Please sign in to comment.