Each block devices have lots of queue setting, most of them needs
device's knowledge to configure correctly. Device parameter can be
thought as device's internal knowledge since ublk does implement block
device from userspace.
Add ublk_basic_param & ublk_discard_param first, both two types are
used now.
Another change is that discard support becomes not enabled at default,
and it needs userspace to send ublk_discard_param for enabling it.
Also ublk_basic_param has to be set before sending START_DEV, otherwise
ublk block device won't be setup. Meantime not set dev_blocks from
handling START_DEV any more.
Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxx>
---
drivers/block/ublk_drv.c | 190 ++++++++++++++++++++++++++++++----
include/uapi/linux/ublk_cmd.h | 33 ++++++
2 files changed, 202 insertions(+), 21 deletions(-)
diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c
index f949c0d96360..2f55c1c07a09 100644
--- a/drivers/block/ublk_drv.c
+++ b/drivers/block/ublk_drv.c
@@ -129,6 +129,7 @@ struct ublk_device {
#define UB_STATE_OPEN 0
#define UB_STATE_USED 1
+#define UB_STATE_CONFIGURED 2
unsigned long state;
int ub_number;
@@ -162,6 +163,108 @@ static DEFINE_MUTEX(ublk_ctl_mutex);
static struct miscdevice ublk_misc;
+static int ublk_dev_param_basic_validate(const struct ublk_device *ub,
+ const struct ublk_param_header *header)
+{
+ const struct ublk_basic_param *p = (struct ublk_basic_param *)header;
+
+ if (p->logical_bs_shift > PAGE_SHIFT)
+ return -EINVAL;
+
+ if (p->logical_bs_shift > p->physical_bs_shift)
+ return -EINVAL;
+
+ if (p->max_sectors > (ub->dev_info.rq_max_blocks << (ub->bs_shift - 9)))
+ return -EINVAL;
+
+ return 0;
+}
+
+/* basic param is the only one parameter which has to be set */
+static int ublk_dev_param_basic_apply(struct ublk_device *ub,
+ const struct ublk_param_header *header)
+{
+ struct request_queue *q = ub->ub_disk->queue;
+ const struct ublk_basic_param *p = (struct ublk_basic_param *)header;
+
+ blk_queue_logical_block_size(q, 1 << p->logical_bs_shift);
+ blk_queue_physical_block_size(q, 1 << p->physical_bs_shift);
+ blk_queue_io_min(q, 1 << p->io_min_shift);
+ blk_queue_io_opt(q, 1 << p->io_opt_shift);
+
+ blk_queue_write_cache(q, p->attrs & UBLK_ATTR_VOLATILE_CACHE,
+ p->attrs & UBLK_ATTR_FUA);
+ if (p->attrs & UBLK_ATTR_ROTATIONAL)
+ blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
+ else
+ blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
+
+ blk_queue_max_hw_sectors(q, p->max_sectors);
+ blk_queue_chunk_sectors(q, p->chunk_sectors);
+ blk_queue_virt_boundary(q, p->virt_boundary_mask);
+
+ if (p->attrs & UBLK_ATTR_READ_ONLY)
+ set_disk_ro(ub->ub_disk, true);
+
+ set_capacity(ub->ub_disk, p->dev_sectors);
+
+ set_bit(UB_STATE_CONFIGURED, &ub->state);
+
+ return 0;
+}
+
+static int ublk_dev_param_discard_validate(const struct ublk_device *ub,
+ const struct ublk_param_header *header)
+{
+ const struct ublk_discard_param *p = (struct ublk_discard_param *)header;
+
+ /* So far, only support single segment discard */
+ if (p->max_discard_sectors && p->max_discard_segments != 1)
+ return -EINVAL;
+ return 0;
+}
+
+static int ublk_dev_param_discard_apply(struct ublk_device *ub,
+ const struct ublk_param_header *header)
+{
+ struct request_queue *q = ub->ub_disk->queue;
+ const struct ublk_discard_param *p = (struct ublk_discard_param *)
+ header;
+
+ q->limits.discard_alignment = p->discard_alignment;
+ q->limits.discard_granularity = p->discard_granularity;
+ blk_queue_max_discard_sectors(q, p->max_discard_sectors);
+ blk_queue_max_write_zeroes_sectors(q,
+ p->max_write_zeroes_sectors);
+ blk_queue_max_discard_segments(q, p->max_discard_segments);
+
+ return 0;
+}
+
+#define __ublk_param_run_op(ub, h, op, param) \
+ ublk_dev_param_##param##_##op((ub), (h))
+
+#define ublk_param_run_op(ub, h, op) ({ \
+ int __ret; \
+ \
+ switch ((h)->type) { \
+ case UBLK_PARAM_TYPE_BASIC: \
+ __ret = __ublk_param_run_op(ub, h, op, basic); \
+ break; \
+ case UBLK_PARAM_TYPE_DISCARD: \
+ __ret = __ublk_param_run_op(ub, h, op, discard); \
+ break; \
+ default: \
+ __ret = -EINVAL; \
+ } \
+ __ret; \
+})
+
+static const unsigned short param_len[] = {
+ [UBLK_PARAM_TYPE_BASIC] = sizeof(struct ublk_basic_param),
+ [UBLK_PARAM_TYPE_DISCARD] = sizeof(struct ublk_discard_param),
+};
+
static int ublk_validate_param_header(const struct ublk_device *ub,
const struct ublk_param_header *h)
{
@@ -169,6 +272,22 @@ static int ublk_validate_param_header(const struct ublk_device *ub,
return -EINVAL;
if (h->len > UBLK_MAX_PARAM_LEN)
return -EINVAL;
+
+ if (h->len != param_len[h->type])
+ return -EINVAL;
+ return 0;
+}
+
+static int ublk_validate_param(const struct ublk_device *ub,
+ const struct ublk_param_header *h)
+{
+ int ret = ublk_validate_param_header(ub, h);
+
+ if (ret)
+ return ret;
+
+ ret = ublk_param_run_op(ub, h, validate);
+
return 0;
}
@@ -177,11 +296,39 @@ static int ublk_install_param(struct ublk_device *ub,
struct ublk_param_header *h)
{
struct ublk_param_header *old = ub->params[h->type];
+ int ret;
- kfree(old);
- ub->params[h->type] = h;
+ ret = ublk_validate_param(ub, h);
+ if (!ret) {
+ kfree(old);
+ ub->params[h->type] = h;
+ }
- return 0;
+ return ret;
+}
+
+static void ublk_apply_params(struct ublk_device *ub)
+{
+ int type;
+
+ for (type = 0; type < UBLK_PARAM_TYPE_LAST; type++) {
+ struct ublk_param_header *h = ub->params[type];
+ int ret = 0;
+
+ if (h)
+ ret = ublk_param_run_op(ub, h, apply);
+ if (ret)
+ dev_warn(&ub->cdev_dev, "fail to apply para %d\n",
+ type);
+ }
+}
+
+static void ublk_uninstall_params(struct ublk_device *ub)
+{
+ int type;
+
+ for (type = 0; type < UBLK_PARAM_TYPE_LAST; type++)
+ kfree(ub->params[type]);
}
static inline bool ublk_can_use_task_work(const struct ublk_queue *ubq)
@@ -239,6 +386,7 @@ static void ublk_free_disk(struct gendisk *disk)
{
struct ublk_device *ub = disk->private_data;
+ clear_bit(UB_STATE_CONFIGURED, &ub->state);
clear_bit(UB_STATE_USED, &ub->state);
put_device(&ub->cdev_dev);
}
@@ -1074,6 +1222,7 @@ static void ublk_cdev_rel(struct device *dev)
blk_mq_free_tag_set(&ub->tag_set);
ublk_deinit_queues(ub);
+ ublk_uninstall_params(ub);
ublk_free_dev_number(ub);
mutex_destroy(&ub->mutex);
kfree(ub);
@@ -1162,7 +1311,6 @@ static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd)
{
struct ublksrv_ctrl_cmd *header = (struct ublksrv_ctrl_cmd *)cmd->cmd;
int ublksrv_pid = (int)header->data[0];
- unsigned long dev_blocks = header->data[1];
struct ublk_device *ub;
struct gendisk *disk;
int ret = -EINVAL;
@@ -1185,10 +1333,6 @@ static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd)
goto out_unlock;
}
- /* We may get disk size updated */
- if (dev_blocks)
- ub->dev_info.dev_blocks = dev_blocks;
-
disk = blk_mq_alloc_disk(&ub->tag_set, ub);
if (IS_ERR(disk)) {
ret = PTR_ERR(disk);
@@ -1198,32 +1342,33 @@ static int ublk_ctrl_start_dev(struct io_uring_cmd *cmd)
disk->fops = &ub_fops;
disk->private_data = ub;
- blk_queue_logical_block_size(disk->queue, ub->dev_info.block_size);
- blk_queue_physical_block_size(disk->queue, ub->dev_info.block_size);
- blk_queue_io_min(disk->queue, ub->dev_info.block_size);
- blk_queue_max_hw_sectors(disk->queue,
- ub->dev_info.rq_max_blocks << (ub->bs_shift - 9));
- disk->queue->limits.discard_granularity = PAGE_SIZE;
- blk_queue_max_discard_sectors(disk->queue, UINT_MAX >> 9);
- blk_queue_max_write_zeroes_sectors(disk->queue, UINT_MAX >> 9);
-
- set_capacity(disk, ub->dev_info.dev_blocks << (ub->bs_shift - 9));
-
ub->dev_info.ublksrv_pid = ublksrv_pid;
ub->ub_disk = disk;
+
+ ublk_apply_params(ub);
+
+ /* ublk_basic_param has to be set from userspace */
+ if (!test_bit(UB_STATE_CONFIGURED, &ub->state)) {
+ ret = -EINVAL;
+ goto out_put_disk;
+ }
+
get_device(&ub->cdev_dev);
ret = add_disk(disk);
if (ret) {
+ clear_bit(UB_STATE_CONFIGURED, &ub->state);
/*
* has to drop the reference since ->free_disk won't be
* called in case of add_disk failure
*/
ublk_put_device(ub);
- put_disk(disk);
- goto out_unlock;
+ goto out_put_disk;
}
set_bit(UB_STATE_USED, &ub->state);
ub->dev_info.state = UBLK_S_DEV_LIVE;
+out_put_disk:
+ if (ret)
+ put_disk(disk);
out_unlock:
mutex_unlock(&ub->mutex);
ublk_put_device(ub);
@@ -1620,6 +1765,9 @@ static int __init ublk_init(void)
{
int ret;
+ BUILD_BUG_ON(sizeof(struct ublk_basic_param) > UBLK_MAX_PARAM_LEN);
+ BUILD_BUG_ON(sizeof(struct ublk_discard_param) > UBLK_MAX_PARAM_LEN);
+
init_waitqueue_head(&ublk_idr_wq);
ret = misc_register(&ublk_misc);
diff --git a/include/uapi/linux/ublk_cmd.h b/include/uapi/linux/ublk_cmd.h
index f6433bb1f5f6..78c2b420b720 100644
--- a/include/uapi/linux/ublk_cmd.h
+++ b/include/uapi/linux/ublk_cmd.h
@@ -164,6 +164,8 @@ struct ublksrv_io_cmd {
#define UBLK_MAX_PARAM_LEN 512
enum {
+ UBLK_PARAM_TYPE_BASIC,
+ UBLK_PARAM_TYPE_DISCARD,
UBLK_PARAM_TYPE_LAST,
};
@@ -172,4 +174,35 @@ struct ublk_param_header {
__u16 len;
};
+struct ublk_basic_param {
+ struct ublk_param_header header;
+#define UBLK_ATTR_READ_ONLY (1 << 0)
+#define UBLK_ATTR_ROTATIONAL (1 << 1)
+#define UBLK_ATTR_VOLATILE_CACHE (1 << 2)
+#define UBLK_ATTR_FUA (1 << 3)
+ __u32 attrs;
+ __u8 logical_bs_shift;
+ __u8 physical_bs_shift;
+ __u8 io_opt_shift;
+ __u8 io_min_shift;
+
+ __u32 max_sectors;
+ __u32 chunk_sectors;
+
+ __u64 dev_sectors;
+ __u64 virt_boundary_mask;
+};
+
+struct ublk_discard_param {
+ struct ublk_param_header header;
+ __u32 discard_alignment;
+
+ __u32 discard_granularity;
+ __u32 max_discard_sectors;
+
+ __u32 max_write_zeroes_sectors;
+ __u16 max_discard_segments;
+ __u16 reserved0;
+};
+
#endif
--
2.31.1
