Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI/AER: Add TLP header information to tracepoint

When a PCIe AER error occurs, the TLP header information is printed in the
kernel message but it is missing from the tracepoint. A userspace program
can use this information in the tracepoint to better analyze problems.

To enable the tracepoint:

echo 1 > /sys/kernel/debug/tracing/events/ras/aer_event/enable

Example tracepoint output:

$ cat /sys/kernel/debug/tracing/trace
aer_event: 0000:01:00.0
PCIe Bus Error: severity=Uncorrected, non-fatal, Completer Abort
TLP Header={0x0,0x1,0x2,0x3}

Signed-off-by: Thomas Tai <thomas.tai@oracle.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

authored by

Thomas Tai and committed by
Bjorn Helgaas
2af8641b 5d0b401f

+20 -6
+2 -2
drivers/pci/pcie/aer/aerdrv_errprint.c
··· 189 189 pci_err(dev, " Error of this Agent(%04x) is reported first\n", id); 190 190 191 191 trace_aer_event(dev_name(&dev->dev), (info->status & ~info->mask), 192 - info->severity); 192 + info->severity, info->tlp_header_valid, &info->tlp); 193 193 } 194 194 195 195 void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info) ··· 251 251 __print_tlp_header(dev, &aer->header_log); 252 252 253 253 trace_aer_event(dev_name(&dev->dev), (status & ~mask), 254 - aer_severity); 254 + aer_severity, tlp_header_valid, &aer->header_log); 255 255 } 256 256 #endif
+18 -4
include/ras/ras_event.h
··· 298 298 TRACE_EVENT(aer_event, 299 299 TP_PROTO(const char *dev_name, 300 300 const u32 status, 301 - const u8 severity), 301 + const u8 severity, 302 + const u8 tlp_header_valid, 303 + struct aer_header_log_regs *tlp), 302 304 303 - TP_ARGS(dev_name, status, severity), 305 + TP_ARGS(dev_name, status, severity, tlp_header_valid, tlp), 304 306 305 307 TP_STRUCT__entry( 306 308 __string( dev_name, dev_name ) 307 309 __field( u32, status ) 308 310 __field( u8, severity ) 311 + __field( u8, tlp_header_valid) 312 + __array( u32, tlp_header, 4 ) 309 313 ), 310 314 311 315 TP_fast_assign( 312 316 __assign_str(dev_name, dev_name); 313 317 __entry->status = status; 314 318 __entry->severity = severity; 319 + __entry->tlp_header_valid = tlp_header_valid; 320 + if (tlp_header_valid) { 321 + __entry->tlp_header[0] = tlp->dw0; 322 + __entry->tlp_header[1] = tlp->dw1; 323 + __entry->tlp_header[2] = tlp->dw2; 324 + __entry->tlp_header[3] = tlp->dw3; 325 + } 315 326 ), 316 327 317 - TP_printk("%s PCIe Bus Error: severity=%s, %s\n", 328 + TP_printk("%s PCIe Bus Error: severity=%s, %s, TLP Header=%s\n", 318 329 __get_str(dev_name), 319 330 __entry->severity == AER_CORRECTABLE ? "Corrected" : 320 331 __entry->severity == AER_FATAL ? 321 332 "Fatal" : "Uncorrected, non-fatal", 322 333 __entry->severity == AER_CORRECTABLE ? 323 334 __print_flags(__entry->status, "|", aer_correctable_errors) : 324 - __print_flags(__entry->status, "|", aer_uncorrectable_errors)) 335 + __print_flags(__entry->status, "|", aer_uncorrectable_errors), 336 + __entry->tlp_header_valid ? 337 + __print_array(__entry->tlp_header, 4, 4) : 338 + "Not available") 325 339 ); 326 340 327 341 /*