From: Ravi Bangoria <ravi.bangoria@amd.com>
To: <acme@kernel.org>
Cc: <ravi.bangoria@amd.com>, <jolsa@kernel.org>,
<namhyung@kernel.org>, <irogers@google.com>,
<kan.liang@linux.intel.com>, <peterz@infradead.org>,
<mark.rutland@arm.com>, <mingo@redhat.com>,
<alexander.shishkin@linux.intel.com>, <james.clark@arm.com>,
<german.gomez@arm.com>, <leo.yan@linaro.org>,
<adrian.hunter@intel.com>, <alexey.v.bayduraev@linux.intel.com>,
<linux-perf-users@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <sandipan.das@amd.com>,
<ananth.narayan@amd.com>, <santosh.shukla@amd.com>
Subject: [RFC 2/4] perf tool: Refactor perf_event__synthesize_modules()
Date: Tue, 10 Jan 2023 11:28:57 +0530 [thread overview]
Message-ID: <20230110055859.685-3-ravi.bangoria@amd.com> (raw)
In-Reply-To: <20230110055859.685-1-ravi.bangoria@amd.com>
perf_event__synthesize_modules() synthesizes MMAP2 and MMAP events.
Split them into separate functions.
Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>
---
tools/perf/util/synthetic-events.c | 77 +++++++++++++++++++-----------
1 file changed, 48 insertions(+), 29 deletions(-)
diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic-events.c
index 3ab6a92b1a6d..2e145517f192 100644
--- a/tools/perf/util/synthetic-events.c
+++ b/tools/perf/util/synthetic-events.c
@@ -665,6 +665,50 @@ int perf_event__synthesize_cgroups(struct perf_tool *tool __maybe_unused,
}
#endif
+static void __perf_event__synthesize_modules_mmap2(struct machine *machine,
+ struct map *map,
+ union perf_event *event)
+{
+ size_t size = PERF_ALIGN(map->dso->long_name_len + 1, sizeof(u64));
+
+ event->mmap2.header.type = PERF_RECORD_MMAP2;
+ event->mmap2.header.size = sizeof(event->mmap2)
+ - sizeof(event->mmap2.filename)
+ + size
+ + machine->id_hdr_size;
+
+ memset(event->mmap2.filename + size, 0, machine->id_hdr_size);
+ event->mmap2.start = map->start;
+ event->mmap2.len = map->end - map->start;
+ event->mmap2.pid = machine->pid;
+
+ memcpy(event->mmap2.filename, map->dso->long_name,
+ map->dso->long_name_len + 1);
+
+ perf_record_mmap2__read_build_id(&event->mmap2, machine, false);
+}
+
+static void __perf_event__synthesize_modules_mmap(struct machine *machine,
+ struct map *map,
+ union perf_event *event)
+{
+ size_t size = PERF_ALIGN(map->dso->long_name_len + 1, sizeof(u64));
+
+ event->mmap.header.type = PERF_RECORD_MMAP;
+ event->mmap.header.size = sizeof(event->mmap)
+ - sizeof(event->mmap.filename)
+ + size
+ + machine->id_hdr_size;
+
+ memset(event->mmap.filename + size, 0, machine->id_hdr_size);
+ event->mmap.start = map->start;
+ event->mmap.len = map->end - map->start;
+ event->mmap.pid = machine->pid;
+
+ memcpy(event->mmap.filename, map->dso->long_name,
+ map->dso->long_name_len + 1);
+}
+
int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t process,
struct machine *machine)
{
@@ -695,35 +739,10 @@ int perf_event__synthesize_modules(struct perf_tool *tool, perf_event__handler_t
if (!__map__is_kmodule(pos))
continue;
- if (symbol_conf.buildid_mmap2) {
- size = PERF_ALIGN(pos->dso->long_name_len + 1, sizeof(u64));
- event->mmap2.header.type = PERF_RECORD_MMAP2;
- event->mmap2.header.size = (sizeof(event->mmap2) -
- (sizeof(event->mmap2.filename) - size));
- memset(event->mmap2.filename + size, 0, machine->id_hdr_size);
- event->mmap2.header.size += machine->id_hdr_size;
- event->mmap2.start = pos->start;
- event->mmap2.len = pos->end - pos->start;
- event->mmap2.pid = machine->pid;
-
- memcpy(event->mmap2.filename, pos->dso->long_name,
- pos->dso->long_name_len + 1);
-
- perf_record_mmap2__read_build_id(&event->mmap2, machine, false);
- } else {
- size = PERF_ALIGN(pos->dso->long_name_len + 1, sizeof(u64));
- event->mmap.header.type = PERF_RECORD_MMAP;
- event->mmap.header.size = (sizeof(event->mmap) -
- (sizeof(event->mmap.filename) - size));
- memset(event->mmap.filename + size, 0, machine->id_hdr_size);
- event->mmap.header.size += machine->id_hdr_size;
- event->mmap.start = pos->start;
- event->mmap.len = pos->end - pos->start;
- event->mmap.pid = machine->pid;
-
- memcpy(event->mmap.filename, pos->dso->long_name,
- pos->dso->long_name_len + 1);
- }
+ if (symbol_conf.buildid_mmap2)
+ __perf_event__synthesize_modules_mmap2(machine, pos, event);
+ else
+ __perf_event__synthesize_modules_mmap(machine, pos, event);
if (perf_tool__process_synth_event(tool, event, machine, process) != 0) {
rc = -1;
--
2.39.0
next prev parent reply other threads:[~2023-01-10 6:03 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 5:58 [RFC 0/4] perf tool: Fix non-".text" symbol resolution for kernel modules Ravi Bangoria
2023-01-10 5:58 ` [RFC 1/4] perf tool: Simplify machine__create_modules() a bit Ravi Bangoria
2023-01-10 5:58 ` Ravi Bangoria [this message]
2023-01-10 5:58 ` [RFC 3/4] perf tool: Introduce PERF_RECORD_KMOD_SEC_MAP Ravi Bangoria
2023-01-16 6:14 ` Adrian Hunter
2023-01-16 13:34 ` Ravi Bangoria
2023-01-10 5:58 ` [RFC 4/4] perf tool: Fix non-".text" symbol resolution for kernel modules Ravi Bangoria
2023-01-10 6:35 ` [RFC 0/4] " Adrian Hunter
2023-01-10 8:43 ` Ravi Bangoria
2023-01-10 8:58 ` Ravi Bangoria
2023-01-16 4:21 ` Ravi Bangoria
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230110055859.685-3-ravi.bangoria@amd.com \
--to=ravi.bangoria@amd.com \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=alexey.v.bayduraev@linux.intel.com \
--cc=ananth.narayan@amd.com \
--cc=german.gomez@arm.com \
--cc=irogers@google.com \
--cc=james.clark@arm.com \
--cc=jolsa@kernel.org \
--cc=kan.liang@linux.intel.com \
--cc=leo.yan@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=sandipan.das@amd.com \
--cc=santosh.shukla@amd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).