Changeset 3132

Timestamp:

08/17/10 20:27:19 (3 years ago)

Author:

chrfranke

Message:

Allow SMART threshold entries at positions different from attribute table.

Location:

trunk/smartmontools

Files:

• CHANGELOG (modified) (1 diff)
• atacmds.cpp (modified) (3 diffs)
• atacmds.h (modified) (2 diffs)
• ataprint.cpp (modified) (4 diffs)
• smartd.cpp (modified) (3 diffs)

trunk/smartmontools/CHANGELOG

@@ -43 +43 @@
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Allow SMART threshold entries at positions different from
+       attribute table. This fixes attribute output for recent
+       SSDs with SandForce controller.
+
   [CF] smartctl: Add option '-t vendor,N' to issue ATA
        command SMART EXECUTE OFF-LINE IMMEDIATE with

trunk/smartmontools/atacmds.cpp

@@ -1742 +1742 @@
 // Get attribute state
 ata_attr_state ata_get_attr_state(const ata_smart_attribute & attr,
-                                  const ata_smart_threshold_entry & thre,
-                                  const ata_vendor_attr_defs & defs)
+                                  int attridx,
+                                  const ata_smart_threshold_entry * thresholds,
+                                  const ata_vendor_attr_defs & defs,
+                                  unsigned char * threshval /* = 0 */)
 {
   if (!attr.id)
@@ -1754 +1756 @@
     return ATTRSTATE_NO_NORMVAL;
 
-  // No threshold if thresholds cannot be read.
-  if (!thre.id && !thre.threshold)
-    return ATTRSTATE_NO_THRESHOLD;
-
-  // Bad threshold if id's don't match
-  if (attr.id != thre.id)
-    return ATTRSTATE_BAD_THRESHOLD;
+  // Normally threshold is at same index as attribute
+  int i = attridx;
+  if (thresholds[i].id != attr.id) {
+    // Find threshold id in table
+    for (i = 0; thresholds[i].id != attr.id; ) {
+      if (++i >= NUMBER_ATA_SMART_ATTRIBUTES)
+        // Threshold id missing or thresholds cannot be read
+        return ATTRSTATE_NO_THRESHOLD;
+    }
+  }
+  unsigned char threshold = thresholds[i].threshold;
+
+  // Return threshold if requested
+  if (threshval)
+    *threshval = threshold;
 
   // Don't report a failed attribute if its threshold is 0.
@@ -1766 +1776 @@
   // threshold (Later ATA versions declare all thresholds as "obsolete").
   // In practice, threshold value 0 is often used for usage attributes.
-  if (!thre.threshold)
+  if (!threshold)
     return ATTRSTATE_OK;
 
   // Failed now if current value is below threshold
-  if (attr.current <= thre.threshold)
+  if (attr.current <= threshold)
     return ATTRSTATE_FAILED_NOW;
 
   // Failed in the past if worst value is below threshold
-  if (!(defs[attr.id].flags & ATTRFLAG_NO_WORSTVAL) && attr.worst <= thre.threshold)
+  if (!(defs[attr.id].flags & ATTRFLAG_NO_WORSTVAL) && attr.worst <= threshold)
     return ATTRSTATE_FAILED_PAST;
 

trunk/smartmontools/atacmds.h

@@ -827 +827 @@
   ATTRSTATE_NON_EXISTING,   // No such Attribute
   ATTRSTATE_NO_NORMVAL,     // Normalized value not valid
-  ATTRSTATE_BAD_THRESHOLD,  // Threshold not valid
   ATTRSTATE_NO_THRESHOLD,   // Unknown or no threshold
   ATTRSTATE_OK,             // Never failed
@@ -836 +835 @@
 // Get attribute state
 ata_attr_state ata_get_attr_state(const ata_smart_attribute & attr,
-                                  const ata_smart_threshold_entry & thre,
-                                  const ata_vendor_attr_defs & defs);
+                                  int attridx,
+                                  const ata_smart_threshold_entry * thresholds,
+                                  const ata_vendor_attr_defs & defs,
+                                  unsigned char * threshval = 0);
 
 // Get attribute raw value.

trunk/smartmontools/ataprint.cpp

@@ -787 +787 @@
     const ata_smart_attribute & attr = data->vendor_attributes[i];
 
-    ata_attr_state state = ata_get_attr_state(attr,
-                             thresholds->thres_entries[i], defs);
+    ata_attr_state state = ata_get_attr_state(attr, i, thresholds->thres_entries, defs);
 
     if (!onlyfailed) {
@@ -815 +814 @@
   for (int i = 0; i < NUMBER_ATA_SMART_ATTRIBUTES; i++) {
     const ata_smart_attribute & attr = data->vendor_attributes[i];
-    const ata_smart_threshold_entry & thre = thresholds->thres_entries[i];
+    //const ata_smart_threshold_entry & thre = thresholds->thres_entries[i];
 
     // Check attribute and threshold
-    ata_attr_state state = ata_get_attr_state(attr, thre, defs);
+    unsigned char threshold = 0;
+    ata_attr_state state = ata_get_attr_state(attr, i, thresholds->thres_entries, defs, &threshold);
     if (state == ATTRSTATE_NON_EXISTING)
       continue;
@@ -850 +850 @@
       worstr = "---";
     if (state > ATTRSTATE_NO_THRESHOLD)
-      threstr = strprintf("%.3d", thre.threshold);
+      threstr = strprintf("%.3d", threshold);
     else
       threstr = "---";
@@ -865 +865 @@
                                            "    -"        ),
          ata_format_attr_raw_value(attr, defs).c_str());
-
-    // Print a warning if there is inconsistency here
-    if (state == ATTRSTATE_BAD_THRESHOLD) {
-      pout("%3d %-24s<== Data Page      |  WARNING: PREVIOUS ATTRIBUTE HAS TWO\n",
-           attr.id, attrname.c_str());
-      pout("%3d %-24s<== Threshold Page |  INCONSISTENT IDENTITIES IN THE DATA\n",
-           thre.id, ata_get_smart_attr_name(thre.id, defs).c_str());
-    }
   }
   if (!needheader) pout("\n");

trunk/smartmontools/smartd.cpp

@@ -2540 +2540 @@
                             const ata_smart_attribute & attr,
                             const ata_smart_attribute & prev,
-                            const ata_smart_threshold_entry & thre)
+                            int attridx,
+                            const ata_smart_threshold_entry * thresholds)
 {
   // Check attribute and threshold
-  ata_attr_state attrstate = ata_get_attr_state(attr, thre, cfg.attribute_defs);
+  ata_attr_state attrstate = ata_get_attr_state(attr, attridx, thresholds, cfg.attribute_defs);
   if (attrstate == ATTRSTATE_NON_EXISTING)
     return;
@@ -2567 +2568 @@
 
   // Issue warning if they don't have the same ID in all structures.
-  if (attr.id != prev.id || attrstate == ATTRSTATE_BAD_THRESHOLD) {
-    PrintOut(LOG_INFO,"Device: %s, same Attribute has different ID numbers: %d = %d = %d\n",
-             cfg.name.c_str(), attr.id, prev.id, thre.id);
+  if (attr.id != prev.id) {
+    PrintOut(LOG_INFO,"Device: %s, same Attribute has different ID numbers: %d = %d\n",
+             cfg.name.c_str(), attr.id, prev.id);
     return;
   }
@@ -2774 +2775 @@
                           curval.vendor_attributes[i],
                           state.smartval.vendor_attributes[i],
-                          state.smartthres.thres_entries[i]);
+                          i, state.smartthres.thres_entries);
         }