Commit 9ae2d0aa authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe

null_blk: refactor to support non-gendisk devices

With LightNVM enabled devices, the gendisk structure is not exposed
to the user. This hides the device driver specific sysfs entries, and
prevents binding of LightNVM geometry information to the device.

Refactor the device registration process, so that gendisk and
non-gendisk devices are easily managed.
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent ac81bfa9
...@@ -414,23 +414,6 @@ static void cleanup_queues(struct nullb *nullb) ...@@ -414,23 +414,6 @@ static void cleanup_queues(struct nullb *nullb)
kfree(nullb->queues); kfree(nullb->queues);
} }
static void null_del_dev(struct nullb *nullb)
{
list_del_init(&nullb->list);
if (use_lightnvm)
nvm_unregister(nullb->disk_name);
else
del_gendisk(nullb->disk);
blk_cleanup_queue(nullb->q);
if (queue_mode == NULL_Q_MQ)
blk_mq_free_tag_set(&nullb->tag_set);
if (!use_lightnvm)
put_disk(nullb->disk);
cleanup_queues(nullb);
kfree(nullb);
}
#ifdef CONFIG_NVM #ifdef CONFIG_NVM
static void null_lnvm_end_io(struct request *rq, int error) static void null_lnvm_end_io(struct request *rq, int error)
...@@ -564,10 +547,41 @@ static struct nvm_dev_ops null_lnvm_dev_ops = { ...@@ -564,10 +547,41 @@ static struct nvm_dev_ops null_lnvm_dev_ops = {
/* Simulate nvme protocol restriction */ /* Simulate nvme protocol restriction */
.max_phys_sect = 64, .max_phys_sect = 64,
}; };
static int null_nvm_register(struct nullb *nullb)
{
return nvm_register(nullb->q, nullb->disk_name, &null_lnvm_dev_ops);
}
static void null_nvm_unregister(struct nullb *nullb)
{
nvm_unregister(nullb->disk_name);
}
#else #else
static struct nvm_dev_ops null_lnvm_dev_ops; static int null_nvm_register(struct nullb *nullb)
{
return -EINVAL;
}
static void null_nvm_unregister(struct nullb *nullb) {}
#endif /* CONFIG_NVM */ #endif /* CONFIG_NVM */
static void null_del_dev(struct nullb *nullb)
{
list_del_init(&nullb->list);
if (use_lightnvm)
null_nvm_unregister(nullb);
else
del_gendisk(nullb->disk);
blk_cleanup_queue(nullb->q);
if (queue_mode == NULL_Q_MQ)
blk_mq_free_tag_set(&nullb->tag_set);
if (!use_lightnvm)
put_disk(nullb->disk);
cleanup_queues(nullb);
kfree(nullb);
}
static int null_open(struct block_device *bdev, fmode_t mode) static int null_open(struct block_device *bdev, fmode_t mode)
{ {
return 0; return 0;
...@@ -640,11 +654,32 @@ static int init_driver_queues(struct nullb *nullb) ...@@ -640,11 +654,32 @@ static int init_driver_queues(struct nullb *nullb)
return 0; return 0;
} }
static int null_add_dev(void) static int null_gendisk_register(struct nullb *nullb)
{ {
struct gendisk *disk; struct gendisk *disk;
struct nullb *nullb;
sector_t size; sector_t size;
disk = nullb->disk = alloc_disk_node(1, home_node);
if (!disk)
return -ENOMEM;
size = gb * 1024 * 1024 * 1024ULL;
set_capacity(disk, size >> 9);
disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO;
disk->major = null_major;
disk->first_minor = nullb->index;
disk->fops = &null_fops;
disk->private_data = nullb;
disk->queue = nullb->q;
strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN);
add_disk(disk);
return 0;
}
static int null_add_dev(void)
{
struct nullb *nullb;
int rv; int rv;
nullb = kzalloc_node(sizeof(*nullb), GFP_KERNEL, home_node); nullb = kzalloc_node(sizeof(*nullb), GFP_KERNEL, home_node);
...@@ -716,42 +751,19 @@ static int null_add_dev(void) ...@@ -716,42 +751,19 @@ static int null_add_dev(void)
sprintf(nullb->disk_name, "nullb%d", nullb->index); sprintf(nullb->disk_name, "nullb%d", nullb->index);
if (use_lightnvm) { if (use_lightnvm)
rv = nvm_register(nullb->q, nullb->disk_name, rv = null_nvm_register(nullb);
&null_lnvm_dev_ops); else
if (rv) rv = null_gendisk_register(nullb);
goto out_cleanup_blk_queue;
goto done;
}
disk = nullb->disk = alloc_disk_node(1, home_node);
if (!disk) {
rv = -ENOMEM;
goto out_cleanup_lightnvm;
}
size = gb * 1024 * 1024 * 1024ULL;
set_capacity(disk, size >> 9);
disk->flags |= GENHD_FL_EXT_DEVT | GENHD_FL_SUPPRESS_PARTITION_INFO;
disk->major = null_major;
disk->first_minor = nullb->index;
disk->fops = &null_fops;
disk->private_data = nullb;
disk->queue = nullb->q;
strncpy(disk->disk_name, nullb->disk_name, DISK_NAME_LEN);
add_disk(disk); if (rv)
goto out_cleanup_blk_queue;
done:
mutex_lock(&lock); mutex_lock(&lock);
list_add_tail(&nullb->list, &nullb_list); list_add_tail(&nullb->list, &nullb_list);
mutex_unlock(&lock); mutex_unlock(&lock);
return 0; return 0;
out_cleanup_lightnvm:
if (use_lightnvm)
nvm_unregister(nullb->disk_name);
out_cleanup_blk_queue: out_cleanup_blk_queue:
blk_cleanup_queue(nullb->q); blk_cleanup_queue(nullb->q);
out_cleanup_tags: out_cleanup_tags:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment