Commit ac02ddde authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

NVMe: fix build with CONFIG_NVM enabled 



Looks like I didn't test with CONFIG_NVM enabled, and neither did
the build bot.

Most of this is really weird crazy shit in the lighnvm support, though.

Struct nvme_ns is a structure for the NVM I/O command set, and it has
no business poking into it.  Second this commit:

commit 47b3115a
Author: Wenwei Tao <ww.tao0320@gmail.com>
Date:   Fri Nov 20 13:47:55 2015 +0100

    nvme: lightnvm: use admin queues for admin cmds

Does even more crazy stuff.  If a function gets a request_queue parameter
passed it'd better use that and not look for another one.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 06c1e390

drivers/nvme/host/lightnvm.c

+16 −19
Original line number Original line Diff line number Diff line
@@ -276,7 +276,6 @@ static int init_grps(struct nvm_id *nvm_id, struct nvme_nvm_id *nvme_nvm_id) 
static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id)

static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id)

{

{

	struct nvme_ns *ns = q->queuedata;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;

	struct nvme_nvm_id *nvme_nvm_id;

	struct nvme_nvm_id *nvme_nvm_id;

	struct nvme_nvm_command c = {};

	struct nvme_nvm_command c = {};

	int ret;

	int ret;
@@ -289,7 +288,7 @@ static int nvme_nvm_identity(struct request_queue *q, struct nvm_id *nvm_id) 
	if (!nvme_nvm_id)

	if (!nvme_nvm_id)

		return -ENOMEM;

		return -ENOMEM;





	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,

	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,

				nvme_nvm_id, sizeof(struct nvme_nvm_id));

				nvme_nvm_id, sizeof(struct nvme_nvm_id));

	if (ret) {

	if (ret) {

		ret = -EIO;

		ret = -EIO;
@@ -314,9 +313,8 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb, 
				nvm_l2p_update_fn *update_l2p, void *priv)

				nvm_l2p_update_fn *update_l2p, void *priv)

