From: Namhyung Kim <namhyung@kernel.org>
To: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Jiri Olsa <jolsa@kernel.org>, LKML <linux-kernel@vger.kernel.org>,
Song Liu <song@kernel.org>
Subject: [PATCH 6/8] perf/core: Do not pass header for sample id init
Date: Thu, 12 Jan 2023 13:40:13 -0800 [thread overview]
Message-ID: <20230112214015.1014857-7-namhyung@kernel.org> (raw)
In-Reply-To: <20230112214015.1014857-1-namhyung@kernel.org>
The only thing it does for header in __perf_event_header__init_id() is
to update the header size with event->id_header_size. We can do this
outside and get rid of the argument for the later change.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
kernel/events/core.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7c5555051662..127dddd20f93 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7061,13 +7061,11 @@ static void perf_aux_sample_output(struct perf_event *event,
PERF_SAMPLE_CPU | PERF_SAMPLE_ID | \
PERF_SAMPLE_IDENTIFIER | PERF_SAMPLE_STREAM_ID)
-static void __perf_event_header__init_id(struct perf_event_header *header,
- struct perf_sample_data *data,
+static void __perf_event_header__init_id(struct perf_sample_data *data,
struct perf_event *event,
u64 sample_type)
{
data->type = event->attr.sample_type;
- header->size += event->id_header_size;
if (sample_type & PERF_SAMPLE_TID) {
/* namespace issues */
@@ -7094,8 +7092,10 @@ void perf_event_header__init_id(struct perf_event_header *header,
struct perf_sample_data *data,
struct perf_event *event)
{
- if (event->attr.sample_id_all)
- __perf_event_header__init_id(header, data, event, event->attr.sample_type);
+ if (event->attr.sample_id_all) {
+ header->size += event->id_header_size;
+ __perf_event_header__init_id(data, event, event->attr.sample_type);
+ }
}
static void __perf_event__output_id_sample(struct perf_output_handle *handle,
@@ -7583,7 +7583,7 @@ void perf_prepare_sample(struct perf_event_header *header,
u64 filtered_sample_type;
header->type = PERF_RECORD_SAMPLE;
- header->size = sizeof(*header) + event->header_size;
+ header->size = sizeof(*header) + event->header_size + event->id_header_size;
header->misc = 0;
header->misc |= perf_misc_flags(regs);
@@ -7601,7 +7601,7 @@ void perf_prepare_sample(struct perf_event_header *header,
PERF_SAMPLE_REGS_USER);
filtered_sample_type &= ~data->sample_flags;
- __perf_event_header__init_id(header, data, event, filtered_sample_type);
+ __perf_event_header__init_id(data, event, filtered_sample_type);
data->sample_flags |= sample_type & PERF_SAMPLE_ID_ALL;
if (filtered_sample_type & PERF_SAMPLE_IP) {
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2023-01-12 21:49 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 21:40 [PATCHSET 0/8] perf/core: Prepare sample data for BPF Namhyung Kim
2023-01-12 21:40 ` [PATCH 1/8] perf/core: Save the dynamic parts of sample data size Namhyung Kim
2023-01-13 20:44 ` Song Liu
2023-01-12 21:40 ` [PATCH 2/8] perf/core: Add perf_sample_save_callchain() helper Namhyung Kim
2023-01-13 20:45 ` Song Liu
2023-01-12 21:40 ` [PATCH 3/8] perf/core: Add perf_sample_save_raw_data() helper Namhyung Kim
2023-01-13 11:19 ` Peter Zijlstra
2023-01-13 21:01 ` Song Liu
2023-01-13 21:56 ` Namhyung Kim
2023-01-13 22:57 ` Song Liu
2023-01-12 21:40 ` [PATCH 4/8] perf/core: Add perf_sample_save_brstack() helper Namhyung Kim
2023-01-12 21:40 ` [PATCH 5/8] perf/core: Set data->sample_flags in perf_prepare_sample() Namhyung Kim
2023-01-13 11:20 ` Peter Zijlstra
2023-01-13 19:31 ` Namhyung Kim
2023-01-12 21:40 ` Namhyung Kim [this message]
2023-01-13 21:07 ` [PATCH 6/8] perf/core: Do not pass header for sample id init Song Liu
2023-01-12 21:40 ` [PATCH 7/8] perf/core: Introduce perf_prepare_header() Namhyung Kim
2023-01-13 21:06 ` Song Liu
2023-01-12 21:40 ` [PATCH 8/8] perf/core: Call perf_prepare_sample() before running BPF Namhyung Kim
2023-01-13 21:06 ` Song Liu
2023-01-13 11:21 ` [PATCHSET 0/8] perf/core: Prepare sample data for BPF Peter Zijlstra
2023-01-13 13:25 ` Jiri Olsa
2023-01-17 8:12 ` Namhyung Kim
2023-01-18 6:05 [PATCHSET 0/8] perf/core: Prepare sample data for BPF (v3) Namhyung Kim
2023-01-18 6:05 ` [PATCH 6/8] perf/core: Do not pass header for sample id init Namhyung Kim
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=20230112214015.1014857-7-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=song@kernel.org \
/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
all inboxes | Powered by JetHome®