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

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

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>

diff --git a/drivers/platform/x86/intel/ifs/runtest.c b/drivers/platform/x86/intel/ifs/runtest.c
index c8352ffb919562c5dd932191fd81c46fa8fdbf96..21dc0046fd9b2998a004fd42bc735212aac33daa 100644 (file)
--- a/drivers/platform/x86/intel/ifs/runtest.c
+++ b/drivers/platform/x86/intel/ifs/runtest.c
@@ -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)

diff --git a/include/trace/events/intel_ifs.h b/include/trace/events/intel_ifs.h
index 8462dfb7a0203ae3673ad2122f7f0cdd3fbf3ee8..8ce2de120f2d47c09b4cf7d4985b9ecc939a7c22 100644 (file)
--- a/include/trace/events/intel_ifs.h
+++ b/include/trace/events/intel_ifs.h
@@ -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)