GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 23:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

blk-mq: register device instead of disk

Browse source 
Enable devices without a gendisk instance to register itself with blk-mq
and expose the associated multi-queue sysfs entries.

Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Matias Bjørling 2016-09-16 14:25:06 +02:00 • committed by Jens Axboe
parent 9ae2d0aa50
commit b21d5b3017
4 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
block/blk-mq-sysfs.c
View file

@ -393,9 +393,8 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx)
return ret; return ret;
} }
static void __blk_mq_unregister_disk(struct gendisk *disk) static void __blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
{ {
struct request_queue *q = disk->queue;
struct blk_mq_hw_ctx *hctx; struct blk_mq_hw_ctx *hctx;
struct blk_mq_ctx *ctx; struct blk_mq_ctx *ctx;
int i, j; int i, j;
@ -413,15 +412,15 @@ static void __blk_mq_unregister_disk(struct gendisk *disk)
kobject_del(&q->mq_kobj); kobject_del(&q->mq_kobj);
kobject_put(&q->mq_kobj); kobject_put(&q->mq_kobj);
kobject_put(&disk_to_dev(disk)->kobj); kobject_put(&dev->kobj);
q->mq_sysfs_init_done = false; q->mq_sysfs_init_done = false;
} }
void blk_mq_unregister_disk(struct gendisk *disk) void blk_mq_unregister_dev(struct device *dev, struct request_queue *q)
{ {
blk_mq_disable_hotplug(); blk_mq_disable_hotplug();
__blk_mq_unregister_disk(disk); __blk_mq_unregister_dev(dev, q);
blk_mq_enable_hotplug(); blk_mq_enable_hotplug();
} }
@ -443,10 +442,8 @@ static void blk_mq_sysfs_init(struct request_queue *q)
} }
} }
int blk_mq_register_disk(struct gendisk *disk) int blk_mq_register_dev(struct device *dev, struct request_queue *q)
{ {
struct device *dev = disk_to_dev(disk);
struct request_queue *q = disk->queue;
struct blk_mq_hw_ctx *hctx; struct blk_mq_hw_ctx *hctx;
int ret, i; int ret, i;
@ -467,7 +464,7 @@ int blk_mq_register_disk(struct gendisk *disk)
} }
if (ret) if (ret)
__blk_mq_unregister_disk(disk); __blk_mq_unregister_dev(dev, q);
else else
q->mq_sysfs_init_done = true; q->mq_sysfs_init_done = true;
out: out:
@ -475,7 +472,7 @@ out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(blk_mq_register_disk); EXPORT_SYMBOL_GPL(blk_mq_register_dev);
void blk_mq_sysfs_unregister(struct request_queue *q) void blk_mq_sysfs_unregister(struct request_queue *q)
{ {

4
block/blk-sysfs.c
View file

@ -704,7 +704,7 @@ int blk_register_queue(struct gendisk *disk)
kobject_uevent(&q->kobj, KOBJ_ADD); kobject_uevent(&q->kobj, KOBJ_ADD);
if (q->mq_ops) if (q->mq_ops)
blk_mq_register_disk(disk); blk_mq_register_dev(dev, q);
if (!q->request_fn) if (!q->request_fn)
return 0; return 0;
@ -729,7 +729,7 @@ void blk_unregister_queue(struct gendisk *disk)
return; return;
if (q->mq_ops) if (q->mq_ops)
blk_mq_unregister_disk(disk); blk_mq_unregister_dev(disk_to_dev(disk), q);
if (q->request_fn) if (q->request_fn)
elv_unregister_queue(q); elv_unregister_queue(q);

2
drivers/md/dm-rq.c
View file

@ -955,7 +955,7 @@ int dm_mq_init_request_queue(struct mapped_device *md, struct dm_table *t)
dm_init_md_queue(md); dm_init_md_queue(md);
/* backfill 'mq' sysfs registration normally done in blk_register_queue */ /* backfill 'mq' sysfs registration normally done in blk_register_queue */
blk_mq_register_disk(md->disk); blk_mq_register_dev(disk_to_dev(md->disk), q);
return 0; return 0;

4
include/linux/blk-mq.h
View file

@ -175,8 +175,8 @@ enum {
struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *); struct request_queue *blk_mq_init_queue(struct blk_mq_tag_set *);
struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set, struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
struct request_queue *q); struct request_queue *q);
int blk_mq_register_disk(struct gendisk *); int blk_mq_register_dev(struct device *, struct request_queue *);
void blk_mq_unregister_disk(struct gendisk *); void blk_mq_unregister_dev(struct device *, struct request_queue *);
int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set); int blk_mq_alloc_tag_set(struct blk_mq_tag_set *set);
void blk_mq_free_tag_set(struct blk_mq_tag_set *set); void blk_mq_free_tag_set(struct blk_mq_tag_set *set);