perf: Add support for memory region/range reporting
v8 cover perf: Add support for memory region/range reporting
Add support for two memory-related reporting features in the perf tool:
1. Memory region reporting in perf-c2c and perf-script subcommands.
2. Memory range data in perf.data file header and perf-c2c subcommand.
Memory region reporting was introduced as part of support for the Off-module Response facility (OMR) [1], which provides a new data source encoding supporting "up to 8 fine-grained memory regions in addition to the cache region, offering more detailed insights into memory access regions."
Memory Range support was introduced with the addition of the ACPI Memory Range and Region Mapping (MRRM) [2] table. It provides a base address plus a length value for each memory range, as well as NUMA node and local and remote "region ID's" so that "platform firmware can indicate the type of memory for each range."[3]
Include a change allowing PERF_MEM_LVLNUM_L0 to be printed in perf-mem output as well.
[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: MRRM definition allow for future expansion for the OS to assign these region IDs.
v8:
-- Updated developer tags and commit messages with real example output
from perf script and perf c2c
v7:
-- perf-c2c: fix output_str allocation error handling that introduces a
memory leak (Sashiko)
v6:
-- Rebase on 7.3-rc1
v5:
-- perf-c2c: make the cacheline header span and ui_quirks() width
fixup depend on memory-region availability (Namhyung Kim)
v4:
-- perf-script: gate the Region field on the HEADER_MEMORY_RANGES feature
bit via perf_session instead of a global flag, with a pipe-mode fallback
-- perf-c2c: fix output_str allocation error handling
-- perf header: Fix typo in region id bounds checking which made region 255
invalid
v3:
-- included missing ff-size check in process_memory_ranges
-- make memory region reporting in perf c2c-and perf-script conditional
on feature bit, requiring some patch reordering (Namhyung Kim)
-- used open/openat to read memory range sysfs files in memory_range__read()
(Namhyung Kim)
-- Removed path name and file name buffers in memory_range__read(),
instead pass path name from as a parameter from memory_range__parse() (Namhyung Kim)
-- use calloc instead of zalloc in memory_range__parse() and
process_memory_ranges() (Namhyung Kim)
-- Removed redundant check for existance of memory range directory in
memory_range__read() (Namhyung Kim)
-- Included output examples of memory ranges in perf header and perf-c2c
in commit message (Namhyung Kim)
v2:
-- Added missing newline in WARN_ONCE message in c2c_he__set_mem_region() -- increased buffers passed to perf_script__meminfo_scnprintf() from 150
to 200 bytes to avoid silent truncation
-- Added check for NULL return of sysfs__mountpoint() when parsing
memory ranges in sysfs
-- increased MAX_MEMORY_RANGES sanity check from 64 to 256 based on
ACPI MRRM table implementation in Linux kernel
-- added comment for MAX_MEMORY_RANGES to clarify that it is a sanity check
for malformed perf.data files
-- removed a line of code was removed from util/env.h but was added back in
v1 due to bad rebase
Dapeng Mi (3):
perf mem: Add support for printing PERF_MEM_LVLNUM_L0 perf tools: Show memory region in perf-c2c subcommand perf tools: Show memory region in perf-script subcommand
Thomas Falcon (3):
perf mem: Fix size tracking for mem_lvl's in
perf_script__meminfo_scnprintf()
perf header: Support memory ranges
perf c2c: print memory region data with stdio output
tools/perf/Documentation/perf-record.txt | 2 +- .../Documentation/perf.data-file-format.txt | 13 ++ tools/perf/builtin-c2c.c | 128 ++++++++++- tools/perf/builtin-inject.c | 1 + tools/perf/builtin-script.c | 13 +- tools/perf/util/bpf-filter.l | 1 + tools/perf/util/c2c.h | 1 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 10 + tools/perf/util/header.c | 203 ++++++++++++++++++ tools/perf/util/header.h | 1 + tools/perf/util/mem-events.c | 93 +++++++- tools/perf/util/mem-events.h | 5 +- .../scripting-engines/trace-event-python.c | 5 +- 14 files changed, 454 insertions(+), 23 deletions(-)
Signature · 1 line
2.43.0
PATCH v8 1/6 perf mem: Fix size tracking for mem_lvl's in perf_script__meminfo_scnprintf()
When printing memory info in perf script, the entire size of the buffer is passed to perf_mem__lvl_scnprintf() instead of the remaining size. Pass the remaining buffer size instead.
This issue was detected by sashiko during an internal code review.
--- tools/perf/util/mem-events.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/mem-events.c +1 -1
@@ -610,7 +610,7 @@ int perf_script__meminfo_scnprintf(char *out, size_t sz, const struct mem_info * i +=scnprintf (out, sz,"|OP " ); i +=perf_mem__op_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|LVL " ); - i +=perf_mem__lvl_scnprintf (out + i, sz, mem_info); + i +=perf_mem__lvl_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|SNP " ); i +=perf_mem__snp_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|TLB " );
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 1/6] perf mem: Fix size tracking for mem_lvl's in perf_script__meminfo_scnprintf()
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
Pre-existing issues:
- [High] The helper functions for memory event formatting (perf_mem__lvl_scnprintf, perf_mem__snp_scnprintf, perf_mem__tlb_scnprintf) are vulnerable to severe stack buffer overflows and integer underflows due to unvalidated size decrements, unbounded strcat usage, and API contract violations. --
commit 980e511e3799aa8f7f553d523c4cd00aa00aadf1
Author: Thomas Falcon <[email protected]>
perf mem: Fix size tracking for mem_lvl's in perf_script__meminfo_scnprintf()
When printing memory info in perf script, the entire size of the buffer is passed to perf_mem__lvl_scnprintf() instead of the remaining size. Pass the remaining buffer size instead.
tools/perf/util/mem-events.c int perf_script__meminfo_scnprintf(char *out, size_t sz, const struct mem_info * · line 613
Quoted 10 lines
tools/perf/util/mem-events.c +1
-1@@ -610,7 +610,7 @@ int perf_script__meminfo_scnprintf(char *out, size_t sz, const struct mem_info * i +=scnprintf (out, sz,"|OP " ); i +=perf_mem__op_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|LVL " ); - i +=perf_mem__lvl_scnprintf (out + i, sz, mem_info); + i +=perf_mem__lvl_scnprintf (out + i, sz - i, mem_info);
[Severity: High]
This is a pre-existing issue, but does passing sz - i here expose severe integer underflows and stack buffer overflows inside perf_mem__lvl_scnprintf() and related functions?
The functions perf_mem__lvl_scnprintf(), perf_mem__snp_scnprintf(), and perf_mem__tlb_scnprintf() begin with an unconditional decrement of sz:
tools/perf/util/mem-events.c:perf_mem__lvl_scnprintf() {
...
sz -= 1; /* -1 for null termination */
out[0] = '\0';
...If the remaining space passed by the caller (sz - i) is small (e.g., 0), this underflows to SIZE_MAX. If it is 1, sz becomes 0, and subsequent length calculations like sz - l underflow.
Furthermore, these functions use unbounded strcat() calls which ignore the buffer capacity entirely:
tools/perf/util/mem-events.c:perf_mem__lvl_scnprintf() {
...
strcat(out, "Remote ");
l += 7;
...
na:
strcat(out, "N/A");
return 3;
...Because strcat() doesn't respect sz, a maliciously crafted perf.data file can cause this to overflow the 100-byte stack buffer used for the decode array in builtin-script.c.
Finally, if the callee returns a length larger than the remaining size, the caller's offset i is advanced past the buffer size.
Does this cause the caller's own sz - i calculations to underflow in the subsequent format calls below?
Quoted 3 lines
tools/perf/util/mem-events.c +0
-0i +=scnprintf (out + i, sz - i,"|SNP " ); i +=perf_mem__snp_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|TLB " );
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
PATCH v8 2/6 perf mem: Add support for printing PERF_MEM_LVLNUM_L0
In reply to Thomas FalconFrom: Dapeng Mi <[email protected]>
Add support for printing PERF_MEM_LVLNUM_L0 in perf mem report.
The L0 cache is newly added a small piece of cache which is the closest, lowest-latency memory cache tied directly to the execution pipeline.
The table "Table 9-4. Data Source Field Encodings for Panther Cove and Coyote Cove Microarchitectures" in the ISE doc chapter "9.2.1 Panther Cove and Coyote Cove Microarchitectures Memory Auxiliary Field Layout"[1] indicates the code "01H" means the "L0 Hit - Minimal latency core cache hit. This request was satisfied by the L0 data cache."
---
v8: Updated developer tags
v3: Included more information about the L0 cache in the commit message.
--- tools/perf/Documentation/perf-record.txt | 2 +- tools/perf/util/bpf-filter.l | 1 + tools/perf/util/mem-events.c | 5 +++++ tools/perf/util/mem-events.h | 1 + 4 files changed, 8 insertions(+), 1 deletion(-)
tools/perf/Documentation/perf-record.txt +1 -1
@@ -212,7 +212,7 @@ OPTIONS The <value> can be one of: <number> (for any term) na, load, store, pfetch, exec (for mem_op) - l1, l2, l3, l4, cxl, io, any_cache, lfb, ram, pmem (for mem_lvl) + l0, l1, l2, l3, l4, cxl, io, any_cache, lfb, ram, pmem (for mem_lvl) na, none, hit, miss, hitm, fwd, peer (for mem_snoop) remote (for mem_remote) na, locked (for mem_locked)
tools/perf/util/bpf-filter.l +1 -0
@@ -131,6 +131,7 @@ store { return constant(PERF_MEM_OP_STORE); } pfetch { return constant(PERF_MEM_OP_PFETCH); } exec { return constant(PERF_MEM_OP_EXEC); } +l0 { return constant(PERF_MEM_LVLNUM_L0); } l1 { return constant(PERF_MEM_LVLNUM_L1); } l2 { return constant(PERF_MEM_LVLNUM_L2); } l3 { return constant(PERF_MEM_LVLNUM_L3); }
tools/perf/util/mem-events.c +5 -0
@@ -391,6 +391,7 @@ static const char * const mem_lvlnum[] = { [PERF_MEM_LVLNUM_L4] = "L4", [PERF_MEM_LVLNUM_L2_MHB] = "L2 MHB", [PERF_MEM_LVLNUM_MSC] = "Memory-side Cache", + [PERF_MEM_LVLNUM_L0] = "L0", [PERF_MEM_LVLNUM_UNC] = "Uncached", [PERF_MEM_LVLNUM_CXL] = "CXL", [PERF_MEM_LVLNUM_IO] = "I/O",
@@ -831,6 +832,8 @@ int mem_stat_index(const enum mem_stat_type mst, const u64 val) }case PERF_MEM_STAT_CACHE :switch (src.mem_lvl_num) { +case PERF_MEM_LVLNUM_L0 : +return MEM_STAT_CACHE_L0 ;case PERF_MEM_LVLNUM_L1 :return MEM_STAT_CACHE_L1 ;case PERF_MEM_LVLNUM_L2 :
@@ -915,6 +918,8 @@ const char *mem_stat_name(const enum mem_stat_type mst, const int idx) }case PERF_MEM_STAT_CACHE :switch (idx) { +case MEM_STAT_CACHE_L0 : +return "L0" ;case MEM_STAT_CACHE_L1 :return "L1" ;case MEM_STAT_CACHE_L2 :
tools/perf/util/mem-events.h +1 -0
@@ -109,6 +109,7 @@ enum mem_stat_op { };enum mem_stat_cache { +MEM_STAT_CACHE_L0 ,MEM_STAT_CACHE_L1 ,MEM_STAT_CACHE_L2 ,MEM_STAT_CACHE_L3 ,
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 2/6] perf mem: Add support for printing PERF_MEM_LVLNUM_L0
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 15 lines
From: Dapeng Mi <[email protected]>
Add support for printing
PERF_MEM_LVLNUM_L0in perf mem report.The L0 cache is newly added a small piece of cache which is the closest, lowest-latency memory cache tied directly to the execution pipeline.
The table "Table 9-4. Data Source Field Encodings for Panther Cove and Coyote Cove Microarchitectures" in the ISE doc chapter "9.2.1 Panther Cove and Coyote Cove Microarchitectures Memory Auxiliary Field Layout"[1] indicates the code "01H" means the "L0 Hit - Minimal latency core cache hit. This request was satisfied by the L0 data cache."
Quoted 8 lines
Assisted-by Sashiko:gemini-3.1-pro-previewCodeveloped-by Thomas Falcon <[email protected]>Reviewed-by Dapeng Mi <[email protected]>Reviewed-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>Signed-off-by Thomas Falcon <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=2
PATCH v8 3/6 perf header: Support memory ranges
In reply to Thomas FalconMemory ranges were created to track different types of memory, such as persistent, high bandwidth, or CXL-attached, that may be present on a system for performance monitoring and resource control purposes.
Memory range data are parsed from the ACPI MRRM table and exposed to userspace tools via sysfs [1]. Memory range data is read from:
/sys/firmware/acpi/memory_ranges/rangeX
With the following attributes:
u64 base; u64 length; int node; u8 local_region_id; u8 remote_region_id;
Read memory range data from sysfs if present and save it in the header of the perf data file under a new feature bit, HEADER_MEMORY_RANGES (35). Memory range data can be viewed with the --header or --header-only options of perf-report and perf-script.
Example output:
# memory ranges (nr 5): # range0: [0x0000000000000000-0x00000000bfffffff], node = 0, local_region_id = 0, remote_region_id = 255 # range1: [0x0000000100000000-0x000000203fffffff], node = 0, local_region_id = 0, remote_region_id = 255 # range2: [0x0000008000000000-0x0000027fffffffff], node = -2, local_region_id = 1, remote_region_id = 255 # range3: [0x0000028000000000-0x0000047fffffffff], node = -2, local_region_id = 1, remote_region_id = 255 # range4: [0x0000048000000000-0x000004ffffffffff], node = -2, local_region_id = 1, remote_region_id = 255
[1]: https://lore.kernel.org/lkml/[email protected]/
---
v4:
-- Fixed bounds checking for local and remote region IDs in
memory_range__read(), which made region "255" invalid
v3:
-- Added missing ff->size check in process_memory_ranges()
-- used open/openat to read memory range sysfs files in memory_range__read() -- Removed path name and file name buffers in memory_range__read(),
instead pass path name from as a parameter from memory_range__parse()
-- use calloc instead of zalloc in memory_range__parse() and
process_memory_ranges()
-- Removed redundant check for existance of memory range directory in
memory_range__read()
-- Included examples of memory range output in commit message
v2:
-- Added check for NULL return of sysfs__mountpoint() when parsing
memory ranges in sysfs
-- increased MAX_MEMORY_RANGES sanity check from 64 to 256 based on
ACPI MRRM table implementation in Linux kernel
-- added comment for MAX_MEMORY_RANGES to clarify that it is a sanity check
for malformed perf.data files
-- removed a line of code was removed from util/env.h but was added back in
v1 due to bad rebase
--- .../Documentation/perf.data-file-format.txt | 13 ++ tools/perf/builtin-inject.c | 1 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 10 + tools/perf/util/header.c | 203 ++++++++++++++++++ tools/perf/util/header.h | 1 + 6 files changed, 229 insertions(+)
tools/perf/Documentation/perf.data-file-format.txt +13 -0
@@ -478,6 +478,19 @@ The size of the cacheline in bytes. Format: unsigned int cln_size; + HEADER_MEMORY_RANGES = 35, + +List of memory ranges. The format of the data is as below. + +u32 nr_memory_ranges; +struct memory_range { + u64 base; + u64 length; + int node; + u8 local_region_id; + u8 remote_region_id; +}; [nr_memory_ranges] + other bits are reserved and should be ignored for now HEADER_FEAT_BITS = 256,
tools/perf/builtin-inject.c +1 -0
@@ -2306,6 +2306,7 @@ static bool keep_feat(struct perf_inject *inject, int feat)case HEADER_PMU_CAPS :case HEADER_CPU_DOMAIN_INFO :case HEADER_CLN_SIZE : +case HEADER_MEMORY_RANGES :return true;/* Information that can be updated */ case HEADER_BUILD_ID :
tools/perf/util/env.c +1 -0
@@ -297,6 +297,7 @@ void perf_env__exit(struct perf_env *env)zfree (&env->pmu_caps[i].pmu_name); }zfree (&env->pmu_caps); +zfree (&env->memory_ranges);free_cpu_domain_info (env->cpu_domain, env->schedstat_version, env->nr_cpus_avail); }
tools/perf/util/env.h +10 -0
@@ -68,6 +68,14 @@ struct cpu_domain_map {struct domain_info **domains; }; +struct memory_range { +u64 base; +u64 length; +int node; +u8 local_region_id; +u8 remote_region_id; +}; +struct perf_env {char *hostname;char *os_release;
@@ -100,6 +108,7 @@ struct perf_env {int nr_cpu_pmu_caps;int nr_hybrid_nodes;int nr_pmus_with_caps; +int nr_memory_ranges;char *cmdline;const char **cmdline_argv;char *sibling_cores;
@@ -122,6 +131,7 @@ struct perf_env {unsigned long long memory_bsize;struct hybrid_node *hybrid_nodes;struct pmu_caps *pmu_caps; +struct memory_range *memory_ranges;#ifdef HAVE_LIBBPF_SUPPORT /* * bpf_info_lock protects bpf rbtrees. This is needed because the
tools/perf/util/header.c +203 -0
233 lines not on this page · raw message
tools/perf/util/header.h +1 -0
@@ -56,6 +56,7 @@ enum {HEADER_CPU_DOMAIN_INFO ,HEADER_E_MACHINE ,HEADER_CLN_SIZE , +HEADER_MEMORY_RANGES ,HEADER_LAST_FEATURE , HEADER_FEAT_BITS = 256, };
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 3/6] perf header: Support memory ranges
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Missing explicit POSIX header inclusion `<fcntl.h>` for file control APIs. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Missing explicit POSIX header inclusion <fcntl.h> for file control APIs. --
commit ae98e94438c4a105c55741f3c0be511c630d7250
Author: Thomas Falcon <[email protected]>
perf header: Support memory ranges
This commit introduces support for tracking memory ranges to monitor performance and resource control for different memory types. It parses data from ACPI MRRM tables exposed in sysfs and saves it in the perf data file header under HEADER_MEMORY_RANGES.
Quoted 3 lines
tools/perf/util/header.c +0
-0
[ ... ]
tools/perf/util/header.c static int write_cpu_domain_info(struct feat_fd *ff, · line 1902
Quoted 11 lines
tools/perf/util/header.c +7
-0@@ -1892,6 +1893,132 @@ static int write_cpu_domain_info(struct feat_fd *ff,return ret; } +static int memory_range__read (struct memory_range *range,const char *path) +{ +char buf[32 ]; +ssize_t n; +int dfd, fd, tmp, ret =-1 ; + + dfd =open (path,O_RDONLY |O_DIRECTORY );
[Severity: Low]
Does this missing explicit inclusion of <fcntl.h> for file control APIs (open, openat, O_RDONLY, O_DIRECTORY) cause build failures on musl libc systems?
Without the explicit POSIX header inclusion, this might fail to compile on environments where <fcntl.h> isn't implicitly pulled in by other headers.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=3
PATCH v8 4/6 perf tools: Show memory region in perf-c2c subcommand
In reply to Thomas FalconFrom: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total
Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores
0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0
1 0xffffffffa16a9100 0x0 0 991 3.73% 93 93 0 1580 1580 19
2 0xffffffffa16a91c0 0x0 0 37 3.05% 76 76 0 384 384 4
3 0xffffffffa0607a00 0x0 0 1 2.65% 66 66 0 1146 1146 5
4 0xffffffffa16a9200 0x0 0 1 1.72% 43 43 0 174 174 3
5 0xffffffffa0607a80 0x0 0 1 1.16% 29 29 0 439 439 12
6 0xffffffffa16aadc0 0x0 0 1 0.72% 18 18 0 158 158 3
7 0xff30ea3c37934640 N/A 0 51 0.64% 16 16 0 60 60 8
8 0xff30ea3c373b4640 N/A 0 64 0.48% 12 12 0 69 69 11
9 0xff30ea3c387b4640 0x0 0 56 0.48% 12 12 0 59 59 9
10 0xff30ea3c37db4640 N/A 0 49 0.44% 11 11 0 50 50 10[1]: https://lore.kernel.org/all/[email protected]/
---
v8: Update developer tags and commit message with real example output
v7: fix output_str allocation error handling which introduced
a memory leak (Sashiko)
v6: rebased onto 7.3-rc1
v5: make the cacheline header span and ui_quirks() width
fixup depend on memory-region availability (Namhyung Kim)
v4: correctly handle output_str memory allocation failure
v3: make memory region reporting conditional on feature bit
--- tools/perf/builtin-c2c.c | 98 +++++++++++++++++++++++++++++++++++----- tools/perf/util/c2c.h | 1 + 2 files changed, 88 insertions(+), 11 deletions(-)
tools/perf/builtin-c2c.c +87 -11
@@ -71,6 +71,7 @@ struct perf_c2c {bool show_src;bool show_all; +bool show_mem_region;bool use_stdio;bool stats_only;bool symbol_full;
@@ -247,6 +248,18 @@ static void c2c_he__set_node(struct c2c_hist_entry *c2c_he, } } +static void c2c_he__set_mem_region (struct c2c_hist_entry *c2c_he, +unsigned int mem_region) +{ +if (WARN_ONCE (mem_region >PERF_MEM_REGION_MEM7 , +"WARNING: invalid memory region ID\n" )) +return ; + +/* Update mem_region only if it really accesses memory */ +if (mem_region >=PERF_MEM_REGION_MMIO ) + c2c_he->mem_region = mem_region; +} +static void compute_stats (struct c2c_hist_entry *c2c_he,struct c2c_stats *stats,u64 weight)
@@ -305,6 +318,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,struct addr_location al;struct mem_info *mi =NULL ;struct callchain_cursor *cursor; +unsigned int mem_region;int ret;addr_location__init (&al);
@@ -332,6 +346,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, }c2c_decode_stats (&stats, mi); + mem_region =mem_info__data_src (mi)->mem_region; he = hists__add_entry_ops(&c2c_hists->hists, &c2c_entry_ops, &al, NULL, NULL, mi, NULL,
@@ -348,6 +363,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,c2c_he__set_cpu (c2c_he, sample);c2c_he__set_node (c2c_he, sample);c2c_he__set_evsel (c2c_he, evsel); +c2c_he__set_mem_region (c2c_he, mem_region);hists__inc_nr_samples (&c2c_hists->hists, he->filtered);
@@ -401,6 +417,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,c2c_he__set_cpu (c2c_he, sample);c2c_he__set_node (c2c_he, sample);c2c_he__set_evsel (c2c_he, evsel); +c2c_he__set_mem_region (c2c_he, mem_region);hists__inc_nr_samples (&c2c_hists->hists, he->filtered); ret =hist_entry__append_callchain (he, sample);
@@ -539,6 +556,30 @@ dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,return scnprintf (hpp->buf, hpp->size,"%*lu" , width, c2c_he->paddr_cnt); } +static int +dcacheline_node_mem_region (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ +int width =c2c_width (fmt, hpp, he->hists); +struct c2c_hist_entry *c2c_he; +unsigned int mem_region; +char buf[20 ]; + + c2c_he = container_of(he, struct c2c_hist_entry, he); + mem_region = c2c_he->mem_region; + +if (mem_region ==PERF_MEM_REGION_NA ) +scnprintf (buf,sizeof (buf),"N/A" ); +/* mem_region could only be >= PERF_MEM_REGION_MMIO */ +else if (mem_region ==PERF_MEM_REGION_MMIO ) +scnprintf (buf,sizeof (buf),"MMIO" ); +else +scnprintf (buf,sizeof (buf),"0x%x" , + mem_region -PERF_MEM_REGION_MEM0 ); + +return scnprintf (hpp->buf, hpp->size,"%*s" , width, buf); +} +static int offset_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he) {
@@ -1359,6 +1400,14 @@ static struct c2c_dimension dim_dcacheline_node = { .width = 4, }; +static struct c2c_dimension dim_dcacheline_mem_region = { + .header =HEADER_LOW ("Region" ), + .name ="dcacheline_mem_region" , + .cmp = empty_cmp, + .entry = dcacheline_node_mem_region, + .width =6 , +}; +static struct c2c_dimension dim_dcacheline_count = { .header =HEADER_LOW ("PA cnt" ), .name ="dcacheline_count" ,
@@ -1790,6 +1839,7 @@ static struct c2c_dimension dim_dcacheline_num_empty = {static struct c2c_dimension *dimensions[] = { &dim_dcacheline, + &dim_dcacheline_mem_region, &dim_dcacheline_node, &dim_dcacheline_count, &dim_offset,
@@ -2853,8 +2903,11 @@ static int ui_quirks(void)/* Fix the zero line for dcacheline column. */ buf =fill_line (chk_double_cl ?"Double-Cacheline" :"Cacheline" , dim_dcacheline.width + + (c2c.show_mem_region ? + dim_dcacheline_mem_region.width :0 ) + dim_dcacheline_node.width + - dim_dcacheline_count.width +4 ); + dim_dcacheline_count.width + + (c2c.show_mem_region ?6 :4 ));if (!buf)return -ENOMEM ;
@@ -3106,7 +3159,8 @@ static int perf_c2c__report(int argc, const char **argv) OPT_END() };int err =0 ; -const char *output_str, *sort_str =NULL ; +const char *sort_str =NULL ; +char *output_str =NULL ;struct perf_env *env;annotation_options__init ();
@@ -3271,9 +3325,16 @@ static int perf_c2c__report(int argc, const char **argv) goto out_mem2node; } -if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"
@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"
@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }if (c2c.display ==DISPLAY_TOT_HITM ) sort_str ="tot_hitm" ;
@@ -3314,7 +3388,7 @@ static int perf_c2c__report(int argc, const char **argv) err =c2c_hists__reinit (&c2c.hists, output_str, sort_str,perf_session__env (session));if (err) {pr_err ("Failed to reinitialize hists\n" ); - goto out_mem2node; + goto out_str; }ui_progress__init (&prog, c2c.hists.hists.nr_entries,"Sorting..." );
@@ -3323,17 +3397,19 @@ static int perf_c2c__report(int argc, const char **argv)hists__output_resort_cb (&c2c.hists.hists, &prog, resort_shared_cl_cb); err =hists__iterate_cb (&c2c.hists.hists, resort_cl_cb,perf_session__env (session));if (err) - goto out_mem2node; + goto out_str;ui_progress__finish ();if (ui_quirks ()) {pr_err ("failed to setup UI\n" ); - goto out_mem2node; + goto out_str; }perf_c2c_display (session); +out_str: +free (output_str); out_mem2node:mem2node__exit (&c2c.mem2node); out_session:
tools/perf/util/c2c.h +1 -0
@@ -33,6 +33,7 @@ struct c2c_hist_entry {unsigned long *nodeset;struct c2c_stats *node_stats;unsigned int cacheline_idx; +unsigned int mem_region;struct compute_stats cstats;
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 4/6] perf tools: Show memory region in perf-c2c subcommand
Sashiko has reviewed this patch and found no issues. It looks great!
Quoted 15 lines
From: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores 0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0
Quoted 6 lines
[ ... ]Assisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>Reviewed-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>Signed-off-by Thomas Falcon <[email protected]>
Sashiko has reviewed this patch and found no issues. It looks great!
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=4
Re: [PATCH v8 4/6] perf tools: Show memory region in perf-c2c subcommand
In reply to Thomas FalconQuoted 12 lines · Thomas Falcon
From: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
Quoted 13 lines
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total
Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores
0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0
1 0xffffffffa16a9100 0x0 0 991 3.73% 93 93 0 1580 1580 19
2 0xffffffffa16a91c0 0x0 0 37 3.05% 76 76 0 384 384 4
3 0xffffffffa0607a00 0x0 0 1 2.65% 66 66 0 1146 1146 5
4 0xffffffffa16a9200 0x0 0 1 1.72% 43 43 0 174 174 3
5 0xffffffffa0607a80 0x0 0 1 1.16% 29 29 0 439 439 12
6 0xffffffffa16aadc0 0x0 0 1 0.72% 18 18 0 158 158 3
7 0xff30ea3c37934640 N/A 0 51 0.64% 16 16 0 60 60 8
8 0xff30ea3c373b4640 N/A 0 64 0.48% 12 12 0 69 69 11
9 0xff30ea3c387b4640 0x0 0 56 0.48% 12 12 0 59 59 9
10 0xff30ea3c37db4640 N/A 0 49 0.44% 11 11 0 50 50 10It looks good. Thanks.
Quoted 6 lines
[1]: https://lore.kernel.org/all/[email protected]/
Assisted-by Sashiko:gemini-3.1-pro-previewAssisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>
The tag name should be "Co-developed-by" instead of "Codeveloped-by". Besides, the tag should be moved to the place where is after my SoB and before your SoB. :)
Quoted 102 lines
Reviewed-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>Signed-off-by Thomas Falcon <[email protected]>---
v8: Update developer tags and commit message with real example outputv7: fix
output_strallocation error handling which introduced
a memory leak (Sashiko)v6: rebased onto 7.3-rc1
v5: make the cacheline header span and
ui_quirks()width
fixup depend on memory-region availability (Namhyung Kim)v4: correctly handle
output_strmemory allocation failurev3: make memory region reporting conditional on feature bit
--- tools/perf/builtin-c2c.c | 98 +++++++++++++++++++++++++++++++++++----- tools/perf/util/c2c.h | 1 + 2 files changed, 88 insertions(+), 11 deletions(-)tools/perf/builtin-c2c.c +30
-0@@ -71,6 +71,7 @@ struct perf_c2c {bool show_src;bool show_all; +bool show_mem_region;bool use_stdio;bool stats_only;bool symbol_full;@@ -247,6 +248,18 @@ static void c2c_he__set_node(struct c2c_hist_entry *c2c_he, } } +static void c2c_he__set_mem_region (struct c2c_hist_entry *c2c_he, +unsigned int mem_region) +{ +if (WARN_ONCE (mem_region >PERF_MEM_REGION_MEM7 , +"WARNING: invalid memory region ID\n" )) +return ; + +/* Update mem_region only if it really accesses memory */ +if (mem_region >=PERF_MEM_REGION_MMIO ) + c2c_he->mem_region = mem_region; +} +static void compute_stats (struct c2c_hist_entry *c2c_he,struct c2c_stats *stats,u64 weight)@@ -305,6 +318,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,struct addr_location al;struct mem_info *mi =NULL ;struct callchain_cursor *cursor; +unsigned int mem_region;int ret;addr_location__init (&al);@@ -332,6 +346,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused, }c2c_decode_stats (&stats, mi); + mem_region =mem_info__data_src (mi)->mem_region; he = hists__add_entry_ops(&c2c_hists->hists, &c2c_entry_ops, &al, NULL, NULL, mi, NULL,@@ -348,6 +363,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,c2c_he__set_cpu (c2c_he, sample);c2c_he__set_node (c2c_he, sample);c2c_he__set_evsel (c2c_he, evsel); +c2c_he__set_mem_region (c2c_he, mem_region);hists__inc_nr_samples (&c2c_hists->hists, he->filtered);@@ -401,6 +417,7 @@ static int process_sample_event(const struct perf_tool *tool __maybe_unused,c2c_he__set_cpu (c2c_he, sample);c2c_he__set_node (c2c_he, sample);c2c_he__set_evsel (c2c_he, evsel); +c2c_he__set_mem_region (c2c_he, mem_region);hists__inc_nr_samples (&c2c_hists->hists, he->filtered); ret =hist_entry__append_callchain (he, sample);@@ -539,6 +556,30 @@ dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,return scnprintf (hpp->buf, hpp->size,"%*lu" , width, c2c_he->paddr_cnt); } +static int +dcacheline_node_mem_region (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, +struct hist_entry *he) +{ +int width =c2c_width (fmt, hpp, he->hists); +struct c2c_hist_entry *c2c_he; +unsigned int mem_region; +char buf[20 ]; + + c2c_he = container_of(he, struct c2c_hist_entry, he); + mem_region = c2c_he->mem_region; + +if (mem_region ==PERF_MEM_REGION_NA )
tools/perf/builtin-c2c.c dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, · line 581
Quoted 10 lines
tools/perf/builtin-c2c.c +10
-0+scnprintf (buf,sizeof (buf),"N/A" ); +/* mem_region could only be >= PERF_MEM_REGION_MMIO */ + else if (mem_region == PERF_MEM_REGION_MMIO) + scnprintf(buf, sizeof(buf), "MMIO"); + else + scnprintf(buf, sizeof(buf), "0x%x", + mem_region - PERF_MEM_REGION_MEM0); + + return scnprintf(hpp->buf, hpp->size, "%*s", width, buf); +}
It seems the previous comment is missed?
"Is the mem-region column print guarded by HEADER_MEMORY_RANGES as well?"
I'm not quite sure about this, please double check. Thanks.
Quoted 148 lines
tools/perf/builtin-c2c.c +47
-11+static int offset_entry (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he) {@@ -1359,6 +1400,14 @@ static struct c2c_dimension dim_dcacheline_node = { .width = 4, }; +static struct c2c_dimension dim_dcacheline_mem_region = { + .header =HEADER_LOW ("Region" ), + .name ="dcacheline_mem_region" , + .cmp = empty_cmp, + .entry = dcacheline_node_mem_region, + .width =6 , +}; +static struct c2c_dimension dim_dcacheline_count = { .header =HEADER_LOW ("PA cnt" ), .name ="dcacheline_count" ,@@ -1790,6 +1839,7 @@ static struct c2c_dimension dim_dcacheline_num_empty = {static struct c2c_dimension *dimensions[] = { &dim_dcacheline, + &dim_dcacheline_mem_region, &dim_dcacheline_node, &dim_dcacheline_count, &dim_offset,@@ -2853,8 +2903,11 @@ static int ui_quirks(void)/* Fix the zero line for dcacheline column. */ buf =fill_line (chk_double_cl ?"Double-Cacheline" :"Cacheline" , dim_dcacheline.width + + (c2c.show_mem_region ? + dim_dcacheline_mem_region.width :0 ) + dim_dcacheline_node.width + - dim_dcacheline_count.width +4 ); + dim_dcacheline_count.width + + (c2c.show_mem_region ?6 :4 ));if (!buf)return -ENOMEM ;@@ -3106,7 +3159,8 @@ static int perf_c2c__report(int argc, const char **argv) OPT_END() };int err =0 ; -const char *output_str, *sort_str =NULL ; +const char *sort_str =NULL ; +char *output_str =NULL ;struct perf_env *env;annotation_options__init ();@@ -3271,9 +3325,16 @@ static int perf_c2c__report(int argc, const char **argv) goto out_mem2node; } -if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }if (c2c.display ==DISPLAY_TOT_HITM ) sort_str ="tot_hitm" ;@@ -3314,7 +3388,7 @@ static int perf_c2c__report(int argc, const char **argv) err =c2c_hists__reinit (&c2c.hists, output_str, sort_str,perf_session__env (session));if (err) {pr_err ("Failed to reinitialize hists\n" ); - goto out_mem2node; + goto out_str; }ui_progress__init (&prog, c2c.hists.hists.nr_entries,"Sorting..." );@@ -3323,17 +3397,19 @@ static int perf_c2c__report(int argc, const char **argv)hists__output_resort_cb (&c2c.hists.hists, &prog, resort_shared_cl_cb); err =hists__iterate_cb (&c2c.hists.hists, resort_cl_cb,perf_session__env (session));if (err) - goto out_mem2node; + goto out_str;ui_progress__finish ();if (ui_quirks ()) {pr_err ("failed to setup UI\n" ); - goto out_mem2node; + goto out_str; }perf_c2c_display (session); +out_str: +free (output_str); out_mem2node:mem2node__exit (&c2c.mem2node); out_session:tools/perf/util/c2c.h +1
-0@@ -33,6 +33,7 @@ struct c2c_hist_entry {unsigned long *nodeset;struct c2c_stats *node_stats;unsigned int cacheline_idx; +unsigned int mem_region;struct compute_stats cstats;
Re: [PATCH v8 4/6] perf tools: Show memory region in perf-c2c subcommand
Quoted 34 lines · Dapeng
Quoted 11 lines · Thomas Falcon
From: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Quoted 14 lines
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores 0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0 1 0xffffffffa16a9100 0x0 0 991 3.73% 93 93 0 1580 1580 19 2 0xffffffffa16a91c0 0x0 0 37 3.05% 76 76 0 384 384 4 3 0xffffffffa0607a00 0x0 0 1 2.65% 66 66 0 1146 1146 5 4 0xffffffffa16a9200 0x0 0 1 1.72% 43 43 0 174 174 3 5 0xffffffffa0607a80 0x0 0 1 1.16% 29 29 0 439 439 12 6 0xffffffffa16aadc0 0x0 0 1 0.72% 18 18 0 158 158 3 7 0xff30ea3c37934640 N/A 0 51 0.64% 16 16 0 60 60 8 8 0xff30ea3c373b4640 N/A 0 64 0.48% 12 12 0 69 69 11 9 0xff30ea3c387b4640 0x0 0 56 0.48% 12 12 0 59 59 9 10 0xff30ea3c37db4640 N/A 0 49 0.44% 11 11 0 50 50 10It looks good. Thanks.
Quoted 3 lines
Quoted 7 lines
Quoted 3 lines
Assisted-by Sashiko:gemini-3.1-pro-previewAssisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>The tag name should be "Co-developed-by" instead of "Codeveloped-by". Besides, the tag should be moved to the place where is after my SoB and before your SoB. :)
Ah, sorry about that, I will fix it up soon. See further comments below...
...
Quoted 26 lines
Quoted 13 lines
tools/perf/builtin-c2c.c +13
-0+static int +dcacheline_node_mem_region (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, + struct hist_entry *he) +{ +int width =c2c_width (fmt, hpp, he->hists); +struct c2c_hist_entry *c2c_he; +unsigned int mem_region; +char buf[20 ]; + + c2c_he = container_of(he, struct c2c_hist_entry, he); + mem_region = c2c_he->mem_region; + +if (mem_region ==PERF_MEM_REGION_NA )tools/perf/builtin-c2c.c dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, · line 581
Quoted 10 lines
tools/perf/builtin-c2c.c +10
-0+ scnprintf(buf, sizeof(buf), "N/A"); +/* mem_region could only be >= PERF_MEM_REGION_MMIO */ + else if (mem_region == PERF_MEM_REGION_MMIO) + scnprintf(buf, sizeof(buf), "MMIO"); + else + scnprintf(buf, sizeof(buf), "0x%x", + mem_region - PERF_MEM_REGION_MEM0); + + return scnprintf(hpp->buf, hpp->size, "%*s", width, buf); +}It seems the previous comment is missed?
Quoted 3 lines
"Is the mem-region column print guarded by
HEADER_MEMORY_RANGESas well?"I'm not quite sure about this, please double check. Thanks.
Sorry, I missed your two comments below your first regarding developer tags.
If you refer to this change below, dcacheline_mem_region is printed only if c2c.show_mem_region (perf_header__has_feat(&session->header, HEADER_MEMORY_RANGES)) == true, otherwise it is not included in output_str. I will update perf-c2c to include cache regions as well to be more consistent with perf-script in a new version and fix the tag mistakes.
Tom
- if (c2c.display != DISPLAY_SNP_PEER)
- output_str = "cl_idx,"perf_header__has_feat(&session->header,
+ HEADER_MEMORY_RANGES);
+ c2c.show_mem_region = perf_header__has_feat(&session->header,
+ HEADER_MEMORY_RANGES);
+ if (c2c.show_mem_region)
+ dim_dcacheline.header.line[0].span = 3;
+
+ if (c2c.display != DISPLAY_SNP_PEER) {
+ if (asprintf(&output_str,
+ "cl_idx,"
"dcacheline,"
+ "%s"
"dcacheline_node,"
"dcacheline_count," "percent_costly_snoop,"
@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv)
"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
- "dram_lcl,dram_rmt";
- else
- output_str = "cl_idx,"
+ "dram_lcl,dram_rmt",
+ c2c.show_mem_region ?
+ "dcacheline_mem_region," : "") < 0) {+ err = -ENOMEM;
+ goto out_mem2node;
+ }
+ } else {
+ if (asprintf(&output_str,
+ "cl_idx,"
"dcacheline,"
+ "%s"
"dcacheline_node," "dcacheline_count," "percent_costly_snoop,"
@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv)
"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
- "dram_lcl,dram_rmt";
+ "dram_lcl,dram_rmt",
+ c2c.show_mem_region ?
+ "dcacheline_mem_region," : "") < 0) {+ err = -ENOMEM;
+ goto out_mem2node;
+ }
+ }
Quoted 150 lines
Quoted 150 lines
+
static intoffset_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, struct hist_entry *he)
{tools/perf/builtin-c2c.c +0
-0@@ -1359,6 +1400,14 @@ static struct c2c_dimension dim_dcacheline_node = { .width = 4, };tools/perf/builtin-c2c.c +8
-0+static struct c2c_dimension dim_dcacheline_mem_region = { + .header =HEADER_LOW ("Region" ), + .name ="dcacheline_mem_region" , + .cmp = empty_cmp, + .entry = dcacheline_node_mem_region, + .width =6 , +}; +static struct
c2c_dimensiondim_dcacheline_count= {
.header =HEADER_LOW("PA cnt"),
.name = "dcacheline_count",(quoted diff) +0
-0@@ -1790,6 +1839,7 @@ static struct c2c_dimension dim_dcacheline_num_empty = {
static structc2c_dimension*dimensions[] = {
&dim_dcacheline,tools/perf/builtin-c2c.c +1
-0+ &dim_dcacheline_mem_region,
&dim_dcacheline_node,
&dim_dcacheline_count,
&dim_offset,tools/perf/builtin-c2c.c +0
-0@@ -2853,8 +2903,11 @@ static int ui_quirks(void) /* Fix the zero line for dcacheline column. */ buf = fill_line(chk_double_cl ? "Double-Cacheline" : "Cacheline",dim_dcacheline.width +
tools/perf/builtin-c2c.c +2
-0+ (c2c.show_mem_region ? + dim_dcacheline_mem_region.width : 0) +dim_dcacheline_node.width +
tools/perf/builtin-c2c.c +2
-1- dim_dcacheline_count.width + 4); + dim_dcacheline_count.width + + (c2c.show_mem_region ? 6 : 4));if (!buf)
return-ENOMEM;tools/perf/builtin-c2c.c +2
-1@@ -3106,7 +3159,8 @@ static int perf_c2c__report(int argc, const char **argv) OPT_END() }; int err = 0; -const char *output_str, *sort_str =NULL ; +const char *sort_str =NULL ; +char *output_str =NULL ; struct perf_env *env;
annotation_options__init();tools/perf/builtin-c2c.c +0
-0@@ -3271,9 +3325,16 @@ static int perf_c2c__report(int argc, const char **argv) goto out_mem2node; }tools/perf/builtin-c2c.c +8
-2-if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +9
-3- "dram_lcl,dram_rmt"; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +7
-1- "dram_lcl,dram_rmt"; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }
if (c2c.display ==DISPLAY_TOT_HITM)
sort_str= "tot_hitm";tools/perf/builtin-c2c.c +1
-1@@ -3314,7 +3388,7 @@ static int perf_c2c__report(int argc, const char **argv) err = c2c_hists__reinit(&c2c.hists, output_str, sort_str, perf_session__env(session)); if (err) { pr_err("Failed to reinitialize hists\n"); - goto out_mem2node; + goto out_str; }
ui_progress__init(&prog, c2c.hists.hists.nr_entries, "Sorting...");tools/perf/builtin-c2c.c +1
-1@@ -3323,17 +3397,19 @@ static int perf_c2c__report(int argc, const char **argv) hists__output_resort_cb(&c2c.hists.hists, &prog, resort_shared_cl_cb); err = hists__iterate_cb(&c2c.hists.hists, resort_cl_cb, perf_session__env(session)); if (err) - goto out_mem2node; + goto out_str;
ui_progress__finish();
if (ui_quirks()) {
pr_err("failed to setup UI\n");(quoted diff) +1
-1- goto out_mem2node; + goto out_str;}
perf_c2c_display(session);tools/perf/builtin-c2c.c +2
-0+out_str: +free (output_str);out_mem2node:
mem2node__exit(&c2c.mem2node);
out_session:tools/perf/util/c2c.h +1
-0@@ -33,6 +33,7 @@ struct c2c_hist_entry { unsigned long *nodeset; struct c2c_stats *node_stats; unsigned int cacheline_idx; +unsigned int mem_region;
structcompute_statscstats;
Re: [PATCH v8 4/6] perf tools: Show memory region in perf-c2c subcommand
Quoted 67 lines · Thomas
Quoted 29 lines · Dapeng
Quoted 11 lines · Thomas Falcon
From: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Quoted 14 lines
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores 0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0 1 0xffffffffa16a9100 0x0 0 991 3.73% 93 93 0 1580 1580 19 2 0xffffffffa16a91c0 0x0 0 37 3.05% 76 76 0 384 384 4 3 0xffffffffa0607a00 0x0 0 1 2.65% 66 66 0 1146 1146 5 4 0xffffffffa16a9200 0x0 0 1 1.72% 43 43 0 174 174 3 5 0xffffffffa0607a80 0x0 0 1 1.16% 29 29 0 439 439 12 6 0xffffffffa16aadc0 0x0 0 1 0.72% 18 18 0 158 158 3 7 0xff30ea3c37934640 N/A 0 51 0.64% 16 16 0 60 60 8 8 0xff30ea3c373b4640 N/A 0 64 0.48% 12 12 0 69 69 11 9 0xff30ea3c387b4640 0x0 0 56 0.48% 12 12 0 59 59 9 10 0xff30ea3c37db4640 N/A 0 49 0.44% 11 11 0 50 50 10It looks good. Thanks.
Quoted 8 lines
Quoted 5 lines
[1]: https://lore.kernel.org/all/[email protected]/
Assisted-by Sashiko:gemini-3.1-pro-previewAssisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>The tag name should be "Co-developed-by" instead of "Codeveloped-by". Besides, the tag should be moved to the place where is after my SoB and before your SoB. :)
Ah, sorry about that, I will fix it up soon. See further comments below...
...
Quoted 25 lines
Quoted 13 lines
tools/perf/builtin-c2c.c +13
-0+static int +dcacheline_node_mem_region (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, + struct hist_entry *he) +{ +int width =c2c_width (fmt, hpp, he->hists); +struct c2c_hist_entry *c2c_he; +unsigned int mem_region; +char buf[20 ]; + + c2c_he = container_of(he, struct c2c_hist_entry, he); + mem_region = c2c_he->mem_region; + +if (mem_region ==PERF_MEM_REGION_NA )tools/perf/builtin-c2c.c dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, · line 581
Quoted 10 lines
tools/perf/builtin-c2c.c +10
-0+ scnprintf(buf, sizeof(buf), "N/A"); +/* mem_region could only be >= PERF_MEM_REGION_MMIO */ + else if (mem_region == PERF_MEM_REGION_MMIO) + scnprintf(buf, sizeof(buf), "MMIO"); + else + scnprintf(buf, sizeof(buf), "0x%x", + mem_region - PERF_MEM_REGION_MEM0); + + return scnprintf(hpp->buf, hpp->size, "%*s", width, buf); +}It seems the previous comment is missed?
Quoted 7 lines
Quoted 3 lines
"Is the mem-region column print guarded by
HEADER_MEMORY_RANGESas well?"I'm not quite sure about this, please double check. Thanks.
Sorry, I missed your two comments below your first regarding developer tags.
If you refer to this change below,
dcacheline_mem_regionis printed only if c2c.show_mem_region (perf_header__has_feat(&session->header, HEADER_MEMORY_RANGES)) == true, otherwise it is not included inoutput_str. I will update perf-c2c to include cache regions as well to be more consistent with perf-script in a new version and fix the tag mistakes.
Thanks. We need to ensure dcacheline_mem_region is printed only when the header exists. Other it would cause misleading for users.
If we plan to add cache region in the "region" column, we could need to add "mem" prefix before the memory region ID which avoids the ambiguity. Besides, we'd better change the region id to decimal format after adding the "mem" prefix.
Quoted 201 lines
Tom
tools/perf/builtin-c2c.c +27
-6-if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," perf_header__has_feat(&session->header, + HEADER_MEMORY_RANGES); + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx," "dcacheline," + "%s" "dcacheline_node," "dcacheline_count," "percent_costly_snoop,"@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv) "ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm," -"dram_lcl,dram_rmt" ; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }Quoted 149 lines
Quoted 149 lines
+
static intoffset_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, struct hist_entry *he)
{tools/perf/builtin-c2c.c +0
-0@@ -1359,6 +1400,14 @@ static struct c2c_dimension dim_dcacheline_node = { .width = 4, };tools/perf/builtin-c2c.c +8
-0+static struct c2c_dimension dim_dcacheline_mem_region = { + .header =HEADER_LOW ("Region" ), + .name ="dcacheline_mem_region" , + .cmp = empty_cmp, + .entry = dcacheline_node_mem_region, + .width =6 , +}; +static struct
c2c_dimensiondim_dcacheline_count= {
.header =HEADER_LOW("PA cnt"),
.name = "dcacheline_count",(quoted diff) +0
-0@@ -1790,6 +1839,7 @@ static struct c2c_dimension dim_dcacheline_num_empty = {
static structc2c_dimension*dimensions[] = {
&dim_dcacheline,tools/perf/builtin-c2c.c +1
-0+ &dim_dcacheline_mem_region,
&dim_dcacheline_node,
&dim_dcacheline_count,
&dim_offset,tools/perf/builtin-c2c.c +0
-0@@ -2853,8 +2903,11 @@ static int ui_quirks(void) /* Fix the zero line for dcacheline column. */ buf = fill_line(chk_double_cl ? "Double-Cacheline" : "Cacheline",dim_dcacheline.width +
tools/perf/builtin-c2c.c +2
-0+ (c2c.show_mem_region ? + dim_dcacheline_mem_region.width : 0) +dim_dcacheline_node.width +
tools/perf/builtin-c2c.c +2
-1- dim_dcacheline_count.width + 4); + dim_dcacheline_count.width + + (c2c.show_mem_region ? 6 : 4));if (!buf)
return-ENOMEM;tools/perf/builtin-c2c.c +2
-1@@ -3106,7 +3159,8 @@ static int perf_c2c__report(int argc, const char **argv) OPT_END() }; int err = 0; -const char *output_str, *sort_str =NULL ; +const char *sort_str =NULL ; +char *output_str =NULL ; struct perf_env *env;
annotation_options__init();tools/perf/builtin-c2c.c +0
-0@@ -3271,9 +3325,16 @@ static int perf_c2c__report(int argc, const char **argv) goto out_mem2node; }tools/perf/builtin-c2c.c +8
-2-if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +9
-3- "dram_lcl,dram_rmt"; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +7
-1- "dram_lcl,dram_rmt"; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }
if (c2c.display ==DISPLAY_TOT_HITM)
sort_str= "tot_hitm";tools/perf/builtin-c2c.c +1
-1@@ -3314,7 +3388,7 @@ static int perf_c2c__report(int argc, const char **argv) err = c2c_hists__reinit(&c2c.hists, output_str, sort_str, perf_session__env(session)); if (err) { pr_err("Failed to reinitialize hists\n"); - goto out_mem2node; + goto out_str; }
ui_progress__init(&prog, c2c.hists.hists.nr_entries, "Sorting...");tools/perf/builtin-c2c.c +1
-1@@ -3323,17 +3397,19 @@ static int perf_c2c__report(int argc, const char **argv) hists__output_resort_cb(&c2c.hists.hists, &prog, resort_shared_cl_cb); err = hists__iterate_cb(&c2c.hists.hists, resort_cl_cb, perf_session__env(session)); if (err) - goto out_mem2node; + goto out_str;
ui_progress__finish();
if (ui_quirks()) {
pr_err("failed to setup UI\n");(quoted diff) +1
-1- goto out_mem2node; + goto out_str;}
perf_c2c_display(session);tools/perf/builtin-c2c.c +2
-0+out_str: +free (output_str);out_mem2node:
mem2node__exit(&c2c.mem2node);
out_session:tools/perf/util/c2c.h +1
-0@@ -33,6 +33,7 @@ struct c2c_hist_entry { unsigned long *nodeset; struct c2c_stats *node_stats; unsigned int cacheline_idx; +unsigned int mem_region;
structcompute_statscstats;
Re: [PATCH v8 4/6] perf tools: Show memory region in perf-c2c subcommand
Quoted 78 lines · Dapeng
Quoted 67 lines · Thomas
Quoted 29 lines · Dapeng
Quoted 11 lines · Thomas Falcon
From: Dapeng Mi <[email protected]>
Add memory region field to the cacheline list view to help users identify the memory region to which the cacheline belongs. The memory region field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake architectures.
An example of the new perf c2c output including the memory region field is shown below:
Quoted 14 lines
Shared Data Cache Line Table (181 entries, sorted on Total HITMs)
--------------- Cacheline -------------- Tot ------- Load Hitm ------- Total Total Total Index Address Region Node PA cnt Hitm Total LclHitm RmtHitm records Loads Stores 0 0xffffffffa1658ec0 0x0 0 1302 4.13% 103 103 0 1707 1707 0 1 0xffffffffa16a9100 0x0 0 991 3.73% 93 93 0 1580 1580 19 2 0xffffffffa16a91c0 0x0 0 37 3.05% 76 76 0 384 384 4 3 0xffffffffa0607a00 0x0 0 1 2.65% 66 66 0 1146 1146 5 4 0xffffffffa16a9200 0x0 0 1 1.72% 43 43 0 174 174 3 5 0xffffffffa0607a80 0x0 0 1 1.16% 29 29 0 439 439 12 6 0xffffffffa16aadc0 0x0 0 1 0.72% 18 18 0 158 158 3 7 0xff30ea3c37934640 N/A 0 51 0.64% 16 16 0 60 60 8 8 0xff30ea3c373b4640 N/A 0 64 0.48% 12 12 0 69 69 11 9 0xff30ea3c387b4640 0x0 0 56 0.48% 12 12 0 59 59 9 10 0xff30ea3c37db4640 N/A 0 49 0.44% 11 11 0 50 50 10It looks good. Thanks.
Quoted 8 lines
Quoted 5 lines
[1]: https://lore.kernel.org/all/[email protected]/
Assisted-by Sashiko:gemini-3.1-pro-previewAssisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>The tag name should be "Co-developed-by" instead of "Codeveloped-by". Besides, the tag should be moved to the place where is after my SoB and before your SoB. :)
Ah, sorry about that, I will fix it up soon. See further comments below...
...
Quoted 25 lines
Quoted 13 lines
tools/perf/builtin-c2c.c +13
-0+static int +dcacheline_node_mem_region (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp, + struct hist_entry *he) +{ +int width =c2c_width (fmt, hpp, he->hists); +struct c2c_hist_entry *c2c_he; +unsigned int mem_region; +char buf[20 ]; + + c2c_he = container_of(he, struct c2c_hist_entry, he); + mem_region = c2c_he->mem_region; + +if (mem_region ==PERF_MEM_REGION_NA )tools/perf/builtin-c2c.c dcacheline_node_count(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, · line 581
Quoted 10 lines
tools/perf/builtin-c2c.c +10
-0+ scnprintf(buf, sizeof(buf), "N/A"); +/* mem_region could only be >= PERF_MEM_REGION_MMIO */ + else if (mem_region == PERF_MEM_REGION_MMIO) + scnprintf(buf, sizeof(buf), "MMIO"); + else + scnprintf(buf, sizeof(buf), "0x%x", + mem_region - PERF_MEM_REGION_MEM0); + + return scnprintf(hpp->buf, hpp->size, "%*s", width, buf); +}It seems the previous comment is missed?
Quoted 8 lines
Quoted 3 lines
"Is the mem-region column print guarded by
HEADER_MEMORY_RANGESas well?"I'm not quite sure about this, please double check. Thanks.
Sorry, I missed your two comments below your first regarding developer tags.
If you refer to this change below,
dcacheline_mem_regionis printed only if c2c.show_mem_region (perf_header__has_feat(&session->header, HEADER_MEMORY_RANGES)) == true, otherwise it is not included inoutput_str. I will update perf-c2c to include cache regions as well to be more consistent with perf-script in a new version and fix the tag mistakes.
Quoted 7 lines
Thanks. We need to ensure
dcacheline_mem_regionis printed only when the header exists. Other it would cause misleading for users.If we plan to add cache region in the "region" column, we could need to add "mem" prefix before the memory region ID which avoids the ambiguity. Besides, we'd better change the region id to decimal format after adding the "mem" prefix.
Ok, sounds good, I am working on a new version now.
Thanks,
Tom
Quoted 204 lines
Quoted 204 lines
Tom
tools/perf/builtin-c2c.c +9
-2-if (c2c.display !=DISPLAY_SNP_PEER ) - output_str = "cl_idx,"perf_header__has_feat(&session->header, + HEADER_MEMORY_RANGES); + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +9
-3- "dram_lcl,dram_rmt"; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +7
-1- "dram_lcl,dram_rmt"; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }Quoted 149 lines
Quoted 149 lines
+
static intoffset_entry(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, struct hist_entry *he)
{tools/perf/builtin-c2c.c +0
-0@@ -1359,6 +1400,14 @@ static struct c2c_dimension dim_dcacheline_node = { .width = 4, };tools/perf/builtin-c2c.c +8
-0+static struct c2c_dimension dim_dcacheline_mem_region = { + .header =HEADER_LOW ("Region" ), + .name ="dcacheline_mem_region" , + .cmp = empty_cmp, + .entry = dcacheline_node_mem_region, + .width =6 , +}; +static struct
c2c_dimensiondim_dcacheline_count= {
.header =HEADER_LOW("PA cnt"),
.name = "dcacheline_count",(quoted diff) +0
-0@@ -1790,6 +1839,7 @@ static struct c2c_dimension dim_dcacheline_num_empty = {
static structc2c_dimension*dimensions[] = {
&dim_dcacheline,tools/perf/builtin-c2c.c +1
-0+ &dim_dcacheline_mem_region,
&dim_dcacheline_node,
&dim_dcacheline_count,
&dim_offset,tools/perf/builtin-c2c.c +0
-0@@ -2853,8 +2903,11 @@ static int ui_quirks(void) /* Fix the zero line for dcacheline column. */ buf = fill_line(chk_double_cl ? "Double-Cacheline" : "Cacheline",dim_dcacheline.width +
tools/perf/builtin-c2c.c +2
-0+ (c2c.show_mem_region ? + dim_dcacheline_mem_region.width : 0) +dim_dcacheline_node.width +
tools/perf/builtin-c2c.c +2
-1- dim_dcacheline_count.width + 4); + dim_dcacheline_count.width + + (c2c.show_mem_region ? 6 : 4));if (!buf)
return-ENOMEM;tools/perf/builtin-c2c.c +2
-1@@ -3106,7 +3159,8 @@ static int perf_c2c__report(int argc, const char **argv) OPT_END() }; int err = 0; -const char *output_str, *sort_str =NULL ; +const char *sort_str =NULL ; +char *output_str =NULL ; struct perf_env *env;
annotation_options__init();tools/perf/builtin-c2c.c +0
-0@@ -3271,9 +3325,16 @@ static int perf_c2c__report(int argc, const char **argv) goto out_mem2node; }tools/perf/builtin-c2c.c +8
-2-if (c2c.display !=DISPLAY_SNP_PEER ) - output_str ="cl_idx," + c2c.show_mem_region =perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES ); +if (c2c.show_mem_region) + dim_dcacheline.header.line[0 ].span =3 ; + +if (c2c.display !=DISPLAY_SNP_PEER ) { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3285,10 +3346,17 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +9
-3- "dram_lcl,dram_rmt"; - else - output_str ="cl_idx," + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }else { + if (asprintf(&output_str, + "cl_idx,""dcacheline,"
(quoted diff) +1
-0+ "%s""
dcacheline_node," "dcacheline_count," "percent_costly_snoop,"(quoted diff) +0
-0@@ -3300,7 +3368,13 @@ static int perf_c2c__report(int argc, const char **argv)"ld_fbhit,ld_l1hit,ld_l2hit," "ld_lclhit,lcl_hitm," "ld_rmthit,rmt_hitm,"
tools/perf/builtin-c2c.c +7
-1- "dram_lcl,dram_rmt"; + "dram_lcl,dram_rmt", + c2c.show_mem_region ? + "dcacheline_mem_region," : "") < 0) { + err = -ENOMEM ; + goto out_mem2node; + } + }
if (c2c.display ==DISPLAY_TOT_HITM)
sort_str= "tot_hitm";tools/perf/builtin-c2c.c +1
-1@@ -3314,7 +3388,7 @@ static int perf_c2c__report(int argc, const char **argv) err = c2c_hists__reinit(&c2c.hists, output_str, sort_str, perf_session__env(session)); if (err) { pr_err("Failed to reinitialize hists\n"); - goto out_mem2node; + goto out_str; }
ui_progress__init(&prog, c2c.hists.hists.nr_entries, "Sorting...");tools/perf/builtin-c2c.c +1
-1@@ -3323,17 +3397,19 @@ static int perf_c2c__report(int argc, const char **argv) hists__output_resort_cb(&c2c.hists.hists, &prog, resort_shared_cl_cb); err = hists__iterate_cb(&c2c.hists.hists, resort_cl_cb, perf_session__env(session)); if (err) - goto out_mem2node; + goto out_str;
ui_progress__finish();
if (ui_quirks()) {
pr_err("failed to setup UI\n");(quoted diff) +1
-1- goto out_mem2node; + goto out_str;}
perf_c2c_display(session);tools/perf/builtin-c2c.c +2
-0+out_str: +free (output_str);out_mem2node:
mem2node__exit(&c2c.mem2node);
out_session:tools/perf/util/c2c.h +1
-0@@ -33,6 +33,7 @@ struct c2c_hist_entry { unsigned long *nodeset; struct c2c_stats *node_stats; unsigned int cacheline_idx; +unsigned int mem_region;
structcompute_statscstats;
PATCH v8 5/6 perf tools: Show memory region in perf-script subcommand
In reply to Thomas FalconFrom: Dapeng Mi <[email protected]>
Show the memory region in perf-script subcommand. Memory region is found in the mem_region field of the memory information data source. This field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake Architectures.
An example of perf-script output with the new memory region field is shown below:
thread 5/0 ... |OP LOAD|LVL L3 hit|SNP HitM|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9f002aba
thread 2/0 ... |OP LOAD|LVL L3 hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9dc54c95
thread 8/0 ... |OP LOAD|LVL L3 hit|SNP HitM|TLB L1 or L2 hit|LCK No|BLK N/A|Region Other-non-shared-cache ffffffff9dc54db3
thread 0/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK No|BLK Addr|Region N/A ffffffff9dc54db3
thread 2/0 ... |OP LOAD|LVL L0 hit|SNP None|TLB L1 or L2 hit|LCK Yes|BLK N/A|Region N/A ffffffff9f002a8c
thread 0/0 ... |OP LOAD|LVL L3 hit|SNP HitM or Fwd|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-non-shared-cache ffffffff9f002aba
thread 0/0 ... |OP LOAD|LVL L3 hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9dc54ca7
thread 30/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK Yes|BLK N/A|Region N/A ffffffff9dcc1ff2
thread 30/0 ... |OP LOAD|LVL RAM hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Mem-0 ffffffff9dc54c95
thread 19/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region N/A ffffffff9f002cbb
thread 19/0 ... |OP LOAD|LVL L3 hit|SNP HitM or Fwd|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-non-shared-cache ffffffff9f002aba[1]: https://lore.kernel.org/all/[email protected]/
---
v8: Update developer tags and commit message with real example output
v4: Drop the global show-region flag; pass perf_session to
perf_script__meminfo_scnprintf() and gate the Region field on the feature bit, with a pipe-mode fallback
v3: make memory region reporting conditional on feature bit
--- tools/perf/builtin-script.c | 13 +-- tools/perf/util/mem-events.c | 86 ++++++++++++++++++- tools/perf/util/mem-events.h | 4 +- .../scripting-engines/trace-event-python.c | 5 +- 4 files changed, 98 insertions(+), 10 deletions(-)
tools/perf/builtin-script.c +7 -6
@@ -2078,11 +2078,12 @@ static int evlist__max_name_len(struct evlist *evlist)return max; } -static int data_src__fprintf (u64 data_src,FILE *fp) +static int data_src__fprintf (struct perf_session *session, +u64 data_src,FILE *fp) {struct mem_info *mi =mem_info__new (); -char decode[100 ]; -char out[100 ]; +char decode[200 ]; +char out[200 ];static int maxlen;int len;
@@ -2090,10 +2091,10 @@ static int data_src__fprintf(u64 data_src, FILE *fp)return -ENOMEM ;mem_info__data_src (mi)->val = data_src; -perf_script__meminfo_scnprintf (decode,100 , mi); +perf_script__meminfo_scnprintf (decode,200 , mi, session);mem_info__put (mi); - len =scnprintf (out,100 ,"%16" PRIx64" %s" , data_src, decode); + len =scnprintf (out,200 ,"%16" PRIx64" %s" , data_src, decode);if (maxlen < len) maxlen = len;
@@ -2487,7 +2488,7 @@ static void process_event(struct perf_script *script,perf_sample__fprintf_addr (sample, thread, evsel, fp);if (PRINT_FIELD (DATA_SRC )) -data_src__fprintf (sample->data_src, fp); +data_src__fprintf (evsel__session (evsel), sample->data_src, fp);if (PRINT_FIELD (WEIGHT ))fprintf (fp,"%16" PRIu64, sample->weight);
tools/perf/util/mem-events.c +85 -1
99 lines not on this page · raw message
tools/perf/util/mem-events.h +3 -1
@@ -4,6 +4,7 @@#include <stdbool.h> #include <linux/types.h> +#include "session.h" struct perf_mem_event {bool supported;
@@ -47,7 +48,8 @@ int perf_mem__snp_scnprintf(char *out, size_t sz, const struct mem_info *mem_infint perf_mem__lck_scnprintf (char *out,size_t sz,const struct mem_info *mem_info);int perf_mem__blk_scnprintf (char *out,size_t sz,const struct mem_info *mem_info); -int perf_script__meminfo_scnprintf (char *bf,size_t size,const struct mem_info *mem_info); +int perf_script__meminfo_scnprintf (char *bf,size_t size,const struct mem_info *mem_info, +struct perf_session *session);struct c2c_stats {u32 nr_entries;
tools/perf/util/scripting-engines/trace-event-python.c +3 -2
@@ -694,8 +694,9 @@ static void set_sample_read_in_dict(PyObject *dict_sample, struct perf_sample *sstatic void set_sample_datasrc_in_dict (PyObject *dict,struct perf_sample *sample) { +struct perf_session *session =evsel__session (sample->evsel);struct mem_info *mi =mem_info__new (); -char decode[100 ]; +char decode[200 ];if (!mi)Py_FatalError ("couldn't create mem-info" );
@@ -704,7 +705,7 @@ static void set_sample_datasrc_in_dict(PyObject *dict, PyLong_FromUnsignedLongLong(sample->data_src));mem_info__data_src (mi)->val = sample->data_src; -perf_script__meminfo_scnprintf (decode,100 , mi); +perf_script__meminfo_scnprintf (decode,200 , mi, session);mem_info__put (mi); pydict_set_item_string_decref(dict, "datasrc_decode",
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 5/6] perf tools: Show memory region in perf-script subcommand
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Unnecessary full header inclusion of `session.h` in `mem-events.h` instead of a forward…
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Unnecessary full header inclusion of session.h in mem-events.h instead of a forward declaration. --
commit 40386f8d2abdbd20961af3746935e85e6ef1913c
Author: Dapeng Mi <[email protected]>
perf tools: Show memory region in perf-script subcommand
This commit adds a new memory region field to the perf-script output, sourced from the mem_region field of the memory information data source. It also incorporates fallback logic for pipe mode scenarios where feature bits might not be available.
[ ... ]
tools/perf/util/mem-events.h line 7
Quoted 9 lines
tools/perf/util/mem-events.h +1
-0@@ -4,6 +4,7 @@#include <stdbool.h> #include <linux/types.h> +#include "session.h"
[Severity: Low]
Does this unnecessarily pull in the full session.h header when a forward declaration would suffice?
According to the perf tools subsystem guidelines, it is preferred to use forward declarations (e.g., "struct perf_session;") in header files instead of full header inclusions when only structure pointer handles are referenced. Since the new perf_script__meminfo_scnprintf() function prototype only needs a pointer to struct perf_session, could this include be replaced with a forward declaration to reduce header dependencies and namespace pollution? The full include can then be placed directly in the .c files that dereference it.
Quoted 3 lines
tools/perf/util/mem-events.h +0
-0struct perf_mem_event {bool supported;
[ ... ]
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=5
Re: [PATCH v8 5/6] perf tools: Show memory region in perf-script subcommand
In reply to Thomas FalconQuoted 23 lines · Thomas Falcon
From: Dapeng Mi <[email protected]>
Show the memory region in perf-script subcommand. Memory region is found in the
mem_regionfield of the memory information data source. This field was included with the introduction of support for the Off-module Response facility (OMR) [1] in Intel's Diamond Rapids and Nova Lake Architectures.An example of perf-script output with the new memory region field is shown below:
thread 5/0 ... |OP LOAD|LVL L3 hit|SNP HitM|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9f002aba thread 2/0 ... |OP LOAD|LVL L3 hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9dc54c95 thread 8/0 ... |OP LOAD|LVL L3 hit|SNP HitM|TLB L1 or L2 hit|LCK No|BLK N/A|Region Other-non-shared-cache ffffffff9dc54db3 thread 0/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK No|BLK Addr|Region N/A ffffffff9dc54db3 thread 2/0 ... |OP LOAD|LVL L0 hit|SNP None|TLB L1 or L2 hit|LCK Yes|BLK N/A|Region N/A ffffffff9f002a8c thread 0/0 ... |OP LOAD|LVL L3 hit|SNP HitM or Fwd|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-non-shared-cache ffffffff9f002aba thread 0/0 ... |OP LOAD|LVL L3 hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-shared-cache ffffffff9dc54ca7 thread 30/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK Yes|BLK N/A|Region N/A ffffffff9dcc1ff2 thread 30/0 ... |OP LOAD|LVL RAM hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region Mem-0 ffffffff9dc54c95 thread 19/0 ... |OP LOAD|LVL LFB/MAB hit|SNP None|TLB L1 or L2 hit|LCK No|BLK N/A|Region N/A ffffffff9f002cbb thread 19/0 ... |OP LOAD|LVL L3 hit|SNP HitM or Fwd|TLB L1 or L2 hit|LCK No|BLK N/A|Region Local-non-shared-cache ffffffff9f002aba
Quoted 5 lines
[1]: https://lore.kernel.org/all/[email protected]/
Assisted-by Sashiko:gemini-3.1-pro-previewAssisted-by GitHub-Copilot:claude-opus-4-8Codeveloped-by Thomas Falcon <[email protected]>
Same issue with previous patch. Thanks.
Quoted 210 lines
Reviewed-by Ian Rogers <[email protected]>Signed-off-by Dapeng Mi <[email protected]>Signed-off-by Thomas Falcon <[email protected]>---
v8: Update developer tags and commit message with real example output
v4: Drop the global show-region flag; passperf_sessionto
perf_script__meminfo_scnprintf()and gate the Region field on the feature bit, with a pipe-mode fallbackv3: make memory region reporting conditional on feature bit
--- tools/perf/builtin-script.c | 13 +-- tools/perf/util/mem-events.c | 86 ++++++++++++++++++- tools/perf/util/mem-events.h | 4 +- .../scripting-engines/trace-event-python.c | 5 +- 4 files changed, 98 insertions(+), 10 deletions(-)tools/perf/builtin-script.c +7
-6@@ -2078,11 +2078,12 @@ static int evlist__max_name_len(struct evlist *evlist)return max; } -static int data_src__fprintf (u64 data_src,FILE *fp) +static int data_src__fprintf (struct perf_session *session, +u64 data_src,FILE *fp) {struct mem_info *mi =mem_info__new (); -char decode[100 ]; -char out[100 ]; +char decode[200 ]; +char out[200 ];static int maxlen;int len;@@ -2090,10 +2091,10 @@ static int data_src__fprintf(u64 data_src, FILE *fp)return -ENOMEM ;mem_info__data_src (mi)->val = data_src; -perf_script__meminfo_scnprintf (decode,100 , mi); +perf_script__meminfo_scnprintf (decode,200 , mi, session);mem_info__put (mi); - len =scnprintf (out,100 ,"%16" PRIx64" %s" , data_src, decode); + len =scnprintf (out,200 ,"%16" PRIx64" %s" , data_src, decode);if (maxlen < len) maxlen = len;@@ -2487,7 +2488,7 @@ static void process_event(struct perf_script *script,perf_sample__fprintf_addr (sample, thread, evsel, fp);if (PRINT_FIELD (DATA_SRC )) -data_src__fprintf (sample->data_src, fp); +data_src__fprintf (evsel__session (evsel), sample->data_src, fp);if (PRINT_FIELD (WEIGHT ))fprintf (fp,"%16" PRIu64, sample->weight);tools/perf/util/mem-events.c +85
-1@@ -604,8 +604,77 @@ int perf_mem__blk_scnprintf(char *out, size_t sz, const struct mem_info *mem_infreturn l; } -int perf_script__meminfo_scnprintf (char *out,size_t sz,const struct mem_info *mem_info) +static int perf_mem__region_scnprintf (char *out,size_t sz,const struct mem_info *mem_info) { +size_t l =0 ; +u64 mem =PERF_MEM_REGION_NA ; + + sz -=1 ;/* -1 for null termination */ + out[0 ] ='\0' ; + +if (mem_info) + mem =mem_info__const_data_src (mem_info)->mem_region; + +switch (mem) { +case PERF_MEM_REGION_NA : +case PERF_MEM_REGION_RSVD : + l +=scnprintf (out + l, sz - l,"N/A" ); +break ; +case PERF_MEM_REGION_L_SHARE : + l +=scnprintf (out + l, sz - l,"Local-shared-cache" ); +break ; +case PERF_MEM_REGION_L_NON_SHARE : + l +=scnprintf (out + l, sz - l,"Local-non-shared-cache" ); +break ; +case PERF_MEM_REGION_O_IO : + l +=scnprintf (out + l, sz - l,"Other-IO" ); +break ; +case PERF_MEM_REGION_O_SHARE : + l +=scnprintf (out + l, sz - l,"Other-shared-cache" ); +break ; +case PERF_MEM_REGION_O_NON_SHARE : + l +=scnprintf (out + l, sz - l,"Other-non-shared-cache" ); +break ; +case PERF_MEM_REGION_MMIO : + l +=scnprintf (out + l, sz - l,"MMIO" ); +break ; +case PERF_MEM_REGION_MEM0 : + l +=scnprintf (out + l, sz - l,"Mem-0" ); +break ; +case PERF_MEM_REGION_MEM1 : + l +=scnprintf (out + l, sz - l,"Mem-1" ); +break ; +case PERF_MEM_REGION_MEM2 : + l +=scnprintf (out + l, sz - l,"Mem-2" ); +break ; +case PERF_MEM_REGION_MEM3 : + l +=scnprintf (out + l, sz - l,"Mem-3" ); +break ; +case PERF_MEM_REGION_MEM4 : + l +=scnprintf (out + l, sz - l,"Mem-4" ); +break ; +case PERF_MEM_REGION_MEM5 : + l +=scnprintf (out + l, sz - l,"Mem-5" ); +break ; +case PERF_MEM_REGION_MEM6 : + l +=scnprintf (out + l, sz - l,"Mem-6" ); +break ; +case PERF_MEM_REGION_MEM7 : + l +=scnprintf (out + l, sz - l,"Mem-7" ); +break ; +default : + l +=scnprintf (out + l, sz - l,"N/A" ); +break ; + } + +return l; +} + +int perf_script__meminfo_scnprintf (char *out,size_t sz, +const struct mem_info *mem_info, +struct perf_session *session) +{ +struct perf_env *env;int i =0 ; i +=scnprintf (out, sz,"|OP " );@@ -620,6 +689,21 @@ int perf_script__meminfo_scnprintf(char *out, size_t sz, const struct mem_info * i +=perf_mem__lck_scnprintf (out + i, sz - i, mem_info); i +=scnprintf (out + i, sz - i,"|BLK " ); i +=perf_mem__blk_scnprintf (out + i, sz - i, mem_info); +if (session) { +/* +* In case the feature bits are not available, as in +* pipe mode, fallback to checking for the existence of +* memory ranges +*/ + env =perf_session__env (session); +if ((env && session->data->is_pipe && env->nr_memory_ranges) || +perf_header__has_feat (&session->header, +HEADER_MEMORY_RANGES )) { + i +=scnprintf (out + i, sz - i,"|Region " ); + i +=perf_mem__region_scnprintf (out + i, sz - i, + mem_info); + } + }return i; }tools/perf/util/mem-events.h +3
-1@@ -4,6 +4,7 @@#include <stdbool.h> #include <linux/types.h> +#include "session.h" struct perf_mem_event {bool supported;@@ -47,7 +48,8 @@ int perf_mem__snp_scnprintf(char *out, size_t sz, const struct mem_info *mem_infint perf_mem__lck_scnprintf (char *out,size_t sz,const struct mem_info *mem_info);int perf_mem__blk_scnprintf (char *out,size_t sz,const struct mem_info *mem_info); -int perf_script__meminfo_scnprintf (char *bf,size_t size,const struct mem_info *mem_info); +int perf_script__meminfo_scnprintf (char *bf,size_t size,const struct mem_info *mem_info, +struct perf_session *session);struct c2c_stats {u32 nr_entries;tools/perf/util/scripting-engines/trace-event-python.c +3
-2@@ -694,8 +694,9 @@ static void set_sample_read_in_dict(PyObject *dict_sample, struct perf_sample *sstatic void set_sample_datasrc_in_dict (PyObject *dict,struct perf_sample *sample) { +struct perf_session *session =evsel__session (sample->evsel);struct mem_info *mi =mem_info__new (); -char decode[100 ]; +char decode[200 ];if (!mi)Py_FatalError ("couldn't create mem-info" );@@ -704,7 +705,7 @@ static void set_sample_datasrc_in_dict(PyObject *dict, PyLong_FromUnsignedLongLong(sample->data_src));mem_info__data_src (mi)->val = sample->data_src; -perf_script__meminfo_scnprintf (decode,100 , mi); +perf_script__meminfo_scnprintf (decode,200 , mi, session);mem_info__put (mi); pydict_set_item_string_decref(dict, "datasrc_decode",
PATCH v8 6/6 perf c2c: print memory region data with stdio output
In reply to Thomas FalconPrint memory range data in perf-c2c subcommand. Only available in stdio mode currently. If memory ranges are not supported or present, print nothing.
Example output of perf c2c report --stdio:
=================================================
Memory Ranges
=================================================
Range 0: [0x0000000000000000-0x00000000bfffffff] Node 0, local region id 0, remote region id 255 Range 1: [0x0000000100000000-0x000000203fffffff] Node 0, local region id 0, remote region id 255 Range 2: [0x0000008000000000-0x0000027fffffffff] Node -2, local region id 1, remote region id 255 Range 3: [0x0000028000000000-0x0000047fffffffff] Node -2, local region id 1, remote region id 255 Range 4: [0x0000048000000000-0x000004ffffffffff] Node -2, local region id 1, remote region id 255
---
v3: Included examples of memory range output in commit message
--- tools/perf/builtin-c2c.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
tools/perf/builtin-c2c.c +30 -0
@@ -2580,6 +2580,34 @@ static void print_c2c_info(FILE *out, struct perf_session *session)fprintf (out," Cacheline data grouping : %s\n" , c2c.cl_sort); } + +static void print_memory_ranges_info (FILE *out,struct perf_session *session) +{ +struct perf_env *env =perf_session__env (session); +int nr_ranges =0 ; + +if (!perf_header__has_feat (&session->header,HEADER_MEMORY_RANGES )) +return ; + nr_ranges = env->nr_memory_ranges; +if (nr_ranges ==0 ) { +pr_debug ("No memory ranges found, skipping\n" ); +return ; + } + +fprintf (out,"\n" ); +fprintf (out,"=================================================\n" ); +fprintf (out," Memory Ranges \n" ); +fprintf (out,"=================================================\n" ); + +for (int i =0 ; i < nr_ranges; i++) { +struct memory_range *r = &env->memory_ranges[i]; + +fprintf (out,"Range %d: [0x%016" PRIx64"-0x%016" PRIx64"] Node %d, local region id %u, remote region id %u\n" , + i, r->base, r->base + r->length -1 , r->node, + r->local_region_id, r->remote_region_id); + } +} +static void perf_c2c__hists_fprintf (FILE *out,struct perf_session *session) {setup_pager ();
@@ -2593,6 +2621,8 @@ static void perf_c2c__hists_fprintf(FILE *out, struct perf_session *session)if (c2c.stats_only)return ; +print_memory_ranges_info (out, session); +fprintf (out,"\n" );fprintf (out,"=================================================\n" );fprintf (out," Shared Data Cache Line Table \n" );
Signature · 1 line
2.43.0
[email protected]
AI reviewRe: [PATCH v8 6/6] perf c2c: print memory region data with stdio output
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider: - [Low] Unsafe end address calculation for zero-length memory ranges, causing integer underflow. --
Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] Unsafe end address calculation for zero-length memory ranges, causing integer underflow. --
commit 353c7e26bf2f698e86dedab128c94a9970b19c51
Author: Thomas Falcon <[email protected]>
perf c2c: print memory region data with stdio output
Print memory range data in perf-c2c subcommand. Only available in stdio mode currently. If memory ranges are not supported or present, print nothing.
Quoted 4 lines
tools/perf/builtin-c2c.c +0
-0
[ ... ]
tools/perf/builtin-c2c.c static void print_c2c_info(FILE *out, struct perf_session *session) · line 2606
Quoted 5 lines
tools/perf/builtin-c2c.c +5
-0+for (int i =0 ; i < nr_ranges; i++) { +struct memory_range *r = &env->memory_ranges[i]; + + fprintf(out, "Range %d: [0x%016" PRIx64 "-0x%016" PRIx64 "] Node %d, local region id %u, remote region id %u\n", + i, r->base, r->base + r->length - 1, r->node,
[Severity: Low]
Does this code risk an integer underflow if a memory range has a length of 0?
If r->length is 0, the end address calculation underflows, which can lead to an incorrect address being printed (for example, wrapping around to 0xffffffffffffffff if the base address is 0).
Since the parsing function process_memory_ranges() can allow 0-length ranges, should this calculation check for r->length == 0 before subtracting 1?
Quoted 3 lines
tools/perf/builtin-c2c.c +3
-0+ r->local_region_id, r->remote_region_id); + } +}
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=6
Hello,
Quoted 11 lines · Thomas Falcon
Add support for two memory-related reporting features in the perf tool:
1. Memory region reporting in perf-c2c and perf-script subcommands.
2. Memory range data in perf.data file header and perf-c2c subcommand.Memory region reporting was introduced as part of support for the Off-module Response facility (OMR) [1], which provides a new data source encoding supporting "up to 8 fine-grained memory regions in addition to the cache region, offering more detailed insights into memory access regions."
Quoted 8 lines
Memory Range support was introduced with the addition of the ACPI Memory Range and Region Mapping (MRRM) [2] table. It provides a base address plus a length value for each memory range, as well as NUMA node and local and remote "region ID's" so that "platform firmware can indicate the type of memory for each range."[3]
Include a change allowing
PERF_MEM_LVLNUM_L0to be printed in perf-mem output as well.
Thanks for working on this. I think we need v9 for the patch 4 update, but it mostly looks good to me.
Thanks,
Namhyung
Quoted 87 lines
[1]: https://lore.kernel.org/all/[email protected]/
[2]: https://lore.kernel.org/lkml/[email protected]/
[3]: MRRM definition allow for future expansion for the OS to assign these region IDs.v8:
-- Updated developer tags and commit messages with real example output
from perf script and perf c2cv7:
-- perf-c2c: fixoutput_strallocation error handling that introduces a
memory leak (Sashiko)v6:
-- Rebase on 7.3-rc1v5:
-- perf-c2c: make the cacheline header span andui_quirks()width
fixup depend on memory-region availability (Namhyung Kim)v4:
-- perf-script: gate the Region field on theHEADER_MEMORY_RANGESfeature
bit viaperf_sessioninstead of a global flag, with a pipe-mode fallback
-- perf-c2c: fixoutput_strallocation error handling
-- perf header: Fix typo in region id bounds checking which made region 255
invalidv3:
-- included missing ff-size check inprocess_memory_ranges
-- make memory region reporting in perf c2c-and perf-script conditional
on feature bit, requiring some patch reordering (Namhyung Kim)
-- used open/openat to read memory range sysfs files inmemory_range__read()
(Namhyung Kim)
-- Removed path name and file name buffers inmemory_range__read(),
instead pass path name from as a parameter frommemory_range__parse()(Namhyung Kim)
-- use calloc instead of zalloc inmemory_range__parse()and
process_memory_ranges()(Namhyung Kim)
-- Removed redundant check for existance of memory range directory in
memory_range__read()(Namhyung Kim)
-- Included output examples of memory ranges in perf header and perf-c2c
in commit message (Namhyung Kim)v2:
-- Added missing newline inWARN_ONCEmessage inc2c_he__set_mem_region()-- increased buffers passed toperf_script__meminfo_scnprintf()from 150
to 200 bytes to avoid silent truncation
-- Added check for NULL return ofsysfs__mountpoint()when parsing
memory ranges in sysfs
-- increasedMAX_MEMORY_RANGESsanity check from 64 to 256 based on
ACPI MRRM table implementation in Linux kernel
-- added comment forMAX_MEMORY_RANGESto clarify that it is a sanity check
for malformed perf.data files
-- removed a line of code was removed fromutil/env.hbut was added back in
v1 due to bad rebaseDapeng Mi (3):
perf mem: Add support for printingPERF_MEM_LVLNUM_L0perf tools: Show memory region in perf-c2c subcommand perf tools: Show memory region in perf-script subcommandThomas Falcon (3):
perf mem: Fix size tracking for mem_lvl's in
perf_script__meminfo_scnprintf()
perf header: Support memory ranges
perf c2c: print memory region data with stdio outputtools/perf/Documentation/perf-record.txt | 2 +- .../Documentation/perf.data-file-format.txt | 13 ++ tools/perf/builtin-c2c.c | 128 ++++++++++- tools/perf/builtin-inject.c | 1 + tools/perf/builtin-script.c | 13 +- tools/perf/util/bpf-filter.l | 1 + tools/perf/util/c2c.h | 1 + tools/perf/util/env.c | 1 + tools/perf/util/env.h | 10 + tools/perf/util/header.c | 203 ++++++++++++++++++ tools/perf/util/header.h | 1 + tools/perf/util/mem-events.c | 93 +++++++- tools/perf/util/mem-events.h | 5 +- .../scripting-engines/trace-event-python.c | 5 +- 14 files changed, 454 insertions(+), 23 deletions(-)Signature · 1 line
2.43.0