nvme-pci: fix var. type for increasing cq_head
diff mbox series

Message ID YMrlaTjfyy9slGg6@localhost
State Accepted
Commit a0aac973a26d1ac814b9e131e209eb39472a67ce
Headers show
  • nvme-pci: fix var. type for increasing cq_head
Related show

Commit Message

JK Kim June 17, 2021, 6:02 a.m. UTC
nvmeq->cq_head is compared with nvmeq->q_depth and changed the value
and cq_phase for handling the next cq db.

but, nvmeq->q_depth's type is u32 and max. value is 0x10000 when
CQP.MSQE is 0xffff and io_queue_depth is 0x10000.

current temp. variable for comparing with nvmeq->q_depth is overflowed
when previous nvmeq->cq_head is 0xffff.

in this case, nvmeq->cq_phase is not updated.
so, fix data type for temp. variable to u32.

Signed-off-by: JK Kim <jongkang.kim2@gmail.com>
 drivers/nvme/host/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Christoph Hellwig June 17, 2021, 1:55 p.m. UTC | #1

applied to nvme-5.14.

diff mbox series

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index a29b170701fc..2995e87ce776 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1032,7 +1032,7 @@  static inline void nvme_handle_cqe(struct nvme_queue *nvmeq, u16 idx)
 static inline void nvme_update_cq_head(struct nvme_queue *nvmeq)
-	u16 tmp = nvmeq->cq_head + 1;
+	u32 tmp = nvmeq->cq_head + 1;
 	if (tmp == nvmeq->q_depth) {
 		nvmeq->cq_head = 0;