From nobody Wed Feb 11 02:06:44 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 3EB7F38759C for ; Mon, 9 Feb 2026 17:40:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770658848; cv=none; b=klCdRvCAKywjY7O7Z18tAJEl5wwLlLnDdi5ydV/wwVLANxNKFaFtuW9lepmt7HaQrl5RKBRY+m80ZfdF2lMDIE/AwBrmgzzYMcZ2J+p/T43N0TpJNqcnmveDVkrvzk+8XkN92EDj/5m8lPcUuKgN15yfQh/utPjzUWfh4hZhyqI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770658848; c=relaxed/simple; bh=2su1jDl0jUc0y62ytjAUF3OhxTmPdel5QhjeSyxmC8A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=MJU698UwtxkPMq2Q7vnATHqxSW0+o2BP6qh1PlokYmxXZ6tAFS3h/voU+mKekusZx6Vde/3+LBQbmJ1bHLJ15ACZWjgMrtz7ST00qNvxt/kO9fVxhFR5FJ6dMBBXidkUg961uGKcgrC+kgvkPaE5wf4VOHxHJIIs5aL6GP2xrC8= 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=lOCvPzxJ; arc=none smtp.client-ip=74.125.82.74 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="lOCvPzxJ" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-124aa710af7so12653411c88.1 for ; Mon, 09 Feb 2026 09:40:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770658847; x=1771263647; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=pLBsubzrij1823GzMX7+P3s1lQsCoFTU6s/kcMWeHM8=; b=lOCvPzxJRFDMqsTcMtdWKN8keFcftOSjuY6cneytiMiPGMwrPAQcDoUkfEckcUSGye VMcPDmMO5wFwPseTuQTX1WMuzcNHgFusTpa5Enmnz9H6c/ltDhyHtYORaUoq7GblcGpT BFP/wR7N/hvAcPbbNdDKN0y+Ps7qqACRn/yzbE5oBXfgLPKm+NQFamU3dJf/Utn73wpz jhiNc4bQD9jdu9qvjFQtCDrTcf16W6AuioanQlfaY5YNPSnFYQvSOrqMYMhelzS1obIa qy6cJsr2CgD9rjP5v/CfjY6u+BM/MS7SlRPERtULvUywak6tp7U/C1g0GGBFwXGMoaSP 0yMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770658847; x=1771263647; h=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=pLBsubzrij1823GzMX7+P3s1lQsCoFTU6s/kcMWeHM8=; b=eIIE66x6g68bCQC6Xip2TIVijh6IzALKfyPpVXqW6LTJrdFVXh69OewPbdPL9cnLbH I7DEcKMjOUfr3JswEP7LU+7uKFqehs4YDCkLF+sGx5K+kS1375pQztqxXiZITwFv2VKq KhB1uChLkWEWfhSuXIHhU8fvRtD7yJKKKkd7+rXZBK7vLny7wXyjJaQtKg+LFxy1oqfz YYvK1vUGADWNCAUtZoRsj2mnPGysrALnoUfS5wI6j/O9QqB3olG3P2IHyrkRfHdU4SOZ Jf3HK0LGgHfMeEnN8bsB/ucIVrJIpBI0JB6j3eFIbIzgfToZQLExq28cWfWCDplWwGU0 uKNg== X-Forwarded-Encrypted: i=1; AJvYcCVvIAGAyRo6Zt1R9CvxZq6Nh9VcBvfbI78v3e+yJwvpGiuFcpY+ULJ9UU7i//dZFXFzcqxBM6/qZCavxgI=@vger.kernel.org X-Gm-Message-State: AOJu0YwG9FyLEoZncHoklNsh2QJMfecPvgPFCDISHIescA6S7l+9gofQ 2R1z1ViN5OdjOo6XYeKxx+JqXQL1KNEk89LKZQXhQ0bY9HeMpwN6rbd0RfzUqeNrolN5zll/58v yXnyEk8gH8Q== X-Received: from dlbur6-n2.prod.google.com ([2002:a05:7022:ea46:20b0:127:c76:21ec]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:e28:b0:123:2ee7:7dc8 with SMTP id a92af1059eb24-12704001d56mr5694040c88.30.1770658847281; Mon, 09 Feb 2026 09:40:47 -0800 (PST) Date: Mon, 9 Feb 2026 09:40:09 -0800 In-Reply-To: <20260209174032.4142096-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: <20260209174032.4142096-1-irogers@google.com> X-Mailer: git-send-email 2.53.0.239.g8d8fc8a987-goog Message-ID: <20260209174032.4142096-3-irogers@google.com> Subject: [PATCH v1 02/25] perf sample: Make sure perf_sample__init/exit are used From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , James Clark , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Leo Yan , Tianyou Li , Athira Rajeev , Derek Foreman , Thomas Falcon , Howard Chu , Dmitry Vyukov , Andi Kleen , tanze , Hrishikesh Suresh , Quan Zhou , Andrew Jones , Anup Patel , Dapeng Mi , "Dr. David Alan Gilbert" , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Chun-Tse Shao , Ravi Bangoria , Swapnil Sapkal , Chen Ni , Blake Jones , Yujie Liu , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The deferred stack trace code wasn't using perf_sample__init/exit. Add the deferred stack trace clean up to perf_sample__exit which requires proper NULL initialization in perf_sample__init. Make the perf_sample__exit robust to being called more than once by using zfree. Make the error paths in evsel__parse_sample exit the sample. Signed-off-by: Ian Rogers --- tools/perf/builtin-inject.c | 6 +++++- tools/perf/util/evsel.c | 28 +++++++++++++++++----------- tools/perf/util/sample.c | 8 ++++++-- tools/perf/util/session.c | 13 +++++++++---- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c index 5b29f4296861..3d2556213599 100644 --- a/tools/perf/builtin-inject.c +++ b/tools/perf/builtin-inject.c @@ -1087,6 +1087,7 @@ static int perf_inject__sched_stat(const struct perf_= tool *tool, struct perf_sample sample_sw; struct perf_inject *inject =3D container_of(tool, struct perf_inject, too= l); u32 pid =3D evsel__intval(evsel, sample, "pid"); + int ret; =20 list_for_each_entry(ent, &inject->samples, node) { if (pid =3D=3D ent->tid) @@ -1098,12 +1099,15 @@ static int perf_inject__sched_stat(const struct per= f_tool *tool, event_sw =3D &ent->event[0]; evsel__parse_sample(evsel, event_sw, &sample_sw); =20 + perf_sample__init(&sample_sw, /*all=3D*/false); sample_sw.period =3D sample->period; sample_sw.time =3D sample->time; perf_event__synthesize_sample(event_sw, evsel->core.attr.sample_type, evsel->core.attr.read_format, &sample_sw); build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine); - return perf_event__repipe(tool, event_sw, &sample_sw, machine); + ret =3D perf_event__repipe(tool, event_sw, &sample_sw, machine); + perf_sample__exit(&sample_sw); + return ret; } #endif =20 diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f59228c1a39e..34ae388750db 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3067,7 +3067,7 @@ static inline bool overflow(const void *endp, u16 max= _size, const void *offset, #define OVERFLOW_CHECK(offset, size, max_size) \ do { \ if (overflow(endp, (max_size), (offset), (size))) \ - return -EFAULT; \ + goto out_efault; \ } while (0) =20 #define OVERFLOW_CHECK_u64(offset) \ @@ -3199,6 +3199,8 @@ static int __set_offcpu_sample(struct perf_sample *da= ta) data->cgroup =3D *array; =20 return 0; +out_efault: + return -EFAULT; } =20 int evsel__parse_sample(struct evsel *evsel, union perf_event *event, @@ -3217,7 +3219,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, */ union u64_swap u; =20 - memset(data, 0, sizeof(*data)); + perf_sample__init(data, /*all=3D*/true); data->cpu =3D data->pid =3D data->tid =3D -1; data->stream_id =3D data->id =3D data->time =3D -1ULL; data->period =3D evsel->core.attr.sample_period; @@ -3231,25 +3233,26 @@ int evsel__parse_sample(struct evsel *evsel, union = perf_event *event, =20 data->callchain =3D (struct ip_callchain *)&event->callchain_deferred.nr; if (data->callchain->nr > max_callchain_nr) - return -EFAULT; + goto out_efault; =20 data->deferred_cookie =3D event->callchain_deferred.cookie; =20 if (evsel->core.attr.sample_id_all) perf_evsel__parse_id_sample(evsel, event, data); + return 0; } =20 if (event->header.type !=3D PERF_RECORD_SAMPLE) { - if (!evsel->core.attr.sample_id_all) - return 0; - return perf_evsel__parse_id_sample(evsel, event, data); + if (evsel->core.attr.sample_id_all) + perf_evsel__parse_id_sample(evsel, event, data); + return 0; } =20 array =3D event->sample.array; =20 if (perf_event__check_size(event, evsel->sample_size)) - return -EFAULT; + goto out_efault; =20 if (type & PERF_SAMPLE_IDENTIFIER) { data->id =3D *array; @@ -3342,7 +3345,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, sizeof(struct sample_read_value); =20 if (data->read.group.nr > max_group_nr) - return -EFAULT; + goto out_efault; =20 sz =3D data->read.group.nr * sample_read_value_size(read_format); OVERFLOW_CHECK(array, sz, max_size); @@ -3370,7 +3373,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, data->callchain =3D (struct ip_callchain *)array++; callchain_nr =3D data->callchain->nr; if (callchain_nr > max_callchain_nr) - return -EFAULT; + goto out_efault; sz =3D callchain_nr * sizeof(u64); /* * Save the cookie for the deferred user callchain. The last 2 @@ -3428,7 +3431,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, data->branch_stack =3D (struct branch_stack *)array++; =20 if (data->branch_stack->nr > max_branch_nr) - return -EFAULT; + goto out_efault; =20 sz =3D data->branch_stack->nr * sizeof(struct branch_entry); if (evsel__has_branch_hw_idx(evsel)) { @@ -3505,7 +3508,7 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, data->user_stack.size =3D *array++; if (WARN_ONCE(data->user_stack.size > sz, "user stack dump failure\n")) - return -EFAULT; + goto out_efault; } } =20 @@ -3586,6 +3589,9 @@ int evsel__parse_sample(struct evsel *evsel, union pe= rf_event *event, return __set_offcpu_sample(data); =20 return 0; +out_efault: + perf_sample__exit(data); + return -EFAULT; } =20 int evsel__parse_sample_timestamp(struct evsel *evsel, union perf_event *e= vent, diff --git a/tools/perf/util/sample.c b/tools/perf/util/sample.c index 8f82aaf1aab6..4894b990c6ce 100644 --- a/tools/perf/util/sample.c +++ b/tools/perf/util/sample.c @@ -21,13 +21,17 @@ void perf_sample__init(struct perf_sample *sample, bool= all) } else { sample->user_regs =3D NULL; sample->intr_regs =3D NULL; + sample->deferred_callchain =3D false; + sample->callchain =3D NULL; } } =20 void perf_sample__exit(struct perf_sample *sample) { - free(sample->user_regs); - free(sample->intr_regs); + zfree(&sample->user_regs); + zfree(&sample->intr_regs); + if (sample->deferred_callchain) + zfree(&sample->callchain); } =20 struct regs_dump *perf_sample__user_regs(struct perf_sample *sample) diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 4b465abfa36c..c48e840da7d4 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c @@ -1367,14 +1367,18 @@ static int evlist__deliver_deferred_callchain(struc= t evlist *evlist, list_for_each_entry_safe(de, tmp, &evlist->deferred_samples, list) { struct perf_sample orig_sample; =20 + perf_sample__init(&orig_sample, /*all=3D*/false); ret =3D evlist__parse_sample(evlist, de->event, &orig_sample); if (ret < 0) { pr_err("failed to parse original sample\n"); + perf_sample__exit(&orig_sample); break; } =20 - if (sample->tid !=3D orig_sample.tid) + if (sample->tid !=3D orig_sample.tid) { + perf_sample__exit(&orig_sample); continue; + } =20 if (event->callchain_deferred.cookie =3D=3D orig_sample.deferred_cookie) sample__merge_deferred_callchain(&orig_sample, sample); @@ -1385,9 +1389,7 @@ static int evlist__deliver_deferred_callchain(struct = evlist *evlist, ret =3D evlist__deliver_sample(evlist, tool, de->event, &orig_sample, evsel, machine); =20 - if (orig_sample.deferred_callchain) - free(orig_sample.callchain); - + perf_sample__exit(&orig_sample); list_del(&de->list); free(de->event); free(de); @@ -1414,9 +1416,11 @@ static int session__flush_deferred_samples(struct pe= rf_session *session, list_for_each_entry_safe(de, tmp, &evlist->deferred_samples, list) { struct perf_sample sample; =20 + perf_sample__init(&sample, /*all=3D*/false); ret =3D evlist__parse_sample(evlist, de->event, &sample); if (ret < 0) { pr_err("failed to parse original sample\n"); + perf_sample__exit(&sample); break; } =20 @@ -1424,6 +1428,7 @@ static int session__flush_deferred_samples(struct per= f_session *session, ret =3D evlist__deliver_sample(evlist, tool, de->event, &sample, evsel, machine); =20 + perf_sample__exit(&sample); list_del(&de->list); free(de->event); free(de); --=20 2.53.0.239.g8d8fc8a987-goog