Commit bf82fa2f authored by Hans Holmberg's avatar Hans Holmberg Committed by Jens Axboe
Browse files

lightnvm: pblk: fix mapping issue on failed writes 



On 1.2-devices, the mapping-out of remaning sectors in the
failed-write's block can result in an infinite loop,
stalling the write pipeline, fix this.

Fixes: 6a3abf5b ("lightnvm: pblk: rework write error recovery path")
Signed-off-by: default avatarHans Holmberg <hans.holmberg@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1864de94

drivers/lightnvm/pblk-write.c

+1 −11
Original line number Diff line number Diff line
@@ -106,8 +106,6 @@ retry: 
/* Map remaining sectors in chunk, starting from ppa */

static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa)

{

	struct nvm_tgt_dev *dev = pblk->dev;

	struct nvm_geo *geo = &dev->geo;

	struct pblk_line *line;

	struct ppa_addr map_ppa = *ppa;

	u64 paddr;
@@ -125,15 +123,7 @@ static void pblk_map_remaining(struct pblk *pblk, struct ppa_addr *ppa) 
		if (!test_and_set_bit(paddr, line->invalid_bitmap))

			le32_add_cpu(line->vsc, -1);



		if (geo->version == NVM_OCSSD_SPEC_12) {

			map_ppa.ppa++;

			if (map_ppa.g.pg == geo->num_pg)

				done = 1;

		} else {

			map_ppa.m.sec++;

			if (map_ppa.m.sec == geo->clba)

				done = 1;

		}

		done = nvm_next_ppa_in_chk(pblk->dev, &map_ppa);

	}



	line->w_err_gc->has_write_err = 1;

include/linux/lightnvm.h

+36 −0
Original line number Diff line number Diff line
@@ -593,6 +593,42 @@ static inline u32 nvm_ppa64_to_ppa32(struct nvm_dev *dev, 
	return ppa32;

}



static inline int nvm_next_ppa_in_chk(struct nvm_tgt_dev *dev,

				      struct ppa_addr *ppa)

{

	struct nvm_geo *geo = &dev->geo;

	int last = 0;



	if (geo->version == NVM_OCSSD_SPEC_12) {

		int sec = ppa->g.sec;



		sec++;

		if (sec == geo->ws_min) {

			int pg = ppa->g.pg;



			sec = 0;

			pg++;

			if (pg == geo->num_pg) {

				int pl = ppa->g.pl;



				pg = 0;

				pl++;

				if (pl == geo->num_pln)

					last = 1;



				ppa->g.pl = pl;

			}

			ppa->g.pg = pg;

		}

		ppa->g.sec = sec;

	} else {

		ppa->m.sec++;

		if (ppa->m.sec == geo->clba)

			last = 1;

	}



	return last;

}



typedef blk_qc_t (nvm_tgt_make_rq_fn)(struct request_queue *, struct bio *);

typedef sector_t (nvm_tgt_capacity_fn)(void *);

CRA Git | Maintained and supported by SUSTech CRA and CCSE