perf mem: Fix printing PERF_MEM_LVLNUM_{L2_MHB|MSC}

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@linux.intel.com>
Signed-off-by: Thomas Falcon <thomas.falcon@intel.com>
Reviewed-by: Leo Yan <leo.yan@arm.com>
Link: https://lore.kernel.org/r/20240926144040.77897-1-thomas.falcon@intel.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index 051feb93ed8d40cbc792337b8ff8af767f49b00d..bf5090f5220bbdc760b31cee04a97f77a9ce4469 100644 (file)
--- 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;