Patch "perf report: Fix PAI counter names for s390 virtual machines" has been added to the 6.9-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    perf report: Fix PAI counter names for s390 virtual machines

to the 6.9-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     perf-report-fix-pai-counter-names-for-s390-virtual-m.patch
and it can be found in the queue-6.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit abe43c2126213329c4547553c6c7f4de2685531e
Author: Thomas Richter <tmricht@xxxxxxxxxxxxx>
Date:   Thu Apr 4 08:48:05 2024 +0200

    perf report: Fix PAI counter names for s390 virtual machines
    
    [ Upstream commit b74bc5a633a7d72f89141d481d835e73bda3c3ae ]
    
    s390 introduced the Processor Activity Instrumentation (PAI) counter
    facility on LPAR and virtual machines z/VM for models 3931 and 3932.
    
    These counters are stored as raw data in the perf.data file and are
    displayed with:
    
     # perf report -i /tmp//perfout-635468 -D | grep Counter
            Counter:007 <unknown> Value:0x00000000000186a0
            Counter:032 <unknown> Value:0x0000000000000001
            Counter:032 <unknown> Value:0x0000000000000001
            Counter:032 <unknown> Value:0x0000000000000001
     #
    
    However on z/VM virtual machines, the counter names are not retrieved
    from the PMU and are shown as '<unknown>'.  This is caused by the CPU
    string saved in the mapfile.csv for this machine:
    
       ^IBM.393[12].*3\.7.[[:xdigit:]]+$,3,cf_z16,core
    
    This string contains the CPU Measurement facility first and second
    version number and authorization level (3\.7.[[:xdigit:]]+).  These
    numbers do not apply to the PAI counter facility.  In fact they can be
    omitted.
    
    Shorten the CPU identification string for this machine to manufacturer
    and model. This is sufficient for all PMU devices.
    
    Output after:
    
     # perf report -i /tmp//perfout-635468 -D | grep Counter
            Counter:007 km_aes_128 Value:0x00000000000186a0
            Counter:032 kma_gcm_aes_256 Value:0x0000000000000001
            Counter:032 kma_gcm_aes_256 Value:0x0000000000000001
            Counter:032 kma_gcm_aes_256 Value:0x0000000000000001
     #
    
    Fixes: b539deafbadb2fc6 ("perf report: Add s390 raw data interpretation for PAI counters")
    Reviewed-by: Ian Rogers <irogers@xxxxxxxxxx>
    Signed-off-by: Thomas Richter <tmricht@xxxxxxxxxxxxx>
    Acked-by: Sumanth Korikkar <sumanthk@xxxxxxxxxxxxx>
    Cc: Heiko Carstens <hca@xxxxxxxxxxxxx>
    Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
    Cc: Sven Schnelle <svens@xxxxxxxxxxxxx>
    Cc: Thomas Richter <tmricht@xxxxxxxxxxxxx>
    Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240404064806.1362876-1-tmricht@xxxxxxxxxxxxx
    Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/pmu-events/arch/s390/mapfile.csv b/tools/perf/pmu-events/arch/s390/mapfile.csv
index a918e1af77a57..b22648d127517 100644
--- a/tools/perf/pmu-events/arch/s390/mapfile.csv
+++ b/tools/perf/pmu-events/arch/s390/mapfile.csv
@@ -5,4 +5,4 @@ Family-model,Version,Filename,EventType
 ^IBM.296[45].*[13]\.[1-5].[[:xdigit:]]+$,1,cf_z13,core
 ^IBM.390[67].*[13]\.[1-5].[[:xdigit:]]+$,3,cf_z14,core
 ^IBM.856[12].*3\.6.[[:xdigit:]]+$,3,cf_z15,core
-^IBM.393[12].*3\.7.[[:xdigit:]]+$,3,cf_z16,core
+^IBM.393[12].*$,3,cf_z16,core




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux