Skip to contentSkip to conversation

Few NVME fixes

PATCH New Maxim Levitsky 4 participants 6 messages May 2, 2019 – May 8, 2019 NVMe

lore
Share & tools
lore
#0 lore raw

cover Few NVME fixes

Hi,

I am sending here two fixes for bugs I found during develpment of nvme-mdev driver.
Patches are based on http://git.infradead.org/nvme.git nvme-5.2

Best regards,
Maxim Levitsky

Maxim Levitsky (2):
nvme/pci: init shadow doorbell after each reset
nvme/pci: add known admin effects to augument admin effects log page

 drivers/nvme/host/core.c | 4 ++--
 drivers/nvme/host/pci.c  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
Signature · 1 line
2.17.2
#1 lore raw

PATCH 1/2 nvme/pci: init shadow doorbell after each reset

The spec states
"The settings are not retained across a Controller Level Reset" Therefore the driver must enable the shadow doorbell, after each reset.

This was caught while testing the nvme driver over upcoming nvme-mdev device

Signed-off-by Maxim Levitsky <mlevitsk at redhat.com>
---
 drivers/nvme/host/pci.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/nvme/host/pci.c +1 -2
index 1f468a16efad..1c844c66ecaa 100644
@@ -2303,8 +2303,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
 			return ret;
 		}
 		dev->ctrl.tagset = &dev->tagset;
-
-		nvme_dbbuf_set(dev);
 	} else {
 		blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
 
@@ -2312,6 +2310,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
 		nvme_free_queues(dev, dev->online_queues);
 	}
 
+	nvme_dbbuf_set(dev);
 	return 0;
 }
 
Signature · 1 line
2.17.2
#2 lore raw

PATCH 1/2 nvme/pci: init shadow doorbell after each reset

Quoted 10 lines · Maxim Levitsky
drivers/nvme/host/pci.c +0 -2
@@ -2303,8 +2303,6 @@ static int nvme_dev_add(struct nvme_dev *dev)
 			return ret;
 		}
 		dev->ctrl.tagset = &dev->tagset;
-
-		nvme_dbbuf_set(dev);
 	} else {
 		blk_mq_update_nr_hw_queues(&dev->tagset, dev->online_queues - 1);
 

drivers/nvme/host/pci.c static int nvme_dev_add(struct nvme_dev *dev) · line 2315

Quoted 6 lines
drivers/nvme/host/pci.c +1 -0
@@ -2312,6 +2310,7 @@ static int nvme_dev_add(struct nvme_dev *dev)
 		nvme_free_queues(dev, dev->online_queues);
 	}
 
+	nvme_dbbuf_set(dev);
 	return 0;
 }

Looks good.

Reviewed-by Keith Busch <keith.busch at intel.com>
#3 lore raw

PATCH 1/2 nvme/pci: init shadow doorbell after each reset

In reply to Maxim Levitsky
Quoted 12 lines

-----Original Message-----
From: Linux-nvme [mailto:linux-nvme-bounces at lists.infradead.org] On Behalf Of Maxim Levitsky
Sent: Thursday, May 02, 2019 8:32 PM
To: linux-nvme at lists.infradead.org
Subject: [PATCH 1/2] nvme/pci: init shadow doorbell after each reset

The spec states
"The settings are not retained across a Controller Level Reset" Therefore the driver must enable the shadow doorbell, after each reset.

Quoted 4 lines

This was caught while testing the nvme driver over upcoming nvme-mdev device

Signed-off-by Maxim Levitsky <mlevitsk at redhat.com>

It looks good to me.

Reviewed-by Minwoo Im <minwoo.im at samsung.com>
#4 lore raw

PATCH 2/2 nvme/pci: add known admin effects to augument admin effects log page

In reply to Maxim Levitsky

Add known admin effects even if hardware has known admin effects page, since hardware can't be ever trusted to report sane values. (on my Intel DC P3700, it reports no side effects for namespace format)

Signed-off-by Maxim Levitsky <mlevitsk at redhat.com>
---
 drivers/nvme/host/core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/host/core.c +2 -2
index 3dd043aa6d1f..2e11d014d514 100644
@@ -1259,8 +1259,8 @@ static u32 nvme_passthru_start(struct nvme_ctrl *ctrl, struct nvme_ns *ns,
 
 	if (ctrl->effects)
 		effects = le32_to_cpu(ctrl->effects->acs[opcode]);
-	else
-		effects = nvme_known_admin_effects(opcode);
+
+	effects |= nvme_known_admin_effects(opcode);
 
 	/*
 	 * For simplicity, IO to all namespaces is quiesced even if the command
Signature · 1 line
2.17.2