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

Commit 08236c6b authored by Matias Bjørling's avatar Matias Bjørling Committed by Jens Axboe
Browse files

lightnvm: unconverted ppa returned in get_bb_tbl 



The get_bb_tbl function takes ppa as a generic address, which is
converted to the ppa device address within the device driver. When
the update_bbtbl callback is called from get_bb_tbl, the device
specific ppa is used, instead of the generic ppa.

Make sure to pass the generic ppa.

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

drivers/lightnvm/gennvm.c

+1 −2
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static int gennvm_block_bb(struct ppa_addr ppa, int nr_blocks, u8 *blks, 
	struct nvm_block *blk;

	int i;



	ppa = dev_to_generic_addr(gn->dev, ppa);

	lun = &gn->luns[(dev->nr_luns * ppa.g.ch) + ppa.g.lun];



	for (i = 0; i < nr_blocks; i++) {
@@ -187,7 +186,7 @@ static int gennvm_blocks_init(struct nvm_dev *dev, struct gen_nvm *gn) 
			ppa.g.lun = lun->vlun.id;

			ppa = generic_to_dev_addr(dev, ppa);



			ret = dev->ops->get_bb_tbl(dev->q, ppa,

			ret = dev->ops->get_bb_tbl(dev, ppa,

						dev->blks_per_lun,

						gennvm_block_bb, gn);

			if (ret)

drivers/nvme/host/lightnvm.c

+3 −1
Original line number Diff line number Diff line
@@ -355,10 +355,11 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb, 
	return ret;

}



static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa,

static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa,

				int nr_blocks, nvm_bb_update_fn *update_bbtbl,

				void *priv)

{

	struct request_queue *q = nvmdev->q;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;

	struct nvme_nvm_command c = {};
@@ -402,6 +403,7 @@ static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa, 
		goto out;

	}



	ppa = dev_to_generic_addr(nvmdev, ppa);

	ret = update_bbtbl(ppa, nr_blocks, bb_tbl->blk, priv);

	if (ret) {

		ret = -EINTR;

include/linux/lightnvm.h

+1 −1
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ typedef int (nvm_bb_update_fn)(struct ppa_addr, int, u8 *, void *); 
typedef int (nvm_id_fn)(struct request_queue *, struct nvm_id *);

typedef int (nvm_get_l2p_tbl_fn)(struct request_queue *, u64, u32,

				nvm_l2p_update_fn *, void *);

typedef int (nvm_op_bb_tbl_fn)(struct request_queue *, struct ppa_addr, int,

typedef int (nvm_op_bb_tbl_fn)(struct nvm_dev *, struct ppa_addr, int,

				nvm_bb_update_fn *, void *);

typedef int (nvm_op_set_bb_fn)(struct request_queue *, struct nvm_rq *, int);

typedef int (nvm_submit_io_fn)(struct request_queue *, struct nvm_rq *);