aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

block: cache request queue in bdev

Browse Source 
There are tons of places where we need to get a request_queue only
having bdev, which turns into bdev->bd_disk->queue. There are probably a
hundred of such places considering inline helpers, and enough of them
are in hot paths.

Cache queue pointer in struct block_device and make use of it in
bdev_get_queue().

Signed-off-by: Pavel Begunkov <asml.silence@gmail.com>
Link: https://lore.kernel.org/r/a3bfaecdd28956f03629d0ca5c63ebc096e1c809.1634219547.git.asml.silence@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Pavel Begunkov
2021-10-14 15:03:26 +01:00
committed by Jens Axboe
parent abd45c159d
commit 17220ca5ce
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
block/bdev.c
View File

@@ -493,6 +493,7 @@ struct block_device *bdev_alloc(struct gendisk *disk, u8 partno)
spin_lock_init(&bdev->bd_size_lock); spin_lock_init(&bdev->bd_size_lock);
bdev->bd_partno = partno; bdev->bd_partno = partno;
bdev->bd_inode = inode; bdev->bd_inode = inode;
bdev->bd_queue = disk->queue;
bdev->bd_stats = alloc_percpu(struct disk_stats); bdev->bd_stats = alloc_percpu(struct disk_stats);
if (!bdev->bd_stats) { if (!bdev->bd_stats) {
iput(inode); iput(inode);

4
block/genhd.c
View File

@@ -1267,6 +1267,9 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
if (!disk->bdi) if (!disk->bdi)
goto out_free_disk; goto out_free_disk;
/* bdev_alloc() might need the queue, set before the first call */
disk->queue = q;
disk->part0 = bdev_alloc(disk, 0); disk->part0 = bdev_alloc(disk, 0);
if (!disk->part0) if (!disk->part0)
goto out_free_bdi; goto out_free_bdi;
@@ -1282,7 +1285,6 @@ struct gendisk *__alloc_disk_node(struct request_queue *q, int node_id,
disk_to_dev(disk)->type = &disk_type; disk_to_dev(disk)->type = &disk_type;
device_initialize(disk_to_dev(disk)); device_initialize(disk_to_dev(disk));
inc_diskseq(disk); inc_diskseq(disk);
disk->queue = q;
q->disk = disk; q->disk = disk;
lockdep_init_map(&disk->lockdep_map, "(bio completion)", lkclass, 0); lockdep_init_map(&disk->lockdep_map, "(bio completion)", lkclass, 0);
#ifdef CONFIG_BLOCK_HOLDER_DEPRECATED #ifdef CONFIG_BLOCK_HOLDER_DEPRECATED

1
include/linux/blk_types.h
View File

@@ -38,6 +38,7 @@ struct block_device {
u8 bd_partno; u8 bd_partno;
spinlock_t bd_size_lock; /* for bd_inode->i_size updates */ spinlock_t bd_size_lock; /* for bd_inode->i_size updates */
struct gendisk * bd_disk; struct gendisk * bd_disk;
struct request_queue * bd_queue;
/* The counter of freeze processes */ /* The counter of freeze processes */
int bd_fsfreeze_count; int bd_fsfreeze_count;

2
include/linux/blkdev.h
View File

@@ -574,7 +574,7 @@ int iocb_bio_iopoll(struct kiocb *kiocb, unsigned int flags);
static inline struct request_queue *bdev_get_queue(struct block_device *bdev) static inline struct request_queue *bdev_get_queue(struct block_device *bdev)
{ {
return bdev->bd_disk->queue; /* this is never NULL */ return bdev->bd_queue; /* this is never NULL */
} }
/* /*