Skip to contentSkip to conversation

ras: Use consistent types for UUIDs

PATCH Superseded Andy Shevchenko 4 participants 7 messages Jul 13, 2018 – Jan 24, 2019 RAS infrastructure

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ras: Use consistent types for UUIDs

The commit

297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")

brought inconsistency in UUID types which are used across the RAS subsystem.

Fix this by moving to use guid_t everywhere.

---
 drivers/ras/ras.c       | 2 +-
 include/ras/ras_event.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/ras/ras.c +1 -1
index 3f38907320dc..95540ea8dd9d 100644
@@ -14,7 +14,7 @@
 #define TRACE_INCLUDE_PATH ../../include/ras
 #include <ras/ras_event.h>
 
-void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
+void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
 			    const char *fru_text, const u8 sev, const u8 *err,
 			    const u32 len)
 {
include/ras/ras_event.h +4 -4
index a0794632fd01..36c5c5e38c1d 100644
@@ -27,7 +27,7 @@
 TRACE_EVENT(extlog_mem_event,
 	TP_PROTO(struct cper_sec_mem_err *mem,
 		 u32 err_seq,
-		 const uuid_le *fru_id,
+		 const guid_t *fru_id,
 		 const char *fru_text,
 		 u8 sev),
 
@@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
 		__field(u8, sev)
 		__field(u64, pa)
 		__field(u8, pa_mask_lsb)
-		__field_struct(uuid_le, fru_id)
+		__field_struct(guid_t, fru_id)
 		__string(fru_text, fru_text)
 		__field_struct(struct cper_mem_err_compact, data)
 	),
@@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
  */
 TRACE_EVENT(non_standard_event,
 
-	TP_PROTO(const uuid_le *sec_type,
-		 const uuid_le *fru_id,
+	TP_PROTO(const guid_t *sec_type,
+		 const guid_t *fru_id,
 		 const char *fru_text,
 		 const u8 sev,
 		 const u8 *err,
Signature · 1 line
2.18.0
#1 lore raw
Quoted 7 lines · Andy Shevchenko

The commit

297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")

brought inconsistency in UUID types which are used across the RAS subsystem.

Fix this by moving to use guid_t everywhere.

Any comments on this?

Quoted 57 lines
---
 drivers/ras/ras.c       | 2 +-
 include/ras/ras_event.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/ras/ras.c +1 -1
index 3f38907320dc..95540ea8dd9d 100644
@@ -14,7 +14,7 @@
 #define TRACE_INCLUDE_PATH ../../include/ras
 #include <ras/ras_event.h>
 
-void log_non_standard_event(const uuid_le *sec_type, const uuid_le *fru_id,
+void log_non_standard_event(const guid_t *sec_type, const guid_t *fru_id,
 			    const char *fru_text, const u8 sev, const u8 *err,
 			    const u32 len)
 {
include/ras/ras_event.h +4 -4
index a0794632fd01..36c5c5e38c1d 100644
@@ -27,7 +27,7 @@
 TRACE_EVENT(extlog_mem_event,
 	TP_PROTO(struct cper_sec_mem_err *mem,
 		 u32 err_seq,
-		 const uuid_le *fru_id,
+		 const guid_t *fru_id,
 		 const char *fru_text,
 		 u8 sev),
 
@@ -39,7 +39,7 @@ TRACE_EVENT(extlog_mem_event,
 		__field(u8, sev)
 		__field(u64, pa)
 		__field(u8, pa_mask_lsb)
-		__field_struct(uuid_le, fru_id)
+		__field_struct(guid_t, fru_id)
 		__string(fru_text, fru_text)
 		__field_struct(struct cper_mem_err_compact, data)
 	),
@@ -218,8 +218,8 @@ TRACE_EVENT(arm_event,
  */
 TRACE_EVENT(non_standard_event,
 
-	TP_PROTO(const uuid_le *sec_type,
-		 const uuid_le *fru_id,
+	TP_PROTO(const guid_t *sec_type,
+		 const guid_t *fru_id,
 		 const char *fru_text,
 		 const u8 sev,
 		 const u8 *err,
Signature · 1 line
2.18.0
Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Andy Shevchenko

The commit

297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")

Quoted 7 lines
Quoted 3 lines

brought inconsistency in UUID types which are used across the RAS subsystem.

Fix this by moving to use guid_t everywhere.

Looks good,

Thanks, Christoph.

Tomas, Tyler, any comments from your side?
I can push it through my tree if it looks abandon, or if Christoph is okay through UUID one.

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#4 lore raw
Quoted 10 lines · Andy Shevchenko
Quoted 9 lines · Christoph Hellwig
Quoted 7 lines · Andy Shevchenko

The commit

297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")

brought inconsistency in UUID types which are used across the RAS subsystem.

Fix this by moving to use guid_t everywhere.

Quoted 7 lines
Quoted 3 lines

Looks good,

Thanks, Christoph.

Tomas, Tyler, any comments from your side?

Thanks for asking. I have no comments on my side.

Thanks,
Thomas

Quoted 3 lines

I can push it through my tree if it looks abandon, or if Christoph is okay through UUID one.

#5 lore raw
In reply to Christoph Hellwig
Quoted 5 lines · Christoph Hellwig
Quoted 4 lines · Andy Shevchenko

The commit

297b64c74385 ("ras: acpi / apei: generate trace event for unrecognized CPER section")

Quoted 7 lines
Quoted 3 lines

brought inconsistency in UUID types which are used across the RAS subsystem.

Fix this by moving to use guid_t everywhere.

Looks good,

Rafael, since you handled ACPI/APEI stuff for this cycle, perhaps you can take this one as well since for half a year there is no response from maintainers?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#6 lore raw
Quoted 2 lines · Andy Shevchenko

Rafael, since you handled ACPI/APEI stuff for this cycle, perhaps you can take this one as well since for half a year there is no response from maintainers?

Can you send me the patch again pls, ontop of tip:ras/core:

https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git/log/?h=ras/core

I'll take it.

Thx.

Signature · 5 lines
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--