platform/x86/intel/ifs: Add current batch number to trace output

Upstream commit: e272d1e1188e55259dd0e3ba2f8f744a531fdd59
Conflict: none

Add the current batch number in the trace output. When there are
failures, it's important to know which test content resulted in failure.

#           TASK-PID     CPU#  |||||  TIMESTAMP  FUNCTION
#              | |         |   |||||     |         |
     migration/0-18      [000] d..1. 527287.084668: ifs_status: batch: 02, start: 0000, stop: 007f, status: 0000000000007f80
   migration/128-785     [128] d..1. 527287.084669: ifs_status: batch: 02, start: 0000, stop: 007f, status: 0000000000007f80

Intel-SIG: commit e272d1e1188e ("platform/x86/intel/ifs: Add current batch number to trace output)"
Backport to support Intel IFS(In Field Scan) SBAF(Structural Based Functional Test at Field)

Signed-off-by: Ashok Raj <ashok.raj@intel.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/r/20240125082254.424859-4-ashok.raj@intel.com
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
[ Aichun Shi: amend commit log ]
Signed-off-by: Aichun Shi <aichun.shi@intel.com>
This commit is contained in:
Ashok Raj 2024-01-25 00:22:52 -08:00 committed by Aichun Shi
parent 00504ebb93
commit 5018781046
2 changed files with 7 additions and 4 deletions

View File

@ -176,7 +176,7 @@ static int doscan(void *data)
wrmsrl(MSR_ACTIVATE_SCAN, params->activate->data);
rdmsrl(MSR_SCAN_STATUS, status.data);
trace_ifs_status(start, stop, status.data);
trace_ifs_status(ifsd->cur_batch, start, stop, status.data);
/* Pass back the result of the scan */
if (cpu == first)

View File

@ -10,23 +10,26 @@
TRACE_EVENT(ifs_status,
TP_PROTO(int start, int stop, u64 status),
TP_PROTO(int batch, int start, int stop, u64 status),
TP_ARGS(start, stop, status),
TP_ARGS(batch, start, stop, status),
TP_STRUCT__entry(
__field( int, batch )
__field( u64, status )
__field( u16, start )
__field( u16, stop )
),
TP_fast_assign(
__entry->batch = batch;
__entry->start = start;
__entry->stop = stop;
__entry->status = status;
),
TP_printk("start: %.4x, stop: %.4x, status: %.16llx",
TP_printk("batch: %.2d, start: %.4x, stop: %.4x, status: %.16llx",
__entry->batch,
__entry->start,
__entry->stop,
__entry->status)