Skip to contentSkip to conversation

nvme: improve logging

PATCH New Hannes Reinecke 4 participants 6 messages Apr 10, 2019 – Apr 24, 2019 NVMe

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvme: improve logging

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>
---
 drivers/nvme/host/core.c      | 44 +++++++++++++++++++++++++++++--------------
 drivers/nvme/host/multipath.c |  5 ++++-
 2 files changed, 34 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +30 -14
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
 static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 					   unsigned nsid);
 
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{
+	static const char *const state_name[] = {
+		[NVME_CTRL_NEW]		= "new",
+		[NVME_CTRL_LIVE]	= "live",
+		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
+		[NVME_CTRL_RESETTING]	= "resetting",
+		[NVME_CTRL_CONNECTING]	= "connecting",
+		[NVME_CTRL_DELETING]	= "deleting",
+		[NVME_CTRL_DEAD]	= "dead",
+	};
+
+	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
+	    state_name[ctrl->state])
+		return state_name[ctrl->state];
+	return NULL;
+}
+
 static void nvme_set_queue_dying(struct nvme_ns *ns)
 {
 	/*
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 
 int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
 {
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+		const char *state_name = nvme_ctrl_state_name(ctrl);
+
+		dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+			 state_name ? state_name : "unknown");
 		return -EBUSY;
-	if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+	}
+	if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+		dev_dbg(ctrl->device, "ctrl reset already queued\n");
 		return -EBUSY;
+	}
 	return 0;
 }
 EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,
 				     char *buf)
 {
 	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	static const char *const state_name[] = {
-		[NVME_CTRL_NEW]		= "new",
-		[NVME_CTRL_LIVE]	= "live",
-		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
-		[NVME_CTRL_RESETTING]	= "resetting",
-		[NVME_CTRL_CONNECTING]	= "connecting",
-		[NVME_CTRL_DELETING]	= "deleting",
-		[NVME_CTRL_DEAD]	= "dead",
-	};
+	const char *state_name = nvme_ctrl_state_name(ctrl);
 
-	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-	    state_name[ctrl->state])
-		return sprintf(buf, "%s\n", state_name[ctrl->state]);
+	if (state_name)
+		return sprintf(buf, "%s\n", state_name);
 
 	return sprintf(buf, "unknown state\n");
 }
drivers/nvme/host/multipath.c +4 -1
index 503539d4616a..cca60044163b 100644
@@ -81,6 +81,9 @@ void nvme_failover_req(struct request *req)
 		 * Reset the controller for any non-ANA error as we don't know
 		 * what caused the error.
 		 */
+		dev_info(ns->ctrl->device,
+			"nvme status 0x%04x, resetting controller\n",
+			status);
 		nvme_reset_ctrl(ns->ctrl);
 		break;
 	}
@@ -423,7 +426,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
 	unsigned *nr_change_groups = data;
 	struct nvme_ns *ns;
 
-	dev_info(ctrl->device, "ANA group %d: %s.\n",
+	dev_dbg(ctrl->device, "ANA group %d: %s.\n",
 			le32_to_cpu(desc->grpid),
 			nvme_ana_state_names[desc->state]);
 
Signature · 1 line
2.16.4
#1 lore raw

PATCH 1/1 nvme: improve logging

Quoted 25 lines · Hannes Reinecke

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>
---
  drivers/nvme/host/core.c      | 44 +++++++++++++++++++++++++++++--------------
  drivers/nvme/host/multipath.c |  5 ++++-
  2 files changed, 34 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +6 -0
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
  static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
  					   unsigned nsid);
 
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{
+	static const char *const state_name[] = {
+		[NVME_CTRL_NEW]		= "new",
+		[NVME_CTRL_LIVE]	= "live",
+		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 112

Quoted 10 lines
drivers/nvme/host/core.c +10 -0
+		[NVME_CTRL_RESETTING]	= "resetting",
+		[NVME_CTRL_CONNECTING]	= "connecting",
+		[NVME_CTRL_DELETING]	= "deleting",
+		[NVME_CTRL_DEAD]	= "dead",
+	};
+
+	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
+	    state_name[ctrl->state])
+		return state_name[ctrl->state];
+	return NULL;

