Skip to contentSkip to conversation

ipr: fix array error logging

PATCH In review Wayne Boyer 2 participants 3 messages Sep 27, 2010 – Sep 30, 2010 1 message not in the archive

Subsystems (2)
SCSI IBM Power Linux RAID adapter
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Wayne Boyer

author
#1 lore raw

PATCH 1/1 ipr: fix array error logging

The structure definitions for reporting array errors did not have the correct size for the Array WWID field. This patch fixes those definitions. It also fixes part of the output formatting that did not have newlines and fixes size calculations.

Signed-off-by Wayne Boyer <[email protected]>

---

 drivers/scsi/ipr.c |   10 +++++-----
 drivers/scsi/ipr.h |    9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/scsi/ipr.c +5 -5
Index: b/drivers/scsi/ipr.c
===================================================================
@@ -1671,7 +1671,7 @@ static void ipr_log_enhanced_array_error
 
 	array_entry = error->array_member;
 	num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-			    sizeof(error->array_member));
+			    ARRAY_SIZE(error->array_member));
 
 	for (i = 0; i < num_entries; i++, array_entry++) {
 		if (!memcmp(array_entry->vpd.vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))

@@ -2152,8 +2152,8 @@ static void ipr_log_sis64_array_error(st
 	ipr_err_separator;
 
 	array_entry = error->array_member;
-	num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-			    sizeof(error->array_member));
+	num_entries = min_t(u32, error->num_entries,
+		       	    ARRAY_SIZE(error->array_member);
 
 	for (i = 0; i < num_entries; i++, array_entry++) {
 

@@ -2167,10 +2167,10 @@ static void ipr_log_sis64_array_error(st
 
 		ipr_err("Array Member %d:\n", i);
 		ipr_log_ext_vpd(&array_entry->vpd);
-		ipr_err("Current Location: %s",
+		ipr_err("Current Location: %s\n",
 			 ipr_format_res_path(array_entry->res_path, buffer,
 					     sizeof(buffer)));
-		ipr_err("Expected Location: %s",
+		ipr_err("Expected Location: %s\n",
 			 ipr_format_res_path(array_entry->expected_res_path,
 					     buffer, sizeof(buffer)));
drivers/scsi/ipr.h +7 -2
Index: b/drivers/scsi/ipr.h
===================================================================
@@ -319,6 +319,11 @@ struct ipr_ext_vpd {
 	__be32 wwid[2];
 }__attribute__((packed));
 
+struct ipr_ext_vpd64 {
+	struct ipr_vpd vpd;
+	__be32 wwid[4];
+}__attribute__((packed));
+
 struct ipr_std_inq_data {
 	u8 peri_qual_dev_type;
 #define IPR_STD_INQ_PERI_QUAL(peri) ((peri) >> 5)

@@ -395,7 +400,7 @@ struct ipr_config_table_entry64 {
 	__be64 res_path;
 	struct ipr_std_inq_data std_inq_data;
 	u8 reserved2[4];
-	__be64 reserved3[2]; // description text
+	__be64 reserved3[2];
 	u8 reserved4[8];
 }__attribute__ ((packed, aligned (8)));
 

@@ -914,7 +919,7 @@ struct ipr_hostrcb_type_24_error {
 	u8 array_id;
 	u8 last_res_path[8];
 	u8 protection_level[8];
-	struct ipr_ext_vpd array_vpd;
+	struct ipr_ext_vpd64 array_vpd;
 	u8 description[16];
 	u8 reserved2[3];
 	u8 num_entries;
author
#2 lore raw

The original patch was broken. Here's the correct patch.

---

The structure definitions for reporting array errors did not have the correct size for the Array WWID field. This patch fixes those definitions. It also fixes part of the output formatting that did not have newlines and fixes size calculations.

Signed-off-by Wayne Boyer <[email protected]>

---

 drivers/scsi/ipr.c |   10 +++++-----
 drivers/scsi/ipr.h |    9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/scsi/ipr.c +5 -5
Index: b/drivers/scsi/ipr.c
===================================================================
@@ -1671,7 +1671,7 @@ static void ipr_log_enhanced_array_error
 
 	array_entry = error->array_member;
 	num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-			    sizeof(error->array_member));
+			    ARRAY_SIZE(error->array_member));
 
 	for (i = 0; i < num_entries; i++, array_entry++) {
 		if (!memcmp(array_entry->vpd.vpd.sn, zero_sn, IPR_SERIAL_NUM_LEN))

@@ -2152,8 +2152,8 @@ static void ipr_log_sis64_array_error(st
 	ipr_err_separator;
 
 	array_entry = error->array_member;
-	num_entries = min_t(u32, be32_to_cpu(error->num_entries),
-			    sizeof(error->array_member));
+	num_entries = min_t(u32, error->num_entries,
+			    ARRAY_SIZE(error->array_member));
 
 	for (i = 0; i < num_entries; i++, array_entry++) {
 

@@ -2167,10 +2167,10 @@ static void ipr_log_sis64_array_error(st
 
 		ipr_err("Array Member %d:\n", i);
 		ipr_log_ext_vpd(&array_entry->vpd);
-		ipr_err("Current Location: %s",
+		ipr_err("Current Location: %s\n",
 			 ipr_format_res_path(array_entry->res_path, buffer,
 					     sizeof(buffer)));
-		ipr_err("Expected Location: %s",
+		ipr_err("Expected Location: %s\n",
 			 ipr_format_res_path(array_entry->expected_res_path,
 					     buffer, sizeof(buffer)));
drivers/scsi/ipr.h +7 -2
Index: b/drivers/scsi/ipr.h
===================================================================
@@ -319,6 +319,11 @@ struct ipr_ext_vpd {
 	__be32 wwid[2];
 }__attribute__((packed));
 
+struct ipr_ext_vpd64 {
+	struct ipr_vpd vpd;
+	__be32 wwid[4];
+}__attribute__((packed));
+
 struct ipr_std_inq_data {
 	u8 peri_qual_dev_type;
 #define IPR_STD_INQ_PERI_QUAL(peri) ((peri) >> 5)

@@ -395,7 +400,7 @@ struct ipr_config_table_entry64 {
 	__be64 res_path;
 	struct ipr_std_inq_data std_inq_data;
 	u8 reserved2[4];
-	__be64 reserved3[2]; // description text
+	__be64 reserved3[2];
 	u8 reserved4[8];
 }__attribute__ ((packed, aligned (8)));
 

@@ -914,7 +919,7 @@ struct ipr_hostrcb_type_24_error {
 	u8 array_id;
 	u8 last_res_path[8];
 	u8 protection_level[8];
-	struct ipr_ext_vpd array_vpd;
+	struct ipr_ext_vpd64 array_vpd;
 	u8 description[16];
 	u8 reserved2[3];
 	u8 num_entries;
Acked-by
#3 lore raw
Quoted 10 lines · Wayne Boyer

The original patch was broken. Here's the correct patch.

---

The structure definitions for reporting array errors did not have the correct size for the Array WWID field. This patch fixes those definitions. It also fixes part of the output formatting that did not have newlines and fixes size calculations.

Signed-off-by Wayne Boyer <[email protected]>
Acked-by Brian King <[email protected]>
Signature · 3 lines
Brian King
Linux on Power Virtualization
IBM Linux Technology Center