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

Commit fd1c1de8 authored by Minwoo Im's avatar Minwoo Im Committed by Greg Kroah-Hartman
Browse files

nvme: free sq/cq dbbuf pointers when dbbuf set fails 



[ Upstream commit 0f0d2c876c96d4908a9ef40959a44bec21bdd6cf ]

If Doorbell Buffer Config command fails even 'dev->dbbuf_dbs != NULL'
which means OACS indicates that NVME_CTRL_OACS_DBBUF_SUPP is set,
nvme_dbbuf_update_and_check_event() will check event even it's not been
successfully set.

This patch fixes mismatch among dbbuf for sq/cqs in case that dbbuf
command fails.

Signed-off-by: default avatarMinwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 49d04a69

drivers/nvme/host/pci.c

+15 −0
Original line number Diff line number Diff line
@@ -276,9 +276,21 @@ static void nvme_dbbuf_init(struct nvme_dev *dev, 
	nvmeq->dbbuf_cq_ei = &dev->dbbuf_eis[cq_idx(qid, dev->db_stride)];

}



static void nvme_dbbuf_free(struct nvme_queue *nvmeq)

{

	if (!nvmeq->qid)

		return;



	nvmeq->dbbuf_sq_db = NULL;

	nvmeq->dbbuf_cq_db = NULL;

	nvmeq->dbbuf_sq_ei = NULL;

	nvmeq->dbbuf_cq_ei = NULL;

}



static void nvme_dbbuf_set(struct nvme_dev *dev)

{

	struct nvme_command c;

	unsigned int i;



	if (!dev->dbbuf_dbs)

		return;
@@ -292,6 +304,9 @@ static void nvme_dbbuf_set(struct nvme_dev *dev) 
		dev_warn(dev->ctrl.device, "unable to set dbbuf\n");

		/* Free memory and continue on */

		nvme_dbbuf_dma_free(dev);



		for (i = 1; i <= dev->online_queues; i++)

			nvme_dbbuf_free(&dev->queues[i]);

	}

}