Hi, Hannes,

IMHO, If you want to print out "unknown" in the caller level, why don't we just
return "unknown" string itself to the caller to make caller don't need to print
out "unknown" OR "unknown state\n" just like below ?

I think this might make duplications for "unknown" string in callers.

Thanks,

Quoted 72 lines
drivers/nvme/host/core.c +14 -14
+}
+
  static void nvme_set_queue_dying(struct nvme_ns *ns)
  {
  	/*
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 
  int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
  {
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+		const char *state_name = nvme_ctrl_state_name(ctrl);
+
+		dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+			 state_name ? state_name : "unknown");
  		return -EBUSY;
-	if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+	}
+	if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+		dev_dbg(ctrl->device, "ctrl reset already queued\n");
  		return -EBUSY;
+	}
  	return 0;
  }
  EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,
  				     char *buf)
  {
  	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	static const char *const state_name[] = {
-		[NVME_CTRL_NEW]		= "new",
-		[NVME_CTRL_LIVE]	= "live",
-		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
-		[NVME_CTRL_RESETTING]	= "resetting",
-		[NVME_CTRL_CONNECTING]	= "connecting",
-		[NVME_CTRL_DELETING]	= "deleting",
-		[NVME_CTRL_DEAD]	= "dead",
-	};
+	const char *state_name = nvme_ctrl_state_name(ctrl);
 
-	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-	    state_name[ctrl->state])
-		return sprintf(buf, "%s\n", state_name[ctrl->state]);
+	if (state_name)
+		return sprintf(buf, "%s\n", state_name);
 
  	return sprintf(buf, "unknown state\n");
  }
drivers/nvme/host/multipath.c +4 -1
index 503539d4616a..cca60044163b 100644
@@ -81,6 +81,9 @@ void nvme_failover_req(struct request *req)
  		 * Reset the controller for any non-ANA error as we don't know
  		 * what caused the error.
  		 */
+		dev_info(ns->ctrl->device,
+			"nvme status 0x%04x, resetting controller\n",
+			status);
  		nvme_reset_ctrl(ns->ctrl);
  		break;
  	}
@@ -423,7 +426,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
  	unsigned *nr_change_groups = data;
  	struct nvme_ns *ns;
 
