lightnvm: implement generic path for sync I/O (1a94b2d4) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/lightnvm/core.c

+17 −8

Original line number	Original line	Diff line number	Diff line
	@@ -720,12 +720,25 @@ int nvm_submit_io(struct nvm_tgt_dev tgt_dev, struct nvm_rq rqd)
	}		}
	EXPORT_SYMBOL(nvm_submit_io);		EXPORT_SYMBOL(nvm_submit_io);

	static void nvm_end_io_sync(struct nvm_rq *rqd)		int nvm_submit_io_sync(struct nvm_tgt_dev tgt_dev, struct nvm_rq rqd)
	{		{
	struct completion *waiting = rqd->private;		struct nvm_dev *dev = tgt_dev->parent;
			int ret;

			if (!dev->ops->submit_io_sync)
			return -ENODEV;

			nvm_rq_tgt_to_dev(tgt_dev, rqd);

	complete(waiting);		rqd->dev = tgt_dev;

			/* In case of error, fail with right address format */
			ret = dev->ops->submit_io_sync(dev, rqd);
			nvm_rq_dev_to_tgt(tgt_dev, rqd);

			return ret;
	}		}
			EXPORT_SYMBOL(nvm_submit_io_sync);

	int nvm_erase_sync(struct nvm_tgt_dev tgt_dev, struct ppa_addr ppas,		int nvm_erase_sync(struct nvm_tgt_dev tgt_dev, struct ppa_addr ppas,
	int nr_ppas)		int nr_ppas)
	@@ -733,25 +746,21 @@ int nvm_erase_sync(struct nvm_tgt_dev tgt_dev, struct ppa_addr ppas,
	struct nvm_geo *geo = &tgt_dev->geo;		struct nvm_geo *geo = &tgt_dev->geo;
	struct nvm_rq rqd;		struct nvm_rq rqd;
	int ret;		int ret;
	DECLARE_COMPLETION_ONSTACK(wait);

	memset(&rqd, 0, sizeof(struct nvm_rq));		memset(&rqd, 0, sizeof(struct nvm_rq));

	rqd.opcode = NVM_OP_ERASE;		rqd.opcode = NVM_OP_ERASE;
	rqd.end_io = nvm_end_io_sync;
	rqd.private = &wait;
	rqd.flags = geo->plane_mode >> 1;		rqd.flags = geo->plane_mode >> 1;

	ret = nvm_set_rqd_ppalist(tgt_dev, &rqd, ppas, nr_ppas);		ret = nvm_set_rqd_ppalist(tgt_dev, &rqd, ppas, nr_ppas);
	if (ret)		if (ret)
	return ret;		return ret;

	ret = nvm_submit_io(tgt_dev, &rqd);		ret = nvm_submit_io_sync(tgt_dev, &rqd);
	if (ret) {		if (ret) {
	pr_err("rrpr: erase I/O submission failed: %d\n", ret);		pr_err("rrpr: erase I/O submission failed: %d\n", ret);
	goto free_ppa_list;		goto free_ppa_list;
	}		}
	wait_for_completion_io(&wait);

	free_ppa_list:		free_ppa_list:
	nvm_free_rqd_ppalist(tgt_dev, &rqd);		nvm_free_rqd_ppalist(tgt_dev, &rqd);

drivers/lightnvm/pblk-core.c

+22 −52

Original line number	Original line	Diff line number	Diff line
	@@ -412,39 +412,33 @@ int pblk_submit_io(struct pblk pblk, struct nvm_rq rqd)
	struct nvm_tgt_dev *dev = pblk->dev;		struct nvm_tgt_dev *dev = pblk->dev;

	#ifdef CONFIG_NVM_DEBUG		#ifdef CONFIG_NVM_DEBUG
	struct ppa_addr *ppa_list;		int ret;

	ppa_list = (rqd->nr_ppas > 1) ? rqd->ppa_list : &rqd->ppa_addr;		ret = pblk_check_io(pblk, rqd);
	if (pblk_boundary_ppa_checks(dev, ppa_list, rqd->nr_ppas)) {		if (ret)
	WARN_ON(1);		return ret;
	return -EINVAL;		#endif

			atomic_inc(&pblk->inflight_io);

			return nvm_submit_io(dev, rqd);
	}		}

	if (rqd->opcode == NVM_OP_PWRITE) {		int pblk_submit_io_sync(struct pblk pblk, struct nvm_rq rqd)
	struct pblk_line *line;		{
	struct ppa_addr ppa;		struct nvm_tgt_dev *dev = pblk->dev;
	int i;

	for (i = 0; i < rqd->nr_ppas; i++) {		#ifdef CONFIG_NVM_DEBUG
	ppa = ppa_list[i];		int ret;
	line = &pblk->lines[pblk_dev_ppa_to_line(ppa)];

	spin_lock(&line->lock);		ret = pblk_check_io(pblk, rqd);
	if (line->state != PBLK_LINESTATE_OPEN) {		if (ret)
	pr_err("pblk: bad ppa: line:%d,state:%d\n",		return ret;
	line->id, line->state);
	WARN_ON(1);
	spin_unlock(&line->lock);
	return -EINVAL;
	}
	spin_unlock(&line->lock);
	}
	}
	#endif		#endif

	atomic_inc(&pblk->inflight_io);		atomic_inc(&pblk->inflight_io);

	return nvm_submit_io(dev, rqd);		return nvm_submit_io_sync(dev, rqd);
	}		}

	static void pblk_bio_map_addr_endio(struct bio *bio)		static void pblk_bio_map_addr_endio(struct bio *bio)
	@@ -597,7 +591,6 @@ static int pblk_line_submit_emeta_io(struct pblk pblk, struct pblk_line line,
	int cmd_op, bio_op;		int cmd_op, bio_op;
	int i, j;		int i, j;
	int ret;		int ret;
	DECLARE_COMPLETION_ONSTACK(wait);

	if (dir == PBLK_WRITE) {		if (dir == PBLK_WRITE) {
	bio_op = REQ_OP_WRITE;		bio_op = REQ_OP_WRITE;
	@@ -639,8 +632,6 @@ static int pblk_line_submit_emeta_io(struct pblk pblk, struct pblk_line line,
	rqd.dma_ppa_list = dma_ppa_list;		rqd.dma_ppa_list = dma_ppa_list;
	rqd.opcode = cmd_op;		rqd.opcode = cmd_op;
	rqd.nr_ppas = rq_ppas;		rqd.nr_ppas = rq_ppas;
	rqd.end_io = pblk_end_io_sync;
	rqd.private = &wait;

	if (dir == PBLK_WRITE) {		if (dir == PBLK_WRITE) {
	struct pblk_sec_meta *meta_list = rqd.meta_list;		struct pblk_sec_meta *meta_list = rqd.meta_list;
	@@ -694,19 +685,14 @@ static int pblk_line_submit_emeta_io(struct pblk pblk, struct pblk_line line,
	}		}
	}		}

	ret = pblk_submit_io(pblk, &rqd);		ret = pblk_submit_io_sync(pblk, &rqd);
	if (ret) {		if (ret) {
	pr_err("pblk: emeta I/O submission failed: %d\n", ret);		pr_err("pblk: emeta I/O submission failed: %d\n", ret);
	bio_put(bio);		bio_put(bio);
	goto free_rqd_dma;		goto free_rqd_dma;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: emeta I/O timed out\n");
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);
	reinit_completion(&wait);

	if (rqd.error) {		if (rqd.error) {
	if (dir == PBLK_WRITE)		if (dir == PBLK_WRITE)
	@@ -750,7 +736,6 @@ static int pblk_line_submit_smeta_io(struct pblk pblk, struct pblk_line line,
	int i, ret;		int i, ret;
	int cmd_op, bio_op;		int cmd_op, bio_op;
	int flags;		int flags;
	DECLARE_COMPLETION_ONSTACK(wait);

	if (dir == PBLK_WRITE) {		if (dir == PBLK_WRITE) {
	bio_op = REQ_OP_WRITE;		bio_op = REQ_OP_WRITE;
	@@ -787,8 +772,6 @@ static int pblk_line_submit_smeta_io(struct pblk pblk, struct pblk_line line,
	rqd.opcode = cmd_op;		rqd.opcode = cmd_op;
	rqd.flags = flags;		rqd.flags = flags;
	rqd.nr_ppas = lm->smeta_sec;		rqd.nr_ppas = lm->smeta_sec;
	rqd.end_io = pblk_end_io_sync;
	rqd.private = &wait;

	for (i = 0; i < lm->smeta_sec; i++, paddr++) {		for (i = 0; i < lm->smeta_sec; i++, paddr++) {
	struct pblk_sec_meta *meta_list = rqd.meta_list;		struct pblk_sec_meta *meta_list = rqd.meta_list;
	@@ -807,17 +790,13 @@ static int pblk_line_submit_smeta_io(struct pblk pblk, struct pblk_line line,
	* the write thread is the only one sending write and erase commands,		* the write thread is the only one sending write and erase commands,
	* there is no need to take the LUN semaphore.		* there is no need to take the LUN semaphore.
	*/		*/
	ret = pblk_submit_io(pblk, &rqd);		ret = pblk_submit_io_sync(pblk, &rqd);
	if (ret) {		if (ret) {
	pr_err("pblk: smeta I/O submission failed: %d\n", ret);		pr_err("pblk: smeta I/O submission failed: %d\n", ret);
	bio_put(bio);		bio_put(bio);
	goto free_ppa_list;		goto free_ppa_list;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: smeta I/O timed out\n");
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);

	if (rqd.error) {		if (rqd.error) {
	@@ -861,19 +840,15 @@ static int pblk_blk_erase_sync(struct pblk *pblk, struct ppa_addr ppa)
	{		{
	struct nvm_rq rqd;		struct nvm_rq rqd;
	int ret = 0;		int ret = 0;
	DECLARE_COMPLETION_ONSTACK(wait);

	memset(&rqd, 0, sizeof(struct nvm_rq));		memset(&rqd, 0, sizeof(struct nvm_rq));

	pblk_setup_e_rq(pblk, &rqd, ppa);		pblk_setup_e_rq(pblk, &rqd, ppa);

	rqd.end_io = pblk_end_io_sync;
	rqd.private = &wait;

	/* The write thread schedules erases so that it minimizes disturbances		/* The write thread schedules erases so that it minimizes disturbances
	* with writes. Thus, there is no need to take the LUN semaphore.		* with writes. Thus, there is no need to take the LUN semaphore.
	*/		*/
	ret = pblk_submit_io(pblk, &rqd);		ret = pblk_submit_io_sync(pblk, &rqd);
	if (ret) {		if (ret) {
	struct nvm_tgt_dev *dev = pblk->dev;		struct nvm_tgt_dev *dev = pblk->dev;
	struct nvm_geo *geo = &dev->geo;		struct nvm_geo *geo = &dev->geo;
	@@ -886,11 +861,6 @@ static int pblk_blk_erase_sync(struct pblk *pblk, struct ppa_addr ppa)
	goto out;		goto out;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: sync erase timed out\n");
	}

	out:		out:
	rqd.private = pblk;		rqd.private = pblk;
	__pblk_end_io_erase(pblk, &rqd);		__pblk_end_io_erase(pblk, &rqd);

drivers/lightnvm/pblk-read.c

+3 −18

Original line number	Original line	Diff line number	Diff line
	@@ -207,7 +207,6 @@ static int pblk_fill_partial_read_bio(struct pblk pblk, struct nvm_rq rqd,
	int nr_secs = rqd->nr_ppas;		int nr_secs = rqd->nr_ppas;
	int nr_holes = nr_secs - bitmap_weight(read_bitmap, nr_secs);		int nr_holes = nr_secs - bitmap_weight(read_bitmap, nr_secs);
	int i, ret, hole;		int i, ret, hole;
	DECLARE_COMPLETION_ONSTACK(wait);

	/* Re-use allocated memory for intermediate lbas */		/* Re-use allocated memory for intermediate lbas */
	lba_list_mem = (((void *)rqd->ppa_list) + pblk_dma_ppa_size);		lba_list_mem = (((void *)rqd->ppa_list) + pblk_dma_ppa_size);
	@@ -232,8 +231,6 @@ static int pblk_fill_partial_read_bio(struct pblk pblk, struct nvm_rq rqd,
	rqd->bio = new_bio;		rqd->bio = new_bio;
	rqd->nr_ppas = nr_holes;		rqd->nr_ppas = nr_holes;
	rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_RANDOM);		rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_RANDOM);
	rqd->end_io = pblk_end_io_sync;
	rqd->private = &wait;

	if (unlikely(nr_holes == 1)) {		if (unlikely(nr_holes == 1)) {
	ppa_ptr = rqd->ppa_list;		ppa_ptr = rqd->ppa_list;
	@@ -241,18 +238,13 @@ static int pblk_fill_partial_read_bio(struct pblk pblk, struct nvm_rq rqd,
	rqd->ppa_addr = rqd->ppa_list[0];		rqd->ppa_addr = rqd->ppa_list[0];
	}		}

	ret = pblk_submit_read_io(pblk, rqd);		ret = pblk_submit_io_sync(pblk, rqd);
	if (ret) {		if (ret) {
	bio_put(rqd->bio);		bio_put(rqd->bio);
	pr_err("pblk: read IO submission failed\n");		pr_err("pblk: sync read IO submission failed\n");
	goto err;		goto err;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: partial read I/O timed out\n");
	}

	if (rqd->error) {		if (rqd->error) {
	atomic_long_inc(&pblk->read_failed);		atomic_long_inc(&pblk->read_failed);
	#ifdef CONFIG_NVM_DEBUG		#ifdef CONFIG_NVM_DEBUG
	@@ -537,7 +529,6 @@ int pblk_submit_read_gc(struct pblk pblk, struct pblk_gc_rq gc_rq)
	struct nvm_rq rqd;		struct nvm_rq rqd;
	int data_len;		int data_len;
	int ret = NVM_IO_OK;		int ret = NVM_IO_OK;
	DECLARE_COMPLETION_ONSTACK(wait);

	memset(&rqd, 0, sizeof(struct nvm_rq));		memset(&rqd, 0, sizeof(struct nvm_rq));

	@@ -577,22 +568,16 @@ int pblk_submit_read_gc(struct pblk pblk, struct pblk_gc_rq gc_rq)
	bio_set_op_attrs(bio, REQ_OP_READ, 0);		bio_set_op_attrs(bio, REQ_OP_READ, 0);

	rqd.opcode = NVM_OP_PREAD;		rqd.opcode = NVM_OP_PREAD;
	rqd.end_io = pblk_end_io_sync;
	rqd.private = &wait;
	rqd.nr_ppas = gc_rq->secs_to_gc;		rqd.nr_ppas = gc_rq->secs_to_gc;
	rqd.flags = pblk_set_read_mode(pblk, PBLK_READ_RANDOM);		rqd.flags = pblk_set_read_mode(pblk, PBLK_READ_RANDOM);
	rqd.bio = bio;		rqd.bio = bio;

	if (pblk_submit_read_io(pblk, &rqd)) {		if (pblk_submit_io_sync(pblk, &rqd)) {
	ret = -EIO;		ret = -EIO;
	pr_err("pblk: GC read request failed\n");		pr_err("pblk: GC read request failed\n");
	goto err_free_bio;		goto err_free_bio;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: GC read I/O timed out\n");
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);

	if (rqd.error) {		if (rqd.error) {

drivers/lightnvm/pblk-recovery.c

+3 −28

Original line number	Original line	Diff line number	Diff line
	@@ -216,7 +216,6 @@ static int pblk_recov_read_oob(struct pblk pblk, struct pblk_line line,
	int rq_ppas, rq_len;		int rq_ppas, rq_len;
	int i, j;		int i, j;
	int ret = 0;		int ret = 0;
	DECLARE_COMPLETION_ONSTACK(wait);

	ppa_list = p.ppa_list;		ppa_list = p.ppa_list;
	meta_list = p.meta_list;		meta_list = p.meta_list;
	@@ -253,8 +252,6 @@ static int pblk_recov_read_oob(struct pblk pblk, struct pblk_line line,
	rqd->ppa_list = ppa_list;		rqd->ppa_list = ppa_list;
	rqd->dma_ppa_list = dma_ppa_list;		rqd->dma_ppa_list = dma_ppa_list;
	rqd->dma_meta_list = dma_meta_list;		rqd->dma_meta_list = dma_meta_list;
	rqd->end_io = pblk_end_io_sync;
	rqd->private = &wait;

	if (pblk_io_aligned(pblk, rq_ppas))		if (pblk_io_aligned(pblk, rq_ppas))
	rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);		rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);
	@@ -280,19 +277,13 @@ static int pblk_recov_read_oob(struct pblk pblk, struct pblk_line line,
	}		}

	/* If read fails, more padding is needed */		/* If read fails, more padding is needed */
	ret = pblk_submit_io(pblk, rqd);		ret = pblk_submit_io_sync(pblk, rqd);
	if (ret) {		if (ret) {
	pr_err("pblk: I/O submission failed: %d\n", ret);		pr_err("pblk: I/O submission failed: %d\n", ret);
	return ret;		return ret;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: L2P recovery read timed out\n");
	return -EINTR;
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);
	reinit_completion(&wait);

	/* At this point, the read should not fail. If it does, it is a problem		/* At this point, the read should not fail. If it does, it is a problem
	* we cannot recover from here. Need FTL log.		* we cannot recover from here. Need FTL log.
	@@ -504,7 +495,6 @@ static int pblk_recov_scan_all_oob(struct pblk pblk, struct pblk_line line,
	int ret = 0;		int ret = 0;
	int rec_round;		int rec_round;
	int left_ppas = pblk_calc_sec_in_line(pblk, line) - line->cur_sec;		int left_ppas = pblk_calc_sec_in_line(pblk, line) - line->cur_sec;
	DECLARE_COMPLETION_ONSTACK(wait);

	ppa_list = p.ppa_list;		ppa_list = p.ppa_list;
	meta_list = p.meta_list;		meta_list = p.meta_list;
	@@ -539,8 +529,6 @@ static int pblk_recov_scan_all_oob(struct pblk pblk, struct pblk_line line,
	rqd->ppa_list = ppa_list;		rqd->ppa_list = ppa_list;
	rqd->dma_ppa_list = dma_ppa_list;		rqd->dma_ppa_list = dma_ppa_list;
	rqd->dma_meta_list = dma_meta_list;		rqd->dma_meta_list = dma_meta_list;
	rqd->end_io = pblk_end_io_sync;
	rqd->private = &wait;

	if (pblk_io_aligned(pblk, rq_ppas))		if (pblk_io_aligned(pblk, rq_ppas))
	rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);		rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);
	@@ -566,18 +554,13 @@ static int pblk_recov_scan_all_oob(struct pblk pblk, struct pblk_line line,
	addr_to_gen_ppa(pblk, w_ptr, line->id);		addr_to_gen_ppa(pblk, w_ptr, line->id);
	}		}

	ret = pblk_submit_io(pblk, rqd);		ret = pblk_submit_io_sync(pblk, rqd);
	if (ret) {		if (ret) {
	pr_err("pblk: I/O submission failed: %d\n", ret);		pr_err("pblk: I/O submission failed: %d\n", ret);
	return ret;		return ret;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: L2P recovery read timed out\n");
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);
	reinit_completion(&wait);

	/* This should not happen since the read failed during normal recovery,		/* This should not happen since the read failed during normal recovery,
	* but the media works funny sometimes...		* but the media works funny sometimes...
	@@ -645,7 +628,6 @@ static int pblk_recov_scan_oob(struct pblk pblk, struct pblk_line line,
	int i, j;		int i, j;
	int ret = 0;		int ret = 0;
	int left_ppas = pblk_calc_sec_in_line(pblk, line);		int left_ppas = pblk_calc_sec_in_line(pblk, line);
	DECLARE_COMPLETION_ONSTACK(wait);

	ppa_list = p.ppa_list;		ppa_list = p.ppa_list;
	meta_list = p.meta_list;		meta_list = p.meta_list;
	@@ -678,8 +660,6 @@ static int pblk_recov_scan_oob(struct pblk pblk, struct pblk_line line,
	rqd->ppa_list = ppa_list;		rqd->ppa_list = ppa_list;
	rqd->dma_ppa_list = dma_ppa_list;		rqd->dma_ppa_list = dma_ppa_list;
	rqd->dma_meta_list = dma_meta_list;		rqd->dma_meta_list = dma_meta_list;
	rqd->end_io = pblk_end_io_sync;
	rqd->private = &wait;

	if (pblk_io_aligned(pblk, rq_ppas))		if (pblk_io_aligned(pblk, rq_ppas))
	rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);		rqd->flags = pblk_set_read_mode(pblk, PBLK_READ_SEQUENTIAL);
	@@ -705,19 +685,14 @@ static int pblk_recov_scan_oob(struct pblk pblk, struct pblk_line line,
	addr_to_gen_ppa(pblk, paddr, line->id);		addr_to_gen_ppa(pblk, paddr, line->id);
	}		}

	ret = pblk_submit_io(pblk, rqd);		ret = pblk_submit_io_sync(pblk, rqd);
	if (ret) {		if (ret) {
	pr_err("pblk: I/O submission failed: %d\n", ret);		pr_err("pblk: I/O submission failed: %d\n", ret);
	bio_put(bio);		bio_put(bio);
	return ret;		return ret;
	}		}

	if (!wait_for_completion_io_timeout(&wait,
	msecs_to_jiffies(PBLK_COMMAND_TIMEOUT_MS))) {
	pr_err("pblk: L2P recovery read timed out\n");
	}
	atomic_dec(&pblk->inflight_io);		atomic_dec(&pblk->inflight_io);
	reinit_completion(&wait);

	/* Reached the end of the written line */		/* Reached the end of the written line */
	if (rqd->error) {		if (rqd->error) {

drivers/lightnvm/pblk.h

+39 −3

Original line number	Original line	Diff line number	Diff line
	@@ -714,6 +714,7 @@ void pblk_discard(struct pblk pblk, struct bio bio);
	void pblk_log_write_err(struct pblk pblk, struct nvm_rq rqd);		void pblk_log_write_err(struct pblk pblk, struct nvm_rq rqd);
	void pblk_log_read_err(struct pblk pblk, struct nvm_rq rqd);		void pblk_log_read_err(struct pblk pblk, struct nvm_rq rqd);
	int pblk_submit_io(struct pblk pblk, struct nvm_rq rqd);		int pblk_submit_io(struct pblk pblk, struct nvm_rq rqd);
			int pblk_submit_io_sync(struct pblk pblk, struct nvm_rq rqd);
	int pblk_submit_meta_io(struct pblk pblk, struct pblk_line meta_line);		int pblk_submit_meta_io(struct pblk pblk, struct pblk_line meta_line);
	struct bio pblk_bio_map_addr(struct pblk pblk, void *data,		struct bio pblk_bio_map_addr(struct pblk pblk, void *data,
	unsigned int nr_secs, unsigned int len,		unsigned int nr_secs, unsigned int len,
	@@ -1203,7 +1204,6 @@ static inline void pblk_print_failed_rqd(struct pblk pblk, struct nvm_rq rqd,

	pr_err("error:%d, ppa_status:%llx\n", error, rqd->ppa_status);		pr_err("error:%d, ppa_status:%llx\n", error, rqd->ppa_status);
	}		}
	#endif

	static inline int pblk_boundary_ppa_checks(struct nvm_tgt_dev *tgt_dev,		static inline int pblk_boundary_ppa_checks(struct nvm_tgt_dev *tgt_dev,
	struct ppa_addr *ppas, int nr_ppas)		struct ppa_addr *ppas, int nr_ppas)
	@@ -1224,14 +1224,50 @@ static inline int pblk_boundary_ppa_checks(struct nvm_tgt_dev *tgt_dev,
	ppa->g.sec < geo->sec_per_pg)		ppa->g.sec < geo->sec_per_pg)
	continue;		continue;

	#ifdef CONFIG_NVM_DEBUG
	print_ppa(ppa, "boundary", i);		print_ppa(ppa, "boundary", i);
	#endif
	return 1;		return 1;
	}		}
	return 0;		return 0;
	}		}

			static inline int pblk_check_io(struct pblk pblk, struct nvm_rq rqd)
			{
			struct nvm_tgt_dev *dev = pblk->dev;
			struct ppa_addr *ppa_list;

			ppa_list = (rqd->nr_ppas > 1) ? rqd->ppa_list : &rqd->ppa_addr;

			if (pblk_boundary_ppa_checks(dev, ppa_list, rqd->nr_ppas)) {
			WARN_ON(1);
			return -EINVAL;
			}

			if (rqd->opcode == NVM_OP_PWRITE) {
			struct pblk_line *line;
			struct ppa_addr ppa;
			int i;

			for (i = 0; i < rqd->nr_ppas; i++) {
			ppa = ppa_list[i];
			line = &pblk->lines[pblk_dev_ppa_to_line(ppa)];

			spin_lock(&line->lock);
			if (line->state != PBLK_LINESTATE_OPEN) {
			pr_err("pblk: bad ppa: line:%d,state:%d\n",
			line->id, line->state);
			WARN_ON(1);
			spin_unlock(&line->lock);
			return -EINVAL;
			}
			spin_unlock(&line->lock);
			}
			}

			return 0;
			}
			#endif

	static inline int pblk_boundary_paddr_checks(struct pblk *pblk, u64 paddr)		static inline int pblk_boundary_paddr_checks(struct pblk *pblk, u64 paddr)
	{		{
	struct pblk_line_meta *lm = &pblk->lm;		struct pblk_line_meta *lm = &pblk->lm;