From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH v5 4/5] null_blk: LightNVM support Date: Wed, 22 Jul 2015 19:51:03 +0200 Message-ID: <1437587464-7964-5-git-send-email-mb@lightnvm.io> References: <1437587464-7964-1-git-send-email-mb@lightnvm.io> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: Stephen.Bates@pmcs.com, keith.busch@intel.com, =?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 Return-path: In-Reply-To: <1437587464-7964-1-git-send-email-mb@lightnvm.io> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Initial support for LightNVM. The support can be used to benchmark performance of targets and core implementation. Signed-off-by: Matias Bj=C3=B8rling --- Documentation/block/null_blk.txt | 8 +++ drivers/block/null_blk.c | 138 +++++++++++++++++++++++++++++++= ++++++-- 2 files changed, 140 insertions(+), 6 deletions(-) diff --git a/Documentation/block/null_blk.txt b/Documentation/block/nul= l_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=3D[0/1]: Default: 0 parameter. 1: The multi-queue block layer is instantiated with a hardware dispa= tch queue for each CPU node in the system. + +IV: LightNVM specific parameters + +nvm_enable=3D[x]: Default: 0 + Enable LightNVM for null block devices. Requires blk-mq to be used. + +nvm_num_channels=3D[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 69de41a..6531250 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -8,6 +8,7 @@ #include #include #include +#include =20 struct nullb_cmd { struct list_head list; @@ -147,6 +148,14 @@ static bool use_per_node_hctx =3D false; module_param(use_per_node_hctx, bool, S_IRUGO); MODULE_PARM_DESC(use_per_node_hctx, "Use per-node allocation for hardw= are context queues. Default: false"); =20 +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 =3D 1; +module_param(nvm_num_channels, int, S_IRUGO); +MODULE_PARM_DESC(nvm_num_channels, "Number of channels to be exposed f= rom the Open-Channel SSD. Default: 1"); + static void put_tag(struct nullb_queue *nq, unsigned int tag) { clear_bit_unlock(tag, nq->tag_map); @@ -363,6 +372,110 @@ static void null_request_fn(struct request_queue = *q) } } =20 +#ifdef CONFIG_NVM +static int null_nvm_id(struct request_queue *q, struct nvm_id *id) +{ + sector_t size =3D gb * 1024 * 1024 * 1024ULL; + unsigned long per_chnl_size =3D + size / bs / nvm_num_channels; + struct nvm_id_chnl *chnl; + int i; + + id->ver_id =3D 0x1; + id->nvm_type =3D NVM_NVMT_BLK; + id->nchannels =3D nvm_num_channels; + + id->chnls =3D kmalloc_array(id->nchannels, sizeof(struct nvm_id_chnl)= , + GFP_KERNEL); + if (!id->chnls) + return -ENOMEM; + + for (i =3D 0; i < id->nchannels; i++) { + chnl =3D &id->chnls[i]; + chnl->queue_size =3D hw_queue_depth; + chnl->gran_read =3D bs; + chnl->gran_write =3D bs; + chnl->gran_erase =3D bs * 256; + chnl->oob_size =3D 0; + chnl->t_r =3D chnl->t_sqr =3D 25000; /* 25us */ + chnl->t_w =3D chnl->t_sqw =3D 500000; /* 500us */ + chnl->t_e =3D 1500000; /* 1.500us */ + chnl->io_sched =3D NVM_IOSCHED_CHANNEL; + chnl->laddr_begin =3D per_chnl_size * i; + chnl->laddr_end =3D 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 =3D NVM_RSP_L2P; + gf->ext =3D 0; + + return 0; +} + +static void null_nvm_end_io(struct request *rq, int error) +{ + struct nvm_rq *rqd =3D rq->end_io_data; + struct nvm_tgt_instance *ins =3D rqd->ins; + + ins->tt->end_io(rq->end_io_data, error); + + blk_put_request(rq); +} + +static int null_nvm_submit_io(struct request_queue *q, struct nvm_rq *= rqd) +{ + struct request *rq; + struct bio *bio =3D rqd->bio; + + rq =3D blk_mq_alloc_request(q, bio_rw(bio), GFP_KERNEL, 0); + if (IS_ERR(rq)) + return -ENOMEM; + + rq->cmd_type =3D REQ_TYPE_DRV_PRIV; + rq->__sector =3D bio->bi_iter.bi_sector; + rq->ioprio =3D bio_prio(bio); + + if (bio_has_data(bio)) + rq->nr_phys_segments =3D bio_phys_segments(q, bio); + + rq->__data_len =3D bio->bi_iter.bi_size; + rq->bio =3D rq->biotail =3D bio; + + rq->end_io_data =3D rqd; + + blk_execute_rq_nowait(q, NULL, rq, 0, null_nvm_end_io); + + return 0; +} + +static struct nvm_dev_ops null_nvm_dev_ops =3D { + .identify =3D null_nvm_id, + .get_features =3D null_nvm_get_features, + .submit_io =3D null_nvm_submit_io, +}; + +static int null_nvm_register(struct nullb *nullb, struct gendisk *disk= ) +{ + return nvm_register(nullb->q, disk, &null_nvm_dev_ops); +} + +static void null_nvm_unregister(struct gendisk *disk) +{ + nvm_unregister(disk); +} +#else +static int null_nvm_register(struct nullb *nullb, struct gendisk *disk= ) +{ + return -EINVAL; +} +static void null_nvm_unregister(struct gendisk *disk) { } +#endif /* CONFIG_NVM */ + static int null_queue_rq(struct blk_mq_hw_ctx *hctx, const struct blk_mq_queue_data *bd) { @@ -410,6 +523,9 @@ static void null_del_dev(struct nullb *nullb) { list_del_init(&nullb->list); =20 + if (nvm_enable) + null_nvm_unregister(nullb->disk); + del_gendisk(nullb->disk); blk_cleanup_queue(nullb->q); if (queue_mode =3D=3D NULL_Q_MQ) @@ -579,11 +695,6 @@ static int null_add_dev(void) goto out_cleanup_blk_queue; } =20 - mutex_lock(&lock); - list_add_tail(&nullb->list, &nullb_list); - nullb->index =3D nullb_indexes++; - mutex_unlock(&lock); - blk_queue_logical_block_size(nullb->q, bs); blk_queue_physical_block_size(nullb->q, bs); =20 @@ -598,9 +709,24 @@ static int null_add_dev(void) disk->private_data =3D nullb; disk->queue =3D nullb->q; sprintf(disk->disk_name, "nullb%d", nullb->index); - add_disk(disk); + + if (nvm_enable) { + rv =3D null_nvm_register(nullb, disk); + if (rv) + goto out_cleanup_disk; + } else { + add_disk(disk); + } + + mutex_lock(&lock); + list_add_tail(&nullb->list, &nullb_list); + nullb->index =3D nullb_indexes++; + mutex_unlock(&lock); + return 0; =20 +out_cleanup_disk: + put_disk(disk); out_cleanup_blk_queue: blk_cleanup_queue(nullb->q); out_cleanup_tags: --=20 2.1.4