{

{

	struct nvme_ns *ns = q->queuedata;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;

	struct nvme_nvm_command c = {};

	struct nvme_nvm_command c = {};

	u32 len = queue_max_hw_sectors(dev->admin_q) << 9;

	u32 len = queue_max_hw_sectors(ns->ctrl->admin_q) << 9;

	u32 nlb_pr_rq = len / sizeof(u64);

	u32 nlb_pr_rq = len / sizeof(u64);

	u64 cmd_slba = slba;

	u64 cmd_slba = slba;

	void *entries;

	void *entries;
@@ -334,10 +332,10 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb, 
		c.l2p.slba = cpu_to_le64(cmd_slba);

		c.l2p.slba = cpu_to_le64(cmd_slba);

		c.l2p.nlb = cpu_to_le32(cmd_nlb);

		c.l2p.nlb = cpu_to_le32(cmd_nlb);





		ret = nvme_submit_sync_cmd(dev->admin_q,

		ret = nvme_submit_sync_cmd(ns->ctrl->admin_q,

				(struct nvme_command *)&c, entries, len);

				(struct nvme_command *)&c, entries, len);

		if (ret) {

		if (ret) {

			dev_err(dev->dev, "L2P table transfer failed (%d)\n",

			dev_err(ns->ctrl->dev, "L2P table transfer failed (%d)\n",

									ret);

									ret);

			ret = -EIO;

			ret = -EIO;

			goto out;

			goto out;
@@ -362,7 +360,7 @@ static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa, 
				void *priv)

				void *priv)

{

{

	struct nvme_ns *ns = q->queuedata;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;

	struct nvme_ctrl *ctrl = ns->ctrl;

	struct nvme_nvm_command c = {};

	struct nvme_nvm_command c = {};

	struct nvme_nvm_bb_tbl *bb_tbl;

	struct nvme_nvm_bb_tbl *bb_tbl;

	int tblsz = sizeof(struct nvme_nvm_bb_tbl) + nr_blocks;

	int tblsz = sizeof(struct nvme_nvm_bb_tbl) + nr_blocks;
@@ -376,30 +374,30 @@ static int nvme_nvm_get_bb_tbl(struct request_queue *q, struct ppa_addr ppa, 
	if (!bb_tbl)

	if (!bb_tbl)

		return -ENOMEM;

		return -ENOMEM;





	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,

	ret = nvme_submit_sync_cmd(ctrl->admin_q, (struct nvme_command *)&c,

								bb_tbl, tblsz);

								bb_tbl, tblsz);

	if (ret) {

	if (ret) {

		dev_err(dev->dev, "get bad block table failed (%d)\n", ret);

		dev_err(ctrl->dev, "get bad block table failed (%d)\n", ret);

		ret = -EIO;

		ret = -EIO;

		goto out;

		goto out;

	}

	}





	if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' ||

	if (bb_tbl->tblid[0] != 'B' || bb_tbl->tblid[1] != 'B' ||

		bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') {

		bb_tbl->tblid[2] != 'L' || bb_tbl->tblid[3] != 'T') {

		dev_err(dev->dev, "bbt format mismatch\n");

		dev_err(ctrl->dev, "bbt format mismatch\n");

		ret = -EINVAL;

		ret = -EINVAL;

		goto out;

		goto out;

	}

	}





	if (le16_to_cpu(bb_tbl->verid) != 1) {

	if (le16_to_cpu(bb_tbl->verid) != 1) {

		ret = -EINVAL;

		ret = -EINVAL;

		dev_err(dev->dev, "bbt version not supported\n");

		dev_err(ctrl->dev, "bbt version not supported\n");

		goto out;

		goto out;

	}

	}





	if (le32_to_cpu(bb_tbl->tblks) != nr_blocks) {

	if (le32_to_cpu(bb_tbl->tblks) != nr_blocks) {

		ret = -EINVAL;

		ret = -EINVAL;

		dev_err(dev->dev, "bbt unsuspected blocks returned (%u!=%u)",

		dev_err(ctrl->dev, "bbt unsuspected blocks returned (%u!=%u)",

					le32_to_cpu(bb_tbl->tblks), nr_blocks);

					le32_to_cpu(bb_tbl->tblks), nr_blocks);

		goto out;

		goto out;

	}

	}
@@ -419,7 +417,6 @@ static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq *rqd, 
								int type)

								int type)

{

{

	struct nvme_ns *ns = q->queuedata;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;

	struct nvme_nvm_command c = {};

	struct nvme_nvm_command c = {};

	int ret = 0;

	int ret = 0;
@@ -429,10 +426,10 @@ static int nvme_nvm_set_bb_tbl(struct request_queue *q, struct nvm_rq *rqd, 
	c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1);

	c.set_bb.nlb = cpu_to_le16(rqd->nr_pages - 1);

	c.set_bb.value = type;

	c.set_bb.value = type;





	ret = nvme_submit_sync_cmd(dev->admin_q, (struct nvme_command *)&c,

	ret = nvme_submit_sync_cmd(ns->ctrl->admin_q, (struct nvme_command *)&c,

								NULL, 0);

								NULL, 0);

	if (ret)

	if (ret)

		dev_err(dev->dev, "set bad block table failed (%d)\n", ret);

		dev_err(ns->ctrl->dev, "set bad block table failed (%d)\n", ret);

	return ret;

	return ret;

}

}
@@ -518,9 +515,8 @@ static int nvme_nvm_erase_block(struct request_queue *q, struct nvm_rq *rqd) 
static void *nvme_nvm_create_dma_pool(struct request_queue *q, char *name)

static void *nvme_nvm_create_dma_pool(struct request_queue *q, char *name)

{

{

	struct nvme_ns *ns = q->queuedata;

	struct nvme_ns *ns = q->queuedata;

	struct nvme_dev *dev = ns->dev;





	return dma_pool_create(name, dev->dev, PAGE_SIZE, PAGE_SIZE, 0);

	return dma_pool_create(name, ns->ctrl->dev, PAGE_SIZE, PAGE_SIZE, 0);

}

}





static void nvme_nvm_destroy_dma_pool(void *pool)

static void nvme_nvm_destroy_dma_pool(void *pool)
@@ -573,8 +569,9 @@ void nvme_nvm_unregister(struct request_queue *q, char *disk_name) 




int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)

int nvme_nvm_ns_supported(struct nvme_ns *ns, struct nvme_id_ns *id)

{

{

	struct nvme_dev *dev = ns->dev;

	struct nvme_ctrl *ctrl = ns->ctrl;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	/* XXX: this is poking into PCI structures from generic code! */

	struct pci_dev *pdev = to_pci_dev(ctrl->dev);





	/* QEMU NVMe simulator - PCI ID + Vendor specific bit */

	/* QEMU NVMe simulator - PCI ID + Vendor specific bit */

	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x5845 &&

	if (pdev->vendor == PCI_VENDOR_ID_INTEL && pdev->device == 0x5845 &&

CRA Git | Maintained and supported by SUSTech CRA and CCSE