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

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

lightnvm: introduce helpers for generic ops in rrpc 



Avoid calling media manager and device-specific operations directly from
rrpc. Create helper functions on lightnvm's core instead.

Signed-off-by: default avatarJavier González <javier@cnexlabs.com>

Made it work with null_blk as well.
Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>

Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8e53624d

drivers/lightnvm/core.c

+22 −0
Original line number Diff line number Diff line
@@ -219,6 +219,28 @@ int nvm_erase_blk(struct nvm_tgt_dev *tgt_dev, struct ppa_addr *p, int flags) 
}

EXPORT_SYMBOL(nvm_erase_blk);



int nvm_get_l2p_tbl(struct nvm_dev *dev, u64 slba, u32 nlb,

		    nvm_l2p_update_fn *update_l2p, void *priv)

{

	if (!dev->ops->get_l2p_tbl)

		return 0;



	return dev->ops->get_l2p_tbl(dev, slba, nlb, update_l2p, priv);

}

EXPORT_SYMBOL(nvm_get_l2p_tbl);



int nvm_get_area(struct nvm_dev *dev, sector_t *lba, sector_t len)

{

	return dev->mt->get_area(dev, lba, len);

}

EXPORT_SYMBOL(nvm_get_area);



void nvm_put_area(struct nvm_dev *dev, sector_t lba)

{

	dev->mt->put_area(dev, lba);

}

EXPORT_SYMBOL(nvm_put_area);



void nvm_addr_to_generic_mode(struct nvm_dev *dev, struct nvm_rq *rqd)

{

	int i;

drivers/lightnvm/gennvm.c

+0 −2
Original line number Diff line number Diff line
@@ -175,8 +175,6 @@ static struct nvm_tgt_dev *gen_create_tgt_dev(struct nvm_dev *dev, 
	tgt_dev->geo.luns_per_chnl = (lun_balanced) ? prev_nr_luns : -1;

	tgt_dev->total_secs = nr_luns * tgt_dev->geo.sec_per_lun;

	tgt_dev->q = dev->q;

	tgt_dev->ops = dev->ops;

	tgt_dev->mt = dev->mt;

	tgt_dev->map = dev_map;

	tgt_dev->luns = luns;

	memcpy(&tgt_dev->identity, &dev->identity, sizeof(struct nvm_id));

drivers/lightnvm/rrpc.c

+12 −13
Original line number Diff line number Diff line
@@ -1166,11 +1166,8 @@ static int rrpc_map_init(struct rrpc *rrpc) 
		r->addr = ADDR_EMPTY;

	}



	if (!dev->ops->get_l2p_tbl)

		return 0;



	/* Bring up the mapping table from device */

	ret = dev->ops->get_l2p_tbl(dev->parent, rrpc->soffset, rrpc->nr_sects,

	ret = nvm_get_l2p_tbl(dev->parent, rrpc->soffset, rrpc->nr_sects,

					rrpc_l2p_update, rrpc);

	if (ret) {

		pr_err("nvm: rrpc: could not read L2P table.\n");
@@ -1258,6 +1255,9 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun) 
	int i;

	int ret;



	if (!dev->parent->ops->get_bb_tbl)

		return 0;



	nr_blks = geo->blks_per_lun * geo->plane_mode;

	blks = kmalloc(nr_blks, GFP_KERNEL);

	if (!blks)
@@ -1277,7 +1277,6 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun) 
	if (nr_blks < 0)

		return nr_blks;



	rlun->nr_free_blocks = geo->blks_per_lun;

	for (i = 0; i < nr_blks; i++) {

		if (blks[i] == NVM_BLK_T_FREE)

			continue;
@@ -1348,17 +1347,19 @@ static int rrpc_luns_init(struct rrpc *rrpc, struct ppa_addr *luns) 
			list_add_tail(&rblk->list, &rlun->free_list);

		}



		if (rrpc_bb_discovery(dev, rlun))

			goto err;



		rlun->rrpc = rrpc;

		rlun->nr_free_blocks = geo->blks_per_lun;

		rlun->reserved_blocks = 2; /* for GC only */



		rlun->rrpc = rrpc;

		INIT_LIST_HEAD(&rlun->prio_list);

		INIT_LIST_HEAD(&rlun->wblk_list);



		INIT_WORK(&rlun->ws_gc, rrpc_lun_gc);

		spin_lock_init(&rlun->lock);



		if (rrpc_bb_discovery(dev, rlun))

			goto err;



	}



	return 0;
@@ -1370,13 +1371,12 @@ static int rrpc_luns_init(struct rrpc *rrpc, struct ppa_addr *luns) 
static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin)

{

	struct nvm_tgt_dev *dev = rrpc->dev;

	struct nvmm_type *mt = dev->mt;

	sector_t size = rrpc->nr_sects * dev->geo.sec_size;

	int ret;



	size >>= 9;



	ret = mt->get_area(dev->parent, begin, size);

	ret = nvm_get_area(dev->parent, begin, size);

	if (!ret)

		*begin >>= (ilog2(dev->geo.sec_size) - 9);
@@ -1386,10 +1386,9 @@ static int rrpc_area_init(struct rrpc *rrpc, sector_t *begin) 
static void rrpc_area_free(struct rrpc *rrpc)

{

	struct nvm_tgt_dev *dev = rrpc->dev;

	struct nvmm_type *mt = dev->mt;

	sector_t begin = rrpc->soffset << (ilog2(dev->geo.sec_size) - 9);



	mt->put_area(dev->parent, begin);

	nvm_put_area(dev->parent, begin);

}



static void rrpc_free(struct rrpc *rrpc)

include/linux/lightnvm.h

+1 −4
Original line number Diff line number Diff line
@@ -320,10 +320,7 @@ struct nvm_tgt_dev { 
	struct nvm_id identity;

	struct request_queue *q;



	struct nvmm_type *mt;

	struct nvm_dev_ops *ops;



	void *parent;

	struct nvm_dev *parent;

	void *map;

};