瀏覽代碼

vfs: cache request_queue in struct block_device

This makes it possible to get from the inode to the request_queue with one
less cache miss.  Used in followon optimization.

The livetime of the pointer is the same as the gendisk.

This assumes that the queue will always stay the same in the gendisk while
it's visible to block_devices.  I think that's safe correct?

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Acked-by: Jeff Moyer <jmoyer@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Andi Kleen 13 年之前
父節點
當前提交
87192a2a49
共有 2 個文件被更改,包括 5 次插入0 次删除
  1. 3 0
      fs/block_dev.c
  2. 2 0
      include/linux/fs.h

+ 3 - 0
fs/block_dev.c

@@ -1139,6 +1139,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 	mutex_lock_nested(&bdev->bd_mutex, for_part);
 	mutex_lock_nested(&bdev->bd_mutex, for_part);
 	if (!bdev->bd_openers) {
 	if (!bdev->bd_openers) {
 		bdev->bd_disk = disk;
 		bdev->bd_disk = disk;
+		bdev->bd_queue = disk->queue;
 		bdev->bd_contains = bdev;
 		bdev->bd_contains = bdev;
 		if (!partno) {
 		if (!partno) {
 			struct backing_dev_info *bdi;
 			struct backing_dev_info *bdi;
@@ -1159,6 +1160,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 					disk_put_part(bdev->bd_part);
 					disk_put_part(bdev->bd_part);
 					bdev->bd_part = NULL;
 					bdev->bd_part = NULL;
 					bdev->bd_disk = NULL;
 					bdev->bd_disk = NULL;
+					bdev->bd_queue = NULL;
 					mutex_unlock(&bdev->bd_mutex);
 					mutex_unlock(&bdev->bd_mutex);
 					disk_unblock_events(disk);
 					disk_unblock_events(disk);
 					put_disk(disk);
 					put_disk(disk);
@@ -1232,6 +1234,7 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part)
 	disk_put_part(bdev->bd_part);
 	disk_put_part(bdev->bd_part);
 	bdev->bd_disk = NULL;
 	bdev->bd_disk = NULL;
 	bdev->bd_part = NULL;
 	bdev->bd_part = NULL;
+	bdev->bd_queue = NULL;
 	bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);
 	bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);
 	if (bdev != bdev->bd_contains)
 	if (bdev != bdev->bd_contains)
 		__blkdev_put(bdev->bd_contains, mode, 1);
 		__blkdev_put(bdev->bd_contains, mode, 1);

+ 2 - 0
include/linux/fs.h

@@ -660,6 +660,7 @@ struct address_space {
 	 * must be enforced here for CRIS, to let the least significant bit
 	 * must be enforced here for CRIS, to let the least significant bit
 	 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.
 	 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.
 	 */
 	 */
+struct request_queue;
 
 
 struct block_device {
 struct block_device {
 	dev_t			bd_dev;  /* not a kdev_t - it's a search key */
 	dev_t			bd_dev;  /* not a kdev_t - it's a search key */
@@ -682,6 +683,7 @@ struct block_device {
 	unsigned		bd_part_count;
 	unsigned		bd_part_count;
 	int			bd_invalidated;
 	int			bd_invalidated;
 	struct gendisk *	bd_disk;
 	struct gendisk *	bd_disk;
+	struct request_queue *  bd_queue;
 	struct list_head	bd_list;
 	struct list_head	bd_list;
 	/*
 	/*
 	 * Private data.  You must have bd_claim'ed the block_device
 	 * Private data.  You must have bd_claim'ed the block_device