lightnvm: pblk: stop writes gracefully when running out of lines (525f7bb2) · Commits · EulixOS / Software / Kernel

drivers/lightnvm/pblk-map.c

+29 −18

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,9 @@ static int pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
	int nr_secs = pblk->min_write_pgs;		int nr_secs = pblk->min_write_pgs;
	int i;		int i;

			if (!line)
			return -ENOSPC;

	if (pblk_line_is_full(line)) {		if (pblk_line_is_full(line)) {
	struct pblk_line *prev_line = line;		struct pblk_line *prev_line = line;

	@@ -42,8 +45,11 @@ static int pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
	line = pblk_line_replace_data(pblk);		line = pblk_line_replace_data(pblk);
	pblk_line_close_meta(pblk, prev_line);		pblk_line_close_meta(pblk, prev_line);

	if (!line)		if (!line) {
	return -EINTR;		pblk_pipeline_stop(pblk);
			return -ENOSPC;
			}

	}		}

	emeta = line->emeta;		emeta = line->emeta;
	@@ -84,7 +90,7 @@ static int pblk_map_page_data(struct pblk *pblk, unsigned int sentry,
	return 0;		return 0;
	}		}

	void pblk_map_rq(struct pblk pblk, struct nvm_rq rqd, unsigned int sentry,		int pblk_map_rq(struct pblk pblk, struct nvm_rq rqd, unsigned int sentry,
	unsigned long *lun_bitmap, unsigned int valid_secs,		unsigned long *lun_bitmap, unsigned int valid_secs,
	unsigned int off)		unsigned int off)
	{		{
	@@ -93,20 +99,22 @@ void pblk_map_rq(struct pblk pblk, struct nvm_rq rqd, unsigned int sentry,
	unsigned int map_secs;		unsigned int map_secs;
	int min = pblk->min_write_pgs;		int min = pblk->min_write_pgs;
	int i;		int i;
			int ret;

	for (i = off; i < rqd->nr_ppas; i += min) {		for (i = off; i < rqd->nr_ppas; i += min) {
	map_secs = (i + min > valid_secs) ? (valid_secs % min) : min;		map_secs = (i + min > valid_secs) ? (valid_secs % min) : min;
	if (pblk_map_page_data(pblk, sentry + i, &ppa_list[i],
	lun_bitmap, &meta_list[i], map_secs)) {		ret = pblk_map_page_data(pblk, sentry + i, &ppa_list[i],
	bio_put(rqd->bio);		lun_bitmap, &meta_list[i], map_secs);
	pblk_free_rqd(pblk, rqd, PBLK_WRITE);		if (ret)
	pblk_pipeline_stop(pblk);		return ret;
	}
	}		}

			return 0;
	}		}

	/* only if erase_ppa is set, acquire erase semaphore */		/* only if erase_ppa is set, acquire erase semaphore */
	void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,		int pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	unsigned int sentry, unsigned long *lun_bitmap,		unsigned int sentry, unsigned long *lun_bitmap,
	unsigned int valid_secs, struct ppa_addr *erase_ppa)		unsigned int valid_secs, struct ppa_addr *erase_ppa)
	{		{
	@@ -119,15 +127,16 @@ void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	unsigned int map_secs;		unsigned int map_secs;
	int min = pblk->min_write_pgs;		int min = pblk->min_write_pgs;
	int i, erase_lun;		int i, erase_lun;
			int ret;


	for (i = 0; i < rqd->nr_ppas; i += min) {		for (i = 0; i < rqd->nr_ppas; i += min) {
	map_secs = (i + min > valid_secs) ? (valid_secs % min) : min;		map_secs = (i + min > valid_secs) ? (valid_secs % min) : min;
	if (pblk_map_page_data(pblk, sentry + i, &ppa_list[i],
	lun_bitmap, &meta_list[i], map_secs)) {		ret = pblk_map_page_data(pblk, sentry + i, &ppa_list[i],
	bio_put(rqd->bio);		lun_bitmap, &meta_list[i], map_secs);
	pblk_free_rqd(pblk, rqd, PBLK_WRITE);		if (ret)
	pblk_pipeline_stop(pblk);		return ret;
	}

	erase_lun = pblk_ppa_to_pos(geo, ppa_list[i]);		erase_lun = pblk_ppa_to_pos(geo, ppa_list[i]);

	@@ -163,7 +172,7 @@ void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	*/		*/
	e_line = pblk_line_get_erase(pblk);		e_line = pblk_line_get_erase(pblk);
	if (!e_line)		if (!e_line)
	return;		return -ENOSPC;

	/* Erase blocks that are bad in this line but might not be in next */		/* Erase blocks that are bad in this line but might not be in next */
	if (unlikely(pblk_ppa_empty(*erase_ppa)) &&		if (unlikely(pblk_ppa_empty(*erase_ppa)) &&
	@@ -174,7 +183,7 @@ void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	bit = find_next_bit(d_line->blk_bitmap,		bit = find_next_bit(d_line->blk_bitmap,
	lm->blk_per_line, bit + 1);		lm->blk_per_line, bit + 1);
	if (bit >= lm->blk_per_line)		if (bit >= lm->blk_per_line)
	return;		return 0;

	spin_lock(&e_line->lock);		spin_lock(&e_line->lock);
	if (test_bit(bit, e_line->erase_bitmap)) {		if (test_bit(bit, e_line->erase_bitmap)) {
	@@ -188,4 +197,6 @@ void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	erase_ppa = pblk->luns[bit].bppa; / set ch and lun */		erase_ppa = pblk->luns[bit].bppa; / set ch and lun */
	erase_ppa->a.blk = e_line->id;		erase_ppa->a.blk = e_line->id;
	}		}

			return 0;
	}		}

drivers/lightnvm/pblk-write.c

+20 −10

Original line number	Original line	Diff line number	Diff line
	@@ -334,12 +334,13 @@ static int pblk_setup_w_rq(struct pblk pblk, struct nvm_rq rqd,
	}		}

	if (likely(!e_line \|\| !atomic_read(&e_line->left_eblks)))		if (likely(!e_line \|\| !atomic_read(&e_line->left_eblks)))
	pblk_map_rq(pblk, rqd, c_ctx->sentry, lun_bitmap, valid, 0);		ret = pblk_map_rq(pblk, rqd, c_ctx->sentry, lun_bitmap,
			valid, 0);
	else		else
	pblk_map_erase_rq(pblk, rqd, c_ctx->sentry, lun_bitmap,		ret = pblk_map_erase_rq(pblk, rqd, c_ctx->sentry, lun_bitmap,
	valid, erase_ppa);		valid, erase_ppa);

	return 0;		return ret;
	}		}

	static int pblk_calc_secs_to_sync(struct pblk *pblk, unsigned int secs_avail,		static int pblk_calc_secs_to_sync(struct pblk *pblk, unsigned int secs_avail,
	@@ -563,7 +564,7 @@ static void pblk_free_write_rqd(struct pblk pblk, struct nvm_rq rqd)
	c_ctx->nr_padded);		c_ctx->nr_padded);
	}		}

	static int pblk_submit_write(struct pblk *pblk)		static int pblk_submit_write(struct pblk pblk, int secs_left)
	{		{
	struct bio *bio;		struct bio *bio;
	struct nvm_rq *rqd;		struct nvm_rq *rqd;
	@@ -572,6 +573,8 @@ static int pblk_submit_write(struct pblk *pblk)
	unsigned long pos;		unsigned long pos;
	unsigned int resubmit;		unsigned int resubmit;

			*secs_left = 0;

	spin_lock(&pblk->resubmit_lock);		spin_lock(&pblk->resubmit_lock);
	resubmit = !list_empty(&pblk->resubmit_list);		resubmit = !list_empty(&pblk->resubmit_list);
	spin_unlock(&pblk->resubmit_lock);		spin_unlock(&pblk->resubmit_lock);
	@@ -601,17 +604,17 @@ static int pblk_submit_write(struct pblk *pblk)
	*/		*/
	secs_avail = pblk_rb_read_count(&pblk->rwb);		secs_avail = pblk_rb_read_count(&pblk->rwb);
	if (!secs_avail)		if (!secs_avail)
	return 1;		return 0;

	secs_to_flush = pblk_rb_flush_point_count(&pblk->rwb);		secs_to_flush = pblk_rb_flush_point_count(&pblk->rwb);
	if (!secs_to_flush && secs_avail < pblk->min_write_pgs)		if (!secs_to_flush && secs_avail < pblk->min_write_pgs)
	return 1;		return 0;

	secs_to_sync = pblk_calc_secs_to_sync(pblk, secs_avail,		secs_to_sync = pblk_calc_secs_to_sync(pblk, secs_avail,
	secs_to_flush);		secs_to_flush);
	if (secs_to_sync > pblk->max_write_pgs) {		if (secs_to_sync > pblk->max_write_pgs) {
	pblk_err(pblk, "bad buffer sync calculation\n");		pblk_err(pblk, "bad buffer sync calculation\n");
	return 1;		return 0;
	}		}

	secs_to_com = (secs_to_sync > secs_avail) ?		secs_to_com = (secs_to_sync > secs_avail) ?
	@@ -640,6 +643,7 @@ static int pblk_submit_write(struct pblk *pblk)
	atomic_long_add(secs_to_sync, &pblk->sub_writes);		atomic_long_add(secs_to_sync, &pblk->sub_writes);
	#endif		#endif

			*secs_left = 1;
	return 0;		return 0;

	fail_free_bio:		fail_free_bio:
	@@ -648,16 +652,22 @@ static int pblk_submit_write(struct pblk *pblk)
	bio_put(bio);		bio_put(bio);
	pblk_free_rqd(pblk, rqd, PBLK_WRITE);		pblk_free_rqd(pblk, rqd, PBLK_WRITE);

	return 1;		return -EINTR;
	}		}

	int pblk_write_ts(void *data)		int pblk_write_ts(void *data)
	{		{
	struct pblk *pblk = data;		struct pblk *pblk = data;
			int secs_left;
			int write_failure = 0;

	while (!kthread_should_stop()) {		while (!kthread_should_stop()) {
	if (!pblk_submit_write(pblk))		if (!write_failure) {
			write_failure = pblk_submit_write(pblk, &secs_left);

			if (secs_left)
	continue;		continue;
			}
	set_current_state(TASK_INTERRUPTIBLE);		set_current_state(TASK_INTERRUPTIBLE);
	io_schedule();		io_schedule();
	}		}

drivers/lightnvm/pblk.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -871,10 +871,10 @@ int pblk_write_gc_to_cache(struct pblk pblk, struct pblk_gc_rq gc_rq);
	/*		/*
	* pblk map		* pblk map
	*/		*/
	void pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,		int pblk_map_erase_rq(struct pblk pblk, struct nvm_rq rqd,
	unsigned int sentry, unsigned long *lun_bitmap,		unsigned int sentry, unsigned long *lun_bitmap,
	unsigned int valid_secs, struct ppa_addr *erase_ppa);		unsigned int valid_secs, struct ppa_addr *erase_ppa);
	void pblk_map_rq(struct pblk pblk, struct nvm_rq rqd, unsigned int sentry,		int pblk_map_rq(struct pblk pblk, struct nvm_rq rqd, unsigned int sentry,
	unsigned long *lun_bitmap, unsigned int valid_secs,		unsigned long *lun_bitmap, unsigned int valid_secs,
	unsigned int off);		unsigned int off);