[2/2] ndctl, intel: Pre-initialize smart shutdown_count

Commit Message

Keith Busch Aug. 7, 2018, 10:24 p.m. UTC

A user space rule saves the unsafe shutdown count to a fixed location
for Intel dimms so that non-root users can read it. This patch uses that
saved value if it is available in case the command can't be executed due
to user permissions, allowing an application to detect if an unsafe
shutdown occured during a write.

Signed-off-by: Keith Busch <[e-mail]>
---
 ndctl/lib/intel.c       | 42 +++++++++++++++++++++++++++++++++++++-----
 ndctl/util/json-smart.c |  4 ----
 2 files changed, 37 insertions(+), 9 deletions(-)

Patch

diff --git a/ndctl/lib/intel.c b/ndctl/lib/intel.c
index 0abea1e..6df5aff 100644
--- a/ndctl/lib/intel.c
+++ b/ndctl/lib/intel.c
@@ -56,6 +56,35 @@  static struct ndctl_cmd *alloc_intel_cmd(struct ndctl_dimm *dimm,
 	return cmd;
 }
 
+/*
+ * If provided, prime the shutdown count with the saved value in case the user
+ * does not have access rights to run the smart command.
+ */
+static void intel_prime_shutdown_count(struct ndctl_dimm *dimm,
+				       struct ndctl_cmd *cmd)
+{
+	char *path = NULL, shutdown_count[16] = {};
+	int fd;
+
+	if (asprintf(&path, DEF_TMPFS_DIR "/%s/usc",
+		     ndctl_dimm_get_unique_id(dimm)) < 0)
+		return;
+
+	fd = open(path, O_RDONLY);
+	if (fd < 0)
+		goto free_path;
+
+	if (read(fd, shutdown_count, sizeof(shutdown_count)) < 0)
+		goto close;
+
+	cmd->intel->smart.flags |= ND_INTEL_SMART_SHUTDOWN_COUNT_VALID;
+	cmd->intel->smart.shutdown_count = strtoull(shutdown_count, NULL, 0);
+ close:
+	close (fd);
+ free_path:
+	free(path);
+}
+
 static struct ndctl_cmd *intel_dimm_cmd_new_smart(struct ndctl_dimm *dimm)
 {
 	struct ndctl_cmd *cmd;
@@ -67,7 +96,7 @@  static struct ndctl_cmd *intel_dimm_cmd_new_smart(struct ndctl_dimm *dimm)
 	if (!cmd)
 		return NULL;
 	cmd->firmware_status = &cmd->intel->smart.status;
-
+	intel_prime_shutdown_count(dimm, cmd);
 	return cmd;
 }
 
@@ -95,9 +124,6 @@  static unsigned int intel_cmd_smart_get_flags(struct ndctl_cmd *cmd)
 	unsigned int flags = 0;
 	unsigned int intel_flags;
 
-	if (intel_smart_valid(cmd) < 0)
-		return 0;
-
 	/* translate intel specific flags to libndctl api smart flags */
 	intel_flags = cmd->intel->smart.flags;
 	if (intel_flags & ND_INTEL_SMART_HEALTH_VALID)
@@ -142,13 +168,19 @@  static unsigned int intel_cmd_smart_get_health(struct ndctl_cmd *cmd)
 	return health;
 }
 
+static unsigned int intel_cmd_smart_get_shutdown_count(struct ndctl_cmd *cmd)
+{
+	if (cmd->intel->smart.flags & ND_INTEL_SMART_SHUTDOWN_COUNT_VALID)
+		return cmd->intel->smart.shutdown_count;
+	return UINT_MAX;
+}
+
 intel_smart_get_field(cmd, media_temperature)
 intel_smart_get_field(cmd, ctrl_temperature)
 intel_smart_get_field(cmd, spares)
 intel_smart_get_field(cmd, alarm_flags)
 intel_smart_get_field(cmd, life_used)
 intel_smart_get_field(cmd, shutdown_state)
-intel_smart_get_field(cmd, shutdown_count)
 intel_smart_get_field(cmd, vendor_size)
 
 static unsigned char *intel_cmd_smart_get_vendor_data(struct ndctl_cmd *cmd)
diff --git a/ndctl/util/json-smart.c b/ndctl/util/json-smart.c
index 6a1f294..5f43982 100644
--- a/ndctl/util/json-smart.c
+++ b/ndctl/util/json-smart.c
@@ -93,7 +93,6 @@  struct json_object *util_dimm_health_to_json(struct ndctl_dimm *dimm)
 		jobj = json_object_new_string("unknown");
 		if (jobj)
 			json_object_object_add(jhealth, "health_state", jobj);
-		goto out;
 	}
 
 	flags = ndctl_cmd_smart_get_flags(cmd);
@@ -189,8 +188,5 @@  struct json_object *util_dimm_health_to_json(struct ndctl_dimm *dimm)
  err:
 	json_object_put(jhealth);
 	jhealth = NULL;
- out:
-	if (cmd)
-		ndctl_cmd_unref(cmd);
 	return jhealth;
 }