perf mem: Fix printing PERF_MEM_LVLNUM_{L2_MHB|MSC}
PATCH 1/1 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
...
--- tools/perf/util/mem-events.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/mem-events.c +2 -0
@@ -366,6 +366,8 @@ static const char * const mem_lvl[] = { };static const char *const mem_lvlnum[] = { + [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" ,
Signature · 1 line
2.46.0
Quoted 17 lines · Thomas Falcon
With commit
8ec9497d3ef34("tools/include: Syncuapi/linux/perf.hwith the kernel sources"), 'perf mem report' gives an incorrect memory access string.
...
0.02% 1 3644 L5 hit [.]0x0000000000009b0emlc [.]0x00007fce43f59480
...This occurs because, if no entry exists in
mem_lvlnum,perf_mem__lvl_scnprintfwill default to 'L%d, lvl', which in this case forPERF_MEM_LVLNUM_L2_MHBis0x05. Add entries forPERF_MEM_LVLNUM_L2_MHBandPERF_MEM_LVLNUM_MSCtomem_lvlnum, so that the correct strings are printed.
...
0.02% 1 3644 L2 MHB hit [.]0x0000000000009b0emlc [.]0x00007fce43f59480
...
Quoted 4 lines
Fixes 8ec9497d3ef34 ("tools/include: Sync uapi/linux/perf.h with the kernel sources")Suggested-by Kan Liang <[email protected]>Signed-off-by Thomas Falcon <[email protected]>Reviewed-by Kan Liang <[email protected]>
This change is fine for me. But for later avoid same issues, I would like to improve a bit:
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",
...
};Then in the function perf_mem__lvl_scnprintf() :
if (mem_lvlnum[lvl])
l += scnprintf(out + l, sz - l, mem_lvlnum[lvl]);
else
l += scnprintf(out + l, sz - l, "Unknown level %d", lvl);This can help us easily to catch unexpected memory level.
Thanks,
Leo
Quoted 21 lines
--- tools/perf/util/mem-events.c | 2 ++ 1 file changed, 2 insertions(+)tools/perf/util/mem-events.c +2
-1@@ -366,6 +366,8 @@ static const char * const mem_lvl[] = { };static const char *const mem_lvlnum[] = { + [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" , --2.46.0
Quoted 44 lines · Leo Yan
Quoted 23 lines · Thomas Falcon
With commit
8ec9497d3ef34("tools/include: Syncuapi/linux/perf.hwith 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 forPERF_MEM_LVLNUM_L2_MHBis0x05.
Add entries forPERF_MEM_LVLNUM_L2_MHBandPERF_MEM_LVLNUM_MSCtomem_lvlnum,
so that the correct strings are printed.
...
0.02% 1 3644 L2 MHB hit [.]0x0000000000009b0emlc [.]0x00007fce43f59480
...Quoted 5 lines
Fixes 8ec9497d3ef34 ("tools/include: Sync uapi/linux/perf.h withthe kernel sources")
Suggested-by Kan Liang <[email protected]>Signed-off-by Thomas Falcon <[email protected]>Reviewed-by Kan Liang <[email protected]>This change is fine for me. But for later avoid same issues, I would like to
improve a bit: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",
...
};
Quoted 9 lines
Then in the function
perf_mem__lvl_scnprintf():if (mem_lvlnum[lvl])
l +=scnprintf(out + l, sz - l, mem_lvlnum[lvl]); else
l +=scnprintf(out + l, sz - l, "Unknown level %d", lvl);This can help us easily to catch unexpected memory level.
Thank you! I will send an updated v2 with your suggested changes.
Tom
Quoted 25 lines
Thanks,
LeoQuoted 22 lines
---
tools/perf/util/mem-events.c | 2 ++1 file changed, 2 insertions(+)tools/perf/util/mem- renamed from tools/perf/util/mem-events.c +0
-0
events.c
index051feb93ed8d..c630aca5bd93100644tools/perf/util/mem-events.c +2
-1@@ -366,6 +366,8 @@ static const char * const mem_lvl[] = { }; static const char * const mem_lvlnum[] = { + [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", --2.46.0