Patch "perf mem: Fix printing PERF_MEM_LVLNUM_{L2_MHB|MSC}" has been added to the 6.12-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

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

    perf mem: Fix printing PERF_MEM_LVLNUM_{L2_MHB|MSC}

to the 6.12-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-mem-fix-printing-perf_mem_lvlnum_-l2_mhb-msc.patch
and it can be found in the queue-6.12 subdirectory.

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



commit 8bd869d705ca57b6d77b3445cce523ed854de6a0
Author: Thomas Falcon <thomas.falcon@xxxxxxxxx>
Date:   Thu Sep 26 09:40:40 2024 -0500

    perf mem: Fix printing PERF_MEM_LVLNUM_{L2_MHB|MSC}
    
    [ Upstream commit 4f23fc34cc68812c68c3a3dec15e26e87565f430 ]
    
    With commit 8ec9497d3ef34 ("tools/include: Sync uapi/linux/perf.h
    with the kernel sources"), 'perf mem report' gives an incorrect memory
    access string.
    ...
    0.02%   1       3644    L5 hit  [.] 0x0000000000009b0e  mlc     [.] 0x00007fce43f59480
    ...
    
    This occurs because, if no entry exists in mem_lvlnum, perf_mem__lvl_scnprintf
    will default to 'L%d, lvl', which in this case for PERF_MEM_LVLNUM_L2_MHB is 0x05.
    Add entries for PERF_MEM_LVLNUM_L2_MHB and PERF_MEM_LVLNUM_MSC to mem_lvlnum,
    so that the correct strings are printed.
    ...
    0.02%   1       3644    L2 MHB hit      [.] 0x0000000000009b0e  mlc     [.] 0x00007fce43f59480
    ...
    
    Fixes: 8ec9497d3ef34 ("tools/include: Sync uapi/linux/perf.h with the kernel sources")
    Suggested-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
    Signed-off-by: Thomas Falcon <thomas.falcon@xxxxxxxxx>
    Reviewed-by: Leo Yan <leo.yan@xxxxxxx>
    Link: https://lore.kernel.org/r/20240926144040.77897-1-thomas.falcon@xxxxxxxxx
    Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index 051feb93ed8d4..bf5090f5220bb 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -366,6 +366,12 @@ static const char * const mem_lvl[] = {
 };
 
 static const char * const mem_lvlnum[] = {
+	[PERF_MEM_LVLNUM_L1] = "L1",
+	[PERF_MEM_LVLNUM_L2] = "L2",
+	[PERF_MEM_LVLNUM_L3] = "L3",
+	[PERF_MEM_LVLNUM_L4] = "L4",
+	[PERF_MEM_LVLNUM_L2_MHB] = "L2 MHB",
+	[PERF_MEM_LVLNUM_MSC] = "Memory-side Cache",
 	[PERF_MEM_LVLNUM_UNC] = "Uncached",
 	[PERF_MEM_LVLNUM_CXL] = "CXL",
 	[PERF_MEM_LVLNUM_IO] = "I/O",
@@ -448,7 +454,7 @@ int perf_mem__lvl_scnprintf(char *out, size_t sz, const struct mem_info *mem_inf
 		if (mem_lvlnum[lvl])
 			l += scnprintf(out + l, sz - l, mem_lvlnum[lvl]);
 		else
-			l += scnprintf(out + l, sz - l, "L%d", lvl);
+			l += scnprintf(out + l, sz - l, "Unknown level %d", lvl);
 
 		l += scnprintf(out + l, sz - l, " %s", hit_miss);
 		return l;