Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87192a2a authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJeff Moyer <jmoyer@redhat.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ae55e1aa

fs/block_dev.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

	if (!bdev->bd_openers) {

		bdev->bd_disk = disk;

		bdev->bd_queue = disk->queue;

		bdev->bd_contains = bdev;

		if (!partno) {

			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);

					bdev->bd_part = NULL;

					bdev->bd_disk = NULL;

					bdev->bd_queue = NULL;

					mutex_unlock(&bdev->bd_mutex);

					disk_unblock_events(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);

	bdev->bd_disk = NULL;

	bdev->bd_part = NULL;

	bdev->bd_queue = NULL;

	bdev_inode_switch_bdi(bdev->bd_inode, &default_backing_dev_info);

	if (bdev != bdev->bd_contains)

		__blkdev_put(bdev->bd_contains, mode, 1);

include/linux/fs.h

+2 −0
Original line number Diff line number Diff line
@@ -660,6 +660,7 @@ struct address_space { 
	 * must be enforced here for CRIS, to let the least significant bit

	 * of struct page's "mapping" pointer be used for PAGE_MAPPING_ANON.

	 */

struct request_queue;



struct block_device {

	dev_t			bd_dev;  /* not a kdev_t - it's a search key */
@@ -682,6 +683,7 @@ struct block_device { 
	unsigned		bd_part_count;

	int			bd_invalidated;

	struct gendisk *	bd_disk;

	struct request_queue *  bd_queue;

	struct list_head	bd_list;

	/*

	 * Private data.  You must have bd_claim'ed the block_device