Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965217AbbDVO1d (ORCPT ); Wed, 22 Apr 2015 10:27:33 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:34404 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757440AbbDVO1U (ORCPT ); Wed, 22 Apr 2015 10:27:20 -0400 From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: hch@infradead.org, axboe@fb.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org Cc: javier@paletta.io, keith.busch@intel.com, =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v3 5/7] null_blk: LightNVM support Date: Wed, 22 Apr 2015 16:26:54 +0200 Message-Id: <1429712816-10336-6-git-send-email-m@bjorling.me> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429712816-10336-1-git-send-email-m@bjorling.me> References: <1429712816-10336-1-git-send-email-m@bjorling.me> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6700 Lines: 230 Initial support for LightNVM. The support can be used to benchmark performance of targets and core implementation. Signed-off-by: Matias Bjørling --- Documentation/block/null_blk.txt | 8 +++ drivers/block/null_blk.c | 116 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 117 insertions(+), 7 deletions(-) diff --git a/Documentation/block/null_blk.txt b/Documentation/block/null_blk.txt index 2f6c6ff..a34f50a 100644 --- a/Documentation/block/null_blk.txt +++ b/Documentation/block/null_blk.txt @@ -70,3 +70,11 @@ use_per_node_hctx=[0/1]: Default: 0 parameter. 1: The multi-queue block layer is instantiated with a hardware dispatch queue for each CPU node in the system. + +IV: LightNVM specific parameters + +nvm_enable=[x]: Default: 0 + Enable LightNVM for null block devices. Requires blk-mq to be used. + +nvm_num_channels=[x]: Default: 1 + Number of LightNVM channels that is exposed to the LightNVM driver. diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 65cd61a..fb49674 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -8,6 +8,7 @@ #include #include #include +#include struct nullb_cmd { struct list_head list; @@ -17,6 +18,7 @@ struct nullb_cmd { struct bio *bio; unsigned int tag; struct nullb_queue *nq; + struct nvm_rq_data nvm_rqdata; }; struct nullb_queue { @@ -147,6 +149,14 @@ static bool use_per_node_hctx = false; module_param(use_per_node_hctx, bool, S_IRUGO); MODULE_PARM_DESC(use_per_node_hctx, "Use per-node allocation for hardware context queues. Default: false"); +static bool nvm_enable; +module_param(nvm_enable, bool, S_IRUGO); +MODULE_PARM_DESC(nvm_enable, "Enable Open-channel SSD. Default: false"); + +static int nvm_num_channels = 1; +module_param(nvm_num_channels, int, S_IRUGO); +MODULE_PARM_DESC(nvm_num_channels, "Number of channels to be exposed from the Open-Channel SSD. Default: 1"); + static void put_tag(struct nullb_queue *nq, unsigned int tag) { clear_bit_unlock(tag, nq->tag_map); @@ -273,6 +283,9 @@ static void null_softirq_done_fn(struct request *rq) static inline void null_handle_cmd(struct nullb_cmd *cmd) { + if (nvm_enable) + nvm_unprep_rq(cmd->rq, &cmd->nvm_rqdata); + /* Complete IO by inline, softirq or timer */ switch (irqmode) { case NULL_IRQ_SOFTIRQ: @@ -351,6 +364,60 @@ static void null_request_fn(struct request_queue *q) } } +#ifdef CONFIG_NVM + +static int null_nvm_id(struct request_queue *q, struct nvm_id *id) +{ + sector_t size = gb * 1024 * 1024 * 1024ULL; + unsigned long per_chnl_size = + size / bs / nvm_num_channels; + struct nvm_id_chnl *chnl; + int i; + + id->ver_id = 0x1; + id->nvm_type = NVM_NVMT_BLK; + id->nchannels = nvm_num_channels; + + id->chnls = kmalloc_array(id->nchannels, sizeof(struct nvm_id_chnl), + GFP_KERNEL); + if (!id->chnls) + return -ENOMEM; + + for (i = 0; i < id->nchannels; i++) { + chnl = &id->chnls[i]; + chnl->queue_size = hw_queue_depth; + chnl->gran_read = bs; + chnl->gran_write = bs; + chnl->gran_erase = bs * 256; + chnl->oob_size = 0; + chnl->t_r = chnl->t_sqr = 25000; /* 25us */ + chnl->t_w = chnl->t_sqw = 500000; /* 500us */ + chnl->t_e = 1500000; /* 1.500us */ + chnl->io_sched = NVM_IOSCHED_CHANNEL; + chnl->laddr_begin = per_chnl_size * i; + chnl->laddr_end = per_chnl_size * (i + 1) - 1; + } + + return 0; +} + +static int null_nvm_get_features(struct request_queue *q, + struct nvm_get_features *gf) +{ + gf->rsp = 0; + gf->ext = 0; + + return 0; +} + +static struct nvm_dev_ops null_nvm_dev_ops = { + .identify = null_nvm_id, + .get_features = null_nvm_get_features, +}; +#else +static struct nvm_dev_ops null_nvm_dev_ops; +#endif /* CONFIG_NVM */ + static int null_queue_rq(struct blk_mq_hw_ctx *hctx, const struct blk_mq_queue_data *bd) { @@ -359,6 +426,22 @@ static int null_queue_rq(struct blk_mq_hw_ctx *hctx, cmd->rq = bd->rq; cmd->nq = hctx->driver_data; + if (nvm_enable) { + nvm_init_rq_data(&cmd->nvm_rqdata); + switch (nvm_prep_rq(cmd->rq, &cmd->nvm_rqdata)) { + case NVM_PREP_DONE: + return BLK_MQ_RQ_QUEUE_OK; + case NVM_PREP_REQUEUE: + blk_mq_requeue_request(bd->rq); + blk_mq_kick_requeue_list(hctx->queue); + return BLK_MQ_RQ_QUEUE_OK; + case NVM_PREP_BUSY: + return BLK_MQ_RQ_QUEUE_BUSY; + case NVM_PREP_ERROR: + return BLK_MQ_RQ_QUEUE_ERROR; + } + } + blk_mq_start_request(bd->rq); null_handle_cmd(cmd); @@ -517,12 +600,24 @@ static int null_add_dev(void) goto out_free_nullb; if (queue_mode == NULL_Q_MQ) { + int cmd_size = sizeof(struct nullb_cmd); + + if (nvm_enable) { + cmd_size += sizeof(struct nvm_per_rq); + + if (bs != 4096) { + pr_warn("null_blk: only 4K sectors are supported for Open-Channel SSDs. bs is set to 4K.\n"); + bs = 4096; + } + } else { + nullb->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + } + nullb->tag_set.ops = &null_mq_ops; nullb->tag_set.nr_hw_queues = submit_queues; nullb->tag_set.queue_depth = hw_queue_depth; nullb->tag_set.numa_node = home_node; - nullb->tag_set.cmd_size = sizeof(struct nullb_cmd); - nullb->tag_set.flags = BLK_MQ_F_SHOULD_MERGE; + nullb->tag_set.cmd_size = cmd_size; nullb->tag_set.driver_data = nullb; rv = blk_mq_alloc_tag_set(&nullb->tag_set); @@ -567,11 +662,6 @@ static int null_add_dev(void) goto out_cleanup_blk_queue; } - mutex_lock(&lock); - list_add_tail(&nullb->list, &nullb_list); - nullb->index = nullb_indexes++; - mutex_unlock(&lock); - blk_queue_logical_block_size(nullb->q, bs); blk_queue_physical_block_size(nullb->q, bs); @@ -579,16 +669,28 @@ static int null_add_dev(void) sector_div(size, bs); set_capacity(disk, size); + if (nvm_enable && nvm_register(nullb->q, disk, &null_nvm_dev_ops)) + goto out_cleanup_disk; + 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; + + mutex_lock(&lock); + nullb->index = nullb_indexes++; + list_add_tail(&nullb->list, &nullb_list); + mutex_unlock(&lock); + sprintf(disk->disk_name, "nullb%d", nullb->index); add_disk(disk); + nvm_attach_sysfs(disk); return 0; +out_cleanup_disk: + put_disk(disk); out_cleanup_blk_queue: blk_cleanup_queue(nullb->q); out_cleanup_tags: -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/