-	dev_info(ctrl->device, "ANA group %d: %s.\n",
+	dev_dbg(ctrl->device, "ANA group %d: %s.\n",
  			le32_to_cpu(desc->grpid),
  			nvme_ana_state_names[desc->state]);
 
#2 lore raw

PATCH 1/1 nvme: improve logging

Quoted 112 lines · Minwoo Im
Quoted 26 lines · Hannes Reinecke

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>

---
? drivers/nvme/host/core.c????? | 44
+++++++++++++++++++++++++++++--------------
? drivers/nvme/host/multipath.c |? 5 ++++-
? 2 files changed, 34 insertions(+), 15 deletions(-)

drivers/nvme/host/core.c +6 -0
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct 
 nvme_subsystem *subsys);
 ? static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
 ???????????????????????? unsigned nsid);
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{
+??? static const char *const state_name[] = {
+??????? [NVME_CTRL_NEW]??????? = "new",
+??????? [NVME_CTRL_LIVE]??? = "live",
+??????? [NVME_CTRL_ADMIN_ONLY]??? = "only-admin",

drivers/nvme/host/core.c static void nvme_put_subsystem(struct · line 112

Quoted 10 lines
drivers/nvme/host/core.c +10 -0
+??????? [NVME_CTRL_RESETTING]??? = "resetting",
+??????? [NVME_CTRL_CONNECTING]??? = "connecting",
+??????? [NVME_CTRL_DELETING]??? = "deleting",
+??????? [NVME_CTRL_DEAD]??? = "dead",
+??? };
+
+??? if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
+??????? state_name[ctrl->state])
+??????? return state_name[ctrl->state];
+??? return NULL;

Hi, Hannes,

IMHO, If you want to print out "unknown" in the caller level, why don't we just
return "unknown" string itself to the caller to make caller don't need to print
out "unknown" OR "unknown state\n" just like below ?

I think this might make duplications for "unknown" string in callers.

Thanks,

Quoted 62 lines
drivers/nvme/host/core.c +2 -0
+}
+
 ? static void nvme_set_queue_dying(struct nvme_ns *ns)
 ? {

????? /*

drivers/nvme/host/core.c +12 -14
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 ? int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
 ? {
-??? if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+??? if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+??????? const char *state_name = nvme_ctrl_state_name(ctrl);
+
+??????? dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+???????????? state_name ? state_name : "unknown");
 ????????? return -EBUSY;
-??? if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+??? }
+??? if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+??????? dev_dbg(ctrl->device, "ctrl reset already queued\n");
 ????????? return -EBUSY;
+??? }
 ????? return 0;
 ? }
 ? EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct 
 device *dev,
 ?????????????????????? char *buf)
 ? {
 ????? struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-??? static const char *const state_name[] = {
-??????? [NVME_CTRL_NEW]??????? = "new",
-??????? [NVME_CTRL_LIVE]??? = "live",
-??????? [NVME_CTRL_ADMIN_ONLY]??? = "only-admin",
-??????? [NVME_CTRL_RESETTING]??? = "resetting",
-??????? [NVME_CTRL_CONNECTING]??? = "connecting",
-??????? [NVME_CTRL_DELETING]??? = "deleting",
-??????? [NVME_CTRL_DEAD]??? = "dead",
-??? };
+??? const char *state_name = nvme_ctrl_state_name(ctrl);
-??? if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-??????? state_name[ctrl->state])
-??????? return sprintf(buf, "%s\n", state_name[ctrl->state]);
+??? if (state_name)
+??????? return sprintf(buf, "%s\n", state_name);
 ????? return sprintf(buf, "unknown state\n");
 ? }
drivers/nvme/host/multipath.c +0 -0
index 503539d4616a..cca60044163b 100644
@@ -81,6 +81,9 @@ void nvme_failover_req(struct request *req)

?????????? * Reset the controller for any non-ANA error as we don't know ?????????? * what caused the error.
?????????? */
+??????? dev_info(ns->ctrl->device,
+??????????? "nvme status 0x%04x, resetting controller\n", +??????????? status);
????????? nvme_reset_ctrl(ns->ctrl);
????????? break;
????? }

drivers/nvme/host/multipath.c +0 -0
@@ -423,7 +426,7 @@ static int nvme_update_ana_state(struct nvme_ctrl 
Quoted 9 lines

drivers/nvme/host/multipath.c static int nvme_update_ana_state(struct nvme_ctrl · line 432

Quoted 8 lines
drivers/nvme/host/multipath.c +1 -1
 *ctrl,
 ????? unsigned *nr_change_groups = data;
 ????? struct nvme_ns *ns;
-??? dev_info(ctrl->device, "ANA group %d: %s.\n",
+??? dev_dbg(ctrl->device, "ANA group %d: %s.\n",
 ????????????? le32_to_cpu(desc->grpid),
 ????????????? nvme_ana_state_names[desc->state]);
 

Good point. Will be resending.

Cheers,

Hannes

Signature · 5 lines
Dr. Hannes Reinecke		   Teamlead Storage & Networking
hare at suse.de			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
#3 lore raw

PATCH 1/1 nvme: improve logging

In reply to Hannes Reinecke
Quoted 21 lines · Hannes Reinecke

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>
---
  drivers/nvme/host/core.c      | 44 +++++++++++++++++++++++++++++--------------
  drivers/nvme/host/multipath.c |  5 ++++-
  2 files changed, 34 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +2 -0
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
  static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
  					   unsigned nsid);
 
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 108

Quoted 10 lines
drivers/nvme/host/core.c +10 -0
+	static const char *const state_name[] = {
+		[NVME_CTRL_NEW]		= "new",
+		[NVME_CTRL_LIVE]	= "live",
+		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
+		[NVME_CTRL_RESETTING]	= "resetting",
+		[NVME_CTRL_CONNECTING]	= "connecting",
+		[NVME_CTRL_DELETING]	= "deleting",
+		[NVME_CTRL_DEAD]	= "dead",
+	};
+

I know initially this array was defined in the function, but now since we are making this change: all the state macors are present in the nvme.h, can you please declare this array near all the NVME_CTRL_XXX macros in the same file
so it will be easier to maintain ?

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 109

Quoted 1 line
drivers/nvme/host/core.c +1 -0
+	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&

May be unsigned int in the above line to avoid any possible warnings ? Also it will be great if we can add WARN_ON()

if "if (unsigned)ctrl->state < ARRAY_SIZE(state_name)" -> false and return from there.

Quoted 41 lines
drivers/nvme/host/core.c +14 -11
+	    state_name[ctrl->state])
+		return state_name[ctrl->state];
+	return NULL;
+}
+
  static void nvme_set_queue_dying(struct nvme_ns *ns)
  {
  	/*
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 
  int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
  {
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+		const char *state_name = nvme_ctrl_state_name(ctrl);
+
+		dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+			 state_name ? state_name : "unknown");
  		return -EBUSY;
-	if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+	}
+	if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+		dev_dbg(ctrl->device, "ctrl reset already queued\n");
  		return -EBUSY;
+	}
  	return 0;
  }
  EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,
  				     char *buf)
  {
  	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	static const char *const state_name[] = {
-		[NVME_CTRL_NEW]		= "new",
-		[NVME_CTRL_LIVE]	= "live",
-		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
-		[NVME_CTRL_RESETTING]	= "resetting",
-		[NVME_CTRL_CONNECTING]	= "connecting",
-		[NVME_CTRL_DELETING]	= "deleting",
-		[NVME_CTRL_DEAD]	= "dead",
-	};

drivers/nvme/host/core.c static ssize_t nvme_sysfs_show_state(struct device *dev, · line 3005

Quoted 10 lines
drivers/nvme/host/core.c +3 -3
+	const char *state_name = nvme_ctrl_state_name(ctrl);
 
-	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-	    state_name[ctrl->state])
-		return sprintf(buf, "%s\n", state_name[ctrl->state]);
+	if (state_name)
+		return sprintf(buf, "%s\n", state_name);
 
  	return sprintf(buf, "unknown state\n");
  }

Can we move following change into the separate patch ?

Quoted 24 lines
drivers/nvme/host/multipath.c +4 -1
index 503539d4616a..cca60044163b 100644
@@ -81,6 +81,9 @@ void nvme_failover_req(struct request *req)
  		 * Reset the controller for any non-ANA error as we don't know
  		 * what caused the error.
  		 */
+		dev_info(ns->ctrl->device,
+			"nvme status 0x%04x, resetting controller\n",
+			status);
  		nvme_reset_ctrl(ns->ctrl);
  		break;
  	}
@@ -423,7 +426,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
  	unsigned *nr_change_groups = data;
  	struct nvme_ns *ns;
 
-	dev_info(ctrl->device, "ANA group %d: %s.\n",
+	dev_dbg(ctrl->device, "ANA group %d: %s.\n",
  			le32_to_cpu(desc->grpid),
  			nvme_ana_state_names[desc->state]);
 
#4 lore raw

PATCH 1/1 nvme: improve logging

Quoted 37 lines · Chaitanya Kulkarni
Quoted 21 lines · Hannes Reinecke

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>
---
   drivers/nvme/host/core.c      | 44 +++++++++++++++++++++++++++++--------------
   drivers/nvme/host/multipath.c |  5 ++++-
   2 files changed, 34 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +2 -0
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
   static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
   					   unsigned nsid);
 
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 108

Quoted 10 lines
drivers/nvme/host/core.c +10 -0
+	static const char *const state_name[] = {
+		[NVME_CTRL_NEW]		= "new",
+		[NVME_CTRL_LIVE]	= "live",
+		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
+		[NVME_CTRL_RESETTING]	= "resetting",
+		[NVME_CTRL_CONNECTING]	= "connecting",
+		[NVME_CTRL_DELETING]	= "deleting",
+		[NVME_CTRL_DEAD]	= "dead",
+	};
+

I know initially this array was defined in the function, but now since we are making this change: all the state macors are present in the nvme.h, can you please declare this array near all the NVME_CTRL_XXX macros in the same file
so it will be easier to maintain ?

Quoted 4 lines

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 109

Quoted 1 line
drivers/nvme/host/core.c +1 -0
+	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&

May be unsigned int in the above line to avoid any possible warnings ? Also it will be great if we can add WARN_ON()

Hmm. Okay, will be doing so.

Quoted 52 lines

if "if (unsigned)ctrl->state < ARRAY_SIZE(state_name)" -> false and return from there.

Quoted 49 lines
drivers/nvme/host/core.c +17 -14
+	    state_name[ctrl->state])
+		return state_name[ctrl->state];
+	return NULL;
+}
+
   static void nvme_set_queue_dying(struct nvme_ns *ns)
   {
   	/*
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 
   int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
   {
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+		const char *state_name = nvme_ctrl_state_name(ctrl);
+
+		dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+			 state_name ? state_name : "unknown");
   		return -EBUSY;
-	if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+	}
+	if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+		dev_dbg(ctrl->device, "ctrl reset already queued\n");
   		return -EBUSY;
+	}
   	return 0;
   }
   EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,
   				     char *buf)
   {
   	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	static const char *const state_name[] = {
-		[NVME_CTRL_NEW]		= "new",
-		[NVME_CTRL_LIVE]	= "live",
-		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
-		[NVME_CTRL_RESETTING]	= "resetting",
-		[NVME_CTRL_CONNECTING]	= "connecting",
-		[NVME_CTRL_DELETING]	= "deleting",
-		[NVME_CTRL_DEAD]	= "dead",
-	};
+	const char *state_name = nvme_ctrl_state_name(ctrl);
 
-	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-	    state_name[ctrl->state])
-		return sprintf(buf, "%s\n", state_name[ctrl->state]);
+	if (state_name)
+		return sprintf(buf, "%s\n", state_name);
 
Quoted 5 lines

drivers/nvme/host/core.c static ssize_t nvme_sysfs_show_state(struct device *dev, · line 3005

Quoted 2 lines
drivers/nvme/host/core.c +0 -0
   	return sprintf(buf, "unknown state\n");
   }

Can we move following change into the separate patch ?

Sure.

Will be resending the patch.

Cheers,

Hannes

Signature · 5 lines
Dr. Hannes Reinecke		   Teamlead Storage & Networking
hare at suse.de			               +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 N?rnberg
GF: Felix Imend?rffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG N?rnberg)
maintainer
#5 lore raw

PATCH 1/1 nvme: improve logging

In reply to Hannes Reinecke
Quoted 25 lines · Hannes Reinecke

Currently nvme is very reluctant if it comes to logging anything, _unless_ it's an ANA AEN. So this patch tries to remedy this by decreasing the priority for the ANA AEN logging message, and improve the logging when calling nvme_reset_ctrl().

Signed-off-by Hannes Reinecke <hare at suse.com>
---
  drivers/nvme/host/core.c      | 44 +++++++++++++++++++++++++++++--------------
  drivers/nvme/host/multipath.c |  5 ++++-
  2 files changed, 34 insertions(+), 15 deletions(-)
drivers/nvme/host/core.c +6 -0
index 8d285bfcd352..98260b2c7a6f 100644
@@ -94,6 +94,24 @@ static void nvme_put_subsystem(struct nvme_subsystem *subsys);
  static void nvme_remove_invalid_namespaces(struct nvme_ctrl *ctrl,
  					   unsigned nsid);
 
+static const char *nvme_ctrl_state_name(struct nvme_ctrl *ctrl)
+{
+	static const char *const state_name[] = {
+		[NVME_CTRL_NEW]		= "new",
+		[NVME_CTRL_LIVE]	= "live",
+		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",

drivers/nvme/host/core.c static void nvme_put_subsystem(struct nvme_subsystem *subsys); · line 112

Quoted 10 lines
drivers/nvme/host/core.c +10 -0
+		[NVME_CTRL_RESETTING]	= "resetting",
+		[NVME_CTRL_CONNECTING]	= "connecting",
+		[NVME_CTRL_DELETING]	= "deleting",
+		[NVME_CTRL_DEAD]	= "dead",
+	};
+
+	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
+	    state_name[ctrl->state])
+		return state_name[ctrl->state];
+	return NULL;

Just return "unknown" instead of NULL instead of open-coding it everywhere...

Quoted 70 lines
drivers/nvme/host/core.c +14 -14
+}
+
  static void nvme_set_queue_dying(struct nvme_ns *ns)
  {
  	/*
@@ -119,10 +137,17 @@ static void nvme_queue_scan(struct nvme_ctrl *ctrl)
 
  int nvme_reset_ctrl(struct nvme_ctrl *ctrl)
  {
-	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING))
+	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_RESETTING)) {
+		const char *state_name = nvme_ctrl_state_name(ctrl);
+
+		dev_warn(ctrl->device, "cannot reset ctrl in state %s\n",
+			 state_name ? state_name : "unknown");
  		return -EBUSY;
-	if (!queue_work(nvme_reset_wq, &ctrl->reset_work))
+	}
+	if (!queue_work(nvme_reset_wq, &ctrl->reset_work)) {
+		dev_dbg(ctrl->device, "ctrl reset already queued\n");
  		return -EBUSY;
+	}
  	return 0;
  }
  EXPORT_SYMBOL_GPL(nvme_reset_ctrl);
@@ -2971,19 +2996,10 @@ static ssize_t nvme_sysfs_show_state(struct device *dev,
  				     char *buf)
  {
  	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);
-	static const char *const state_name[] = {
-		[NVME_CTRL_NEW]		= "new",
-		[NVME_CTRL_LIVE]	= "live",
-		[NVME_CTRL_ADMIN_ONLY]	= "only-admin",
-		[NVME_CTRL_RESETTING]	= "resetting",
-		[NVME_CTRL_CONNECTING]	= "connecting",
-		[NVME_CTRL_DELETING]	= "deleting",
-		[NVME_CTRL_DEAD]	= "dead",
-	};
+	const char *state_name = nvme_ctrl_state_name(ctrl);
 
-	if ((unsigned)ctrl->state < ARRAY_SIZE(state_name) &&
-	    state_name[ctrl->state])
-		return sprintf(buf, "%s\n", state_name[ctrl->state]);
+	if (state_name)
+		return sprintf(buf, "%s\n", state_name);
 
  	return sprintf(buf, "unknown state\n");
  }
drivers/nvme/host/multipath.c +4 -1
index 503539d4616a..cca60044163b 100644
@@ -81,6 +81,9 @@ void nvme_failover_req(struct request *req)
  		 * Reset the controller for any non-ANA error as we don't know
  		 * what caused the error.
  		 */
+		dev_info(ns->ctrl->device,
+			"nvme status 0x%04x, resetting controller\n",
+			status);
  		nvme_reset_ctrl(ns->ctrl);
  		break;
  	}
@@ -423,7 +426,7 @@ static int nvme_update_ana_state(struct nvme_ctrl *ctrl,
  	unsigned *nr_change_groups = data;
  	struct nvme_ns *ns;
 
-	dev_info(ctrl->device, "ANA group %d: %s.\n",
+	dev_dbg(ctrl->device, "ANA group %d: %s.\n",
  			le32_to_cpu(desc->grpid),
  			nvme_ana_state_names[desc->state]);