Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb314979 authored by Javier González's avatar Javier González Committed by Jens Axboe
Browse files

lightnvm: enable to send hint to erase command 



Erases might be subject to host hints. An example is multi-plane
programming to erase blocks in parallel. Enable targets to specify this
hint.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 3dc87dd0

drivers/lightnvm/core.c

+6 −3
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ int nvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) 
}

EXPORT_SYMBOL(nvm_submit_io);



int nvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk)

int nvm_erase_blk(struct nvm_dev *dev, struct nvm_block *blk, int flags)

{

	return dev->mt->erase_blk(dev, blk, 0);

	return dev->mt->erase_blk(dev, blk, flags);

}

EXPORT_SYMBOL(nvm_erase_blk);
@@ -285,7 +285,8 @@ void nvm_free_rqd_ppalist(struct nvm_dev *dev, struct nvm_rq *rqd) 
}

EXPORT_SYMBOL(nvm_free_rqd_ppalist);



int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas)

int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas,

								int flags)

{

	struct nvm_rq rqd;

	int ret;
@@ -301,6 +302,8 @@ int nvm_erase_ppa(struct nvm_dev *dev, struct ppa_addr *ppas, int nr_ppas) 


	nvm_generic_to_addr_mode(dev, &rqd);



	rqd.flags = flags;



	ret = dev->ops->erase_block(dev, &rqd);



	nvm_free_rqd_ppalist(dev, &rqd);

drivers/lightnvm/gennvm.c

+2 −3
Original line number Diff line number Diff line
@@ -593,12 +593,11 @@ static int gen_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd) 
	return dev->ops->submit_io(dev, rqd);

}



static int gen_erase_blk(struct nvm_dev *dev, struct nvm_block *blk,

							unsigned long flags)

static int gen_erase_blk(struct nvm_dev *dev, struct nvm_block *blk, int flags)

{

	struct ppa_addr addr = block_to_ppa(dev, blk);



	return nvm_erase_ppa(dev, &addr, 1);

	return nvm_erase_ppa(dev, &addr, 1, flags);

}



static int gen_reserve_lun(struct nvm_dev *dev, int lunid)

drivers/lightnvm/rrpc.c

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ static void rrpc_block_gc(struct work_struct *work) 
	if (rrpc_move_valid_pages(rrpc, rblk))

		goto put_back;



	if (nvm_erase_blk(dev, rblk->parent))

	if (nvm_erase_blk(dev, rblk->parent, 0))

		goto put_back;



	rrpc_put_blk(rrpc, rblk);

drivers/lightnvm/sysblk.c

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ static int nvm_prepare_new_sysblks(struct nvm_dev *dev, struct sysblk_scan *s) 
		ppa = &s->ppas[scan_ppa_idx(i, nxt_blk)];

		ppa->g.pg = ppa_to_slc(dev, 0);



		ret = nvm_erase_ppa(dev, ppa, 1);

		ret = nvm_erase_ppa(dev, ppa, 1, 0);

		if (ret)

			return ret;
@@ -725,7 +725,7 @@ int nvm_dev_factory(struct nvm_dev *dev, int flags) 
	/* continue to erase until list of blks until empty */

	while ((ppa_cnt =

			nvm_fact_get_blks(dev, ppas, max_ppas, blk_bitmap)) > 0)

		nvm_erase_ppa(dev, ppas, ppa_cnt);

		nvm_erase_ppa(dev, ppas, ppa_cnt, 0);



	/* mark host reserved blocks free */

	if (flags & NVM_FACTORY_RESET_HOST_BLKS) {

drivers/nvme/host/lightnvm.c

+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ static int nvme_nvm_erase_block(struct nvm_dev *dev, struct nvm_rq *rqd) 
	c.erase.nsid = cpu_to_le32(ns->ns_id);

	c.erase.spba = cpu_to_le64(rqd->ppa_addr.ppa);

	c.erase.length = cpu_to_le16(rqd->nr_ppas - 1);

	c.erase.control = cpu_to_le16(rqd->flags);



	return nvme_submit_sync_cmd(q, (struct nvme_command *)&c, NULL, 0);

}