From nobody Mon Apr 6 09:11:30 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19CCC372EDC for ; Fri, 20 Mar 2026 08:09:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773994159; cv=none; b=tX4nNZV0NbV3Q/BP4s8hub8hfWprWcL+2eTwIyjYWJrCbzBlhyb1SE95M4+xz3ZzBABPTjx5KkqFShUqLloaVwOE8Uu34kucP/YOe9VG5YOtNuxNLnd2DkHEkOPiwDd47FJA7cj8XcK/i5XXcmegOhyY0Xr6kydT2+8z+x2vPMA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773994159; c=relaxed/simple; bh=LqFRnK3aSdZuD9rdOYV+OBVFWv9xvS76uduaBHzQz98=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KZibRWvEH4mQ64RNCAAmNXJ8BbMhgqxukpUXOb/rBZbBFvuwt6laeohoYE6Ypqey433QZ38/siZ0IQqkGEqbzdbFyILd2iQd2S9uGbAvefR5CQfvEj+GplIhVT9PoLDy+JUzbWBH1ACVgEXXGBkQ+du+Z+eej8cPb7PhULrv9F4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=bvTtB6j0; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="bvTtB6j0" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c105e5ac70so430052eec.0 for ; Fri, 20 Mar 2026 01:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1773994156; x=1774598956; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Axq4DFGGwdZiGTNI5Qtm5bku13rQk5dCHnjd1ssnepE=; b=bvTtB6j0wtY3j7n6yTbaZvcIkGsE40WMwWt3j+0zb0wDJdPUbM51NmDQfSZ0W8Re2h BbNvAnQGYtgfa8Nsso4PYgXWNJ3extHAoFjeFMIDUm3gveIb27Rsipb5wKepgsNkUyHD eRvieuIe7FgGC82K6zkvyhFTZcm9vu0vhw1PNv0JW7/mXEIXCuR8uggHg0/SaHEjVU7V V02npuCNOPQS6hgXSN3iW84Fs6NZycBnteJPz/zXK5x9ESCGynkKtlRe4BZbqMljEqgc MTOkWYHUPTLemiG/fv34LXL+KdlKoMB5+sv1+0o2wsXoa4ANYoI4qg3zWBgpy/0vih/M SDzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773994156; x=1774598956; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Axq4DFGGwdZiGTNI5Qtm5bku13rQk5dCHnjd1ssnepE=; b=YyPJTjIY1xczCdoLPDY11qI4MEBH34dXBQY8bFSinRxMXolcD1kM/7ssncEyQQlj4U R/zEAYsB3eKIyRaS5WjEW+4AlTP9sU7xghUG7wqzzkfOEukI5ocaLmwuDcMpzZS1A0O5 L6/nidD69Z4pI40HsS+hNXrBwc2vLL28jjffWFZEwWjp0t5rCCNTt7RWj1CMAg1+qx/4 dzVdMOv6PUJjO90cFpmeWhOFg4kiIIPqzEdS1cy1C7AFpG2dNr3oy/gRd4YB57ZxDqzn AvihZhLNBQqUnbED0n8Ru4W1qVJaWLiDjiVSXb3X2PWStC8TPVd/F92ox9hJDHHRlLzG 70hg== X-Forwarded-Encrypted: i=1; AJvYcCVAW3QcfQumxVT9Ofjuh4ScHJZygjYfbqvrJcmk5TLQyPYCEBzpgMEZPq+t8SBHqC5oZCi9SVfEdttFWn0=@vger.kernel.org X-Gm-Message-State: AOJu0YyGTFWwBb7aWcwDAzUqKp0mG5NVfyVNf/06ukczIO7yU2nX9C7k X46QTIoSM3SB1/XWzeUU+rpWzfJjppml24yxYrlEp3wnv/vKl+/h2AgyiwXypg+xwK29neNKaIm WI+5p7Omeww== X-Received: from dybmn16.prod.google.com ([2002:a05:7300:d210:b0:2c0:d899:d1a2]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:4083:b0:2be:171c:5048 with SMTP id 5a478bee46e88-2c1095a4d51mr1065746eec.5.1773994156029; Fri, 20 Mar 2026 01:09:16 -0700 (PDT) Date: Fri, 20 Mar 2026 01:08:25 -0700 In-Reply-To: <20260320080835.724836-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260319232334.287517-1-irogers@google.com> <20260320080835.724836-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.959.g497ff81fa9-goog Message-ID: <20260320080835.724836-17-irogers@google.com> Subject: [PATCH v3 16/25] perf inject: Don't pass evsel with sample From: Ian Rogers To: namhyung@kernel.org Cc: irogers@google.com, acme@kernel.org, adrian.hunter@intel.com, ajones@ventanamicro.com, ak@linux.intel.com, alex@ghiti.fr, alexander.shishkin@linux.intel.com, anup@brainfault.org, aou@eecs.berkeley.edu, atrajeev@linux.ibm.com, blakejones@google.com, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dvyukov@google.com, howardchu95@gmail.com, hrishikesh123s@gmail.com, james.clark@linaro.org, jolsa@kernel.org, krzysztof.m.lopatowski@gmail.com, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux@treblig.org, mingo@redhat.com, nichen@iscas.ac.cn, palmer@dabbelt.com, peterz@infradead.org, pjw@kernel.org, ravi.bangoria@amd.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, thomas.falcon@intel.com, tianyou.li@intel.com, yujie.liu@intel.com, zhouquan@iscas.ac.cn Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The sample contains the evsel and so it is unnecessary to pass the evsel as well. Signed-off-by: Ian Rogers --- tools/perf/builtin-inject.c | 46 ++++++++++++------------------ tools/perf/util/synthetic-events.c | 9 +++--- tools/perf/util/synthetic-events.h | 2 -- 3 files changed, 23 insertions(+), 34 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 1b873377c6ad..0b2326ea63ad 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -146,14 +146,12 @@ struct event_entry { static int tool__inject_build_id(const struct perf_tool *tool, struct perf_sample *sample, struct machine *machine, - const struct evsel *evsel, __u16 misc, const char *filename, struct dso *dso, u32 flags); static int tool__inject_mmap2_build_id(const struct perf_tool *tool, struct perf_sample *sample, struct machine *machine, - const struct evsel *evsel, __u16 misc, __u32 pid, __u32 tid, __u64 start, __u64 len, __u64 pgoff, @@ -357,7 +355,6 @@ perf_inject__cut_auxtrace_sample(struct perf_inject *in= ject, typedef int (*inject_handler)(const struct perf_tool *tool, union perf_event *event, struct perf_sample *sample, - struct evsel *evsel, struct machine *machine); =20 static int perf_event__repipe_sample(const struct perf_tool *tool, @@ -370,7 +367,7 @@ static int perf_event__repipe_sample(const struct perf_= tool *tool, =20 if (evsel && evsel->handler) { inject_handler f =3D evsel->handler; - return f(tool, event, sample, evsel, machine); + return f(tool, event, sample, machine); } =20 build_id__mark_dso_hit(tool, event, sample, machine); @@ -584,11 +581,12 @@ static int perf_event__repipe_common_mmap(const struc= t perf_tool *tool, } =20 if (dso && !dso__hit(dso)) { - struct evsel *evsel =3D evlist__event2evsel(inject->session->evlist, ev= ent); + if (!sample->evsel) + sample->evsel =3D evlist__event2evsel(inject->session->evlist, event); =20 - if (evsel) { + if (sample->evsel) { dso__set_hit(dso); - tool__inject_build_id(tool, sample, machine, evsel, + tool__inject_build_id(tool, sample, machine, /*misc=3D*/sample->cpumode, filename, dso, flags); } @@ -615,23 +613,26 @@ static int perf_event__repipe_common_mmap(const struc= t perf_tool *tool, } if ((inject->build_id_style =3D=3D BID_RWS__MMAP2_BUILDID_ALL) && !(event->header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID)) { - struct evsel *evsel =3D evlist__event2evsel(inject->session->evlist, eve= nt); + struct evsel *saved_evsel =3D sample->evsel; =20 - if (evsel && !dso_sought) { + sample->evsel =3D evlist__event2evsel(inject->session->evlist, event); + if (sample->evsel && !dso_sought) { dso =3D findnew_dso(pid, tid, filename, dso_id, machine); dso_sought =3D true; } - if (evsel && dso && - !tool__inject_mmap2_build_id(tool, sample, machine, evsel, + if (sample->evsel && dso && + !tool__inject_mmap2_build_id(tool, sample, machine, sample->cpumode | PERF_RECORD_MISC_MMAP_BUILD_ID, pid, tid, start, len, pgoff, dso, prot, flags, filename)) { /* Injected mmap2 so no need to repipe. */ + sample->evsel =3D saved_evsel; dso__put(dso); return 0; } + sample->evsel =3D saved_evsel; } dso__put(dso); if (inject->build_id_style =3D=3D BID_RWS__MMAP2_BUILDID_LAZY) @@ -836,7 +837,6 @@ static bool perf_inject__lookup_known_build_id(struct p= erf_inject *inject, static int tool__inject_build_id(const struct perf_tool *tool, struct perf_sample *sample, struct machine *machine, - const struct evsel *evsel, __u16 misc, const char *filename, struct dso *dso, u32 flags) @@ -860,7 +860,7 @@ static int tool__inject_build_id(const struct perf_tool= *tool, =20 err =3D perf_event__synthesize_build_id(tool, sample, machine, perf_event__repipe, - evsel, misc, dso__bid(dso), + misc, dso__bid(dso), filename); if (err) { pr_err("Can't synthesize build_id event for %s\n", filename); @@ -873,7 +873,6 @@ static int tool__inject_build_id(const struct perf_tool= *tool, static int tool__inject_mmap2_build_id(const struct perf_tool *tool, struct perf_sample *sample, struct machine *machine, - const struct evsel *evsel, __u16 misc, __u32 pid, __u32 tid, __u64 start, __u64 len, __u64 pgoff, @@ -896,7 +895,6 @@ static int tool__inject_mmap2_build_id(const struct per= f_tool *tool, =20 err =3D perf_event__synthesize_mmap2_build_id(tool, sample, machine, perf_event__repipe, - evsel, misc, pid, tid, start, len, pgoff, dso__bid(dso), @@ -913,7 +911,6 @@ static int mark_dso_hit(const struct perf_inject *injec= t, const struct perf_tool *tool, struct perf_sample *sample, struct machine *machine, - const struct evsel *mmap_evsel, struct map *map, bool sample_in_dso) { struct dso *dso; @@ -943,7 +940,7 @@ static int mark_dso_hit(const struct perf_inject *injec= t, if (dso && !dso__hit(dso)) { dso__set_hit(dso); tool__inject_build_id(tool, sample, machine, - mmap_evsel, misc, dso__long_name(dso), dso, + misc, dso__long_name(dso), dso, map__flags(map)); } } else if (inject->build_id_style =3D=3D BID_RWS__MMAP2_BUILDID_LAZY) { @@ -955,7 +952,6 @@ static int mark_dso_hit(const struct perf_inject *injec= t, map__set_hit(map); perf_event__synthesize_mmap2_build_id(tool, sample, machine, perf_event__repipe, - mmap_evsel, misc, sample->pid, sample->tid, map__start(map), @@ -975,7 +971,6 @@ struct mark_dso_hit_args { const struct perf_tool *tool; struct perf_sample *sample; struct machine *machine; - const struct evsel *mmap_evsel; }; =20 static int mark_dso_hit_callback(struct callchain_cursor_node *node, void = *data) @@ -984,7 +979,7 @@ static int mark_dso_hit_callback(struct callchain_curso= r_node *node, void *data) struct map *map =3D node->ms.map; =20 return mark_dso_hit(args->inject, args->tool, args->sample, args->machine, - args->mmap_evsel, map, /*sample_in_dso=3D*/false); + map, /*sample_in_dso=3D*/false); } =20 static int perf_event__inject_buildid(const struct perf_tool *tool, union = perf_event *event, @@ -1002,7 +997,6 @@ static int perf_event__inject_buildid(const struct per= f_tool *tool, union perf_e */ .sample =3D sample, .machine =3D machine, - .mmap_evsel =3D inject__mmap_evsel(inject), }; struct evsel *saved_evsel =3D sample->evsel; =20 @@ -1016,7 +1010,7 @@ static int perf_event__inject_buildid(const struct pe= rf_tool *tool, union perf_e =20 sample->evsel =3D inject__mmap_evsel(inject); if (thread__find_map(thread, sample->cpumode, sample->ip, &al)) { - mark_dso_hit(inject, tool, sample, machine, args.mmap_evsel, al.map, + mark_dso_hit(inject, tool, sample, machine, al.map, /*sample_in_dso=3D*/true); } =20 @@ -1033,7 +1027,6 @@ static int perf_event__inject_buildid(const struct pe= rf_tool *tool, union perf_e static int perf_inject__sched_process_exit(const struct perf_tool *tool, union perf_event *event __maybe_unused, struct perf_sample *sample, - struct evsel *evsel __maybe_unused, struct machine *machine __maybe_unused) { struct perf_inject *inject =3D container_of(tool, struct perf_inject, too= l); @@ -1053,13 +1046,12 @@ static int perf_inject__sched_process_exit(const st= ruct perf_tool *tool, static int perf_inject__sched_switch(const struct perf_tool *tool, union perf_event *event, struct perf_sample *sample, - struct evsel *evsel, struct machine *machine) { struct perf_inject *inject =3D container_of(tool, struct perf_inject, too= l); struct event_entry *ent; =20 - perf_inject__sched_process_exit(tool, event, sample, evsel, machine); + perf_inject__sched_process_exit(tool, event, sample, machine); =20 ent =3D malloc(event->header.size + sizeof(struct event_entry)); if (ent =3D=3D NULL) { @@ -1078,13 +1070,13 @@ static int perf_inject__sched_switch(const struct p= erf_tool *tool, static int perf_inject__sched_stat(const struct perf_tool *tool, union perf_event *event __maybe_unused, struct perf_sample *sample, - struct evsel *evsel, struct machine *machine) { struct event_entry *ent; union perf_event *event_sw; struct perf_sample sample_sw; struct perf_inject *inject =3D container_of(tool, struct perf_inject, too= l); + struct evsel *evsel =3D sample->evsel; u32 pid =3D perf_sample__intval(sample, "pid"); int ret; =20 @@ -1449,7 +1441,7 @@ static int synthesize_build_id(struct perf_inject *in= ject, struct dso *dso, pid_ dso__set_hit(dso); =20 return perf_event__synthesize_build_id(&inject->tool, &synth_sample, mach= ine, - process_build_id, inject__mmap_evsel(inject), + process_build_id, /*misc=3D*/synth_sample.cpumode, dso__bid(dso), dso__long_name(dso)); } diff --git a/tools/perf/util/synthetic-events.c b/tools/perf/util/synthetic= -events.c index ef79433ebc3a..53e411cf33cc 100644 --- a/tools/perf/util/synthetic-events.c +++ b/tools/perf/util/synthetic-events.c @@ -2247,7 +2247,6 @@ int perf_event__synthesize_build_id(const struct perf= _tool *tool, struct perf_sample *sample, struct machine *machine, perf_event__handler_t process, - const struct evsel *evsel, __u16 misc, const struct build_id *bid, const char *filename) @@ -2270,12 +2269,13 @@ int perf_event__synthesize_build_id(const struct pe= rf_tool *tool, ev.build_id.header.size =3D len; strcpy(ev.build_id.filename, filename); =20 - if (evsel) { + if (sample->evsel) { void *array =3D &ev; int ret; =20 array +=3D ev.header.size; - ret =3D perf_event__synthesize_id_sample(array, evsel->core.attr.sample_= type, sample); + ret =3D perf_event__synthesize_id_sample(array, sample->evsel->core.attr= .sample_type, + sample); if (ret < 0) return ret; =20 @@ -2294,7 +2294,6 @@ int perf_event__synthesize_mmap2_build_id(const struc= t perf_tool *tool, struct perf_sample *sample, struct machine *machine, perf_event__handler_t process, - const struct evsel *evsel, __u16 misc, __u32 pid, __u32 tid, __u64 start, __u64 len, __u64 pgoff, @@ -2334,7 +2333,7 @@ int perf_event__synthesize_mmap2_build_id(const struc= t perf_tool *tool, =20 array =3D &ev; array +=3D ev.header.size; - ret =3D perf_event__synthesize_id_sample(array, evsel->core.attr.sample_t= ype, sample); + ret =3D perf_event__synthesize_id_sample(array, sample->evsel->core.attr.= sample_type, sample); if (ret < 0) return ret; =20 diff --git a/tools/perf/util/synthetic-events.h b/tools/perf/util/synthetic= -events.h index b0edad0c3100..473a43a78993 100644 --- a/tools/perf/util/synthetic-events.h +++ b/tools/perf/util/synthetic-events.h @@ -50,7 +50,6 @@ int perf_event__synthesize_build_id(const struct perf_too= l *tool, struct perf_sample *sample, struct machine *machine, perf_event__handler_t process, - const struct evsel *evsel, __u16 misc, const struct build_id *bid, const char *filename); @@ -58,7 +57,6 @@ int perf_event__synthesize_mmap2_build_id(const struct pe= rf_tool *tool, struct perf_sample *sample, struct machine *machine, perf_event__handler_t process, - const struct evsel *evsel, __u16 misc, __u32 pid, __u32 tid, __u64 start, __u64 len, __u64 pgoff, --=20 2.53.0.959.g497ff81fa9-goog