Skip to contentSkip to conversation

x86/mce: Add ppin and microcode to mce trace

RFC PATCH In review Tony Luck 2 participants 2 messages Jan 7, 2021 Tracing

lore
Share & tools
lore

Tony Luck

author
#0 lore raw

RFC PATCH 1/1 x86/mce: Add ppin and microcode to mce trace

Steven,

I've been remiss about updating the mce_record trace as new fields have been added to "struct mce". What are the ABI implications of a patch like the one below (sample only ... there are a couple more fields that may need to be added)?

Are there any size limitations that I might hit adding more items to this record?

Thanks

-Tony

---
 include/trace/events/mce.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
include/trace/events/mce.h +6 -2
index 1391ada0da3b..cf0e8b9920b7 100644
@@ -33,6 +33,8 @@ TRACE_EVENT(mce_record,
 		__field(	u8,		cs		)
 		__field(	u8,		bank		)
 		__field(	u8,		cpuvendor	)
+		__field(	u64,		ppin		)
+		__field(	u32,		microcode	)
 	),
 
 	TP_fast_assign(
@@ -53,9 +55,11 @@ TRACE_EVENT(mce_record,
 		__entry->cs		= m->cs;
 		__entry->bank		= m->bank;
 		__entry->cpuvendor	= m->cpuvendor;
+		__entry->ppin		= m->ppin;
+		__entry->microcode	= m->microcode;
 	),
 
-	TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR/MISC/SYND: %016Lx/%016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x",
+	TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR/MISC/SYND: %016Lx/%016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x, PPIN: %llx, MICROCODE: %x",
 		__entry->cpu,
 		__entry->mcgcap, __entry->mcgstatus,
 		__entry->bank, __entry->status,
@@ -66,7 +70,7 @@ TRACE_EVENT(mce_record,
 		__entry->cpuvendor, __entry->cpuid,
 		__entry->walltime,
 		__entry->socketid,
-		__entry->apicid)
+		__entry->apicid, __entry->ppin, __entry->microcode)
 );
 
 #endif /* _TRACE_MCE_H */
Signature · 1 line
2.21.1
maintainer
#1 lore raw
Quoted 1 line · On Thu, 7 Jan 2021 09:12:25 -0800 Tony Luck <[email protected]> wrote:

Steven,

Hi Tony,

Quoted 8 lines

I've been remiss about updating the mce_record trace as new fields have been added to "struct mce". What are the ABI implications of a patch like the one below (sample only ... there are a couple more fields that may need to be added)?

Are there any size limitations that I might hit adding more items to this record?

Nope, this should be all fine. I know that rasdaemon uses libtraceevent (actually a copy, but should now start checking if its installed on the system and use the shared one), and that is used to parse the binary data.

Quoted 14 lines

Thanks

(quoted diff) +0 -2
-Tony
 
---
 include/trace/events/mce.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
include/trace/events/mce.h +0 -0
index 1391ada0da3b..cf0e8b9920b7 100644

include/trace/events/mce.h TRACE_EVENT(mce_record, · line 38

Quoted 6 lines
include/trace/events/mce.h +2 -0
@@ -33,6 +33,8 @@ TRACE_EVENT(mce_record,
 		__field(	u8,		cs		)
 		__field(	u8,		bank		)
 		__field(	u8,		cpuvendor	)
+		__field(	u64,		ppin		)
+		__field(	u32,		microcode	)
 	),
 # trace-cmd list -e mce_record -F
system: mce
name: mce_record
ID: 105
format:
	field:unsigned short common_type;	offset:0;	size:2;	signed:0;
	field:unsigned char common_flags;	offset:2;	size:1;	signed:0;
	field:unsigned char common_preempt_count;	offset:3;	size:1;signed:0;
	field:int common_pid;	offset:4;	size:4;	signed:1;
	field:u64 mcgcap;	offset:8;	size:8;	signed:0;
	field:u64 mcgstatus;	offset:16;	size:8;	signed:0;
	field:u64 status;	offset:24;	size:8;	signed:0;
	field:u64 addr;	offset:32;	size:8;	signed:0;
	field:u64 misc;	offset:40;	size:8;	signed:0;
	field:u64 synd;	offset:48;	size:8;	signed:0;
	field:u64 ipid;	offset:56;	size:8;	signed:0;
	field:u64 ip;	offset:64;	size:8;	signed:0;
	field:u64 tsc;	offset:72;	size:8;	signed:0;
	field:u64 walltime;	offset:80;	size:8;	signed:0;
	field:u32 cpu;	offset:88;	size:4;	signed:0;
	field:u32 cpuid;	offset:92;	size:4;	signed:0;
	field:u32 apicid;	offset:96;	size:4;	signed:0;
	field:u32 socketid;	offset:100;	size:4;	signed:0;
	field:u8 cs;	offset:104;	size:1;	signed:0;
	field:u8 bank;	offset:105;	size:1;	signed:0;
	field:u8 cpuvendor;	offset:106;	size:1;	signed:0;

The event looks to be currently 108 bytes (rounds up to the nearest 4 alignment). The sub buffer size (max event size) is 4080 bytes.

Does this help?

-- Steve

Quoted 24 lines
include/trace/events/mce.h +4 -2
 	TP_fast_assign(
@@ -53,9 +55,11 @@ TRACE_EVENT(mce_record,
 		__entry->cs		= m->cs;
 		__entry->bank		= m->bank;
 		__entry->cpuvendor	= m->cpuvendor;
+		__entry->ppin		= m->ppin;
+		__entry->microcode	= m->microcode;
 	),
 
-	TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR/MISC/SYND: %016Lx/%016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x",
+	TP_printk("CPU: %d, MCGc/s: %llx/%llx, MC%d: %016Lx, IPID: %016Lx, ADDR/MISC/SYND: %016Lx/%016Lx/%016Lx, RIP: %02x:<%016Lx>, TSC: %llx, PROCESSOR: %u:%x, TIME: %llu, SOCKET: %u, APIC: %x, PPIN: %llx, MICROCODE: %x",
 		__entry->cpu,
 		__entry->mcgcap, __entry->mcgstatus,
 		__entry->bank, __entry->status,
@@ -66,7 +70,7 @@ TRACE_EVENT(mce_record,
 		__entry->cpuvendor, __entry->cpuid,
 		__entry->walltime,
 		__entry->socketid,
-		__entry->apicid)
+		__entry->apicid, __entry->ppin, __entry->microcode)
 );
 
 #endif /* _TRACE_MCE_H */