From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 8079F3A63F3 for ; Thu, 23 Apr 2026 16:34:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776962089; cv=none; b=tMj3vt1VcR8QBJ2PYZciWl12AyZJhr0BjYdnY+xsf4zKnkkkWye6cO44G9Bh/E9w5kN3oXHYWX7e8JXrUOXQNIhvZBkLPzdBf662zI3jBNF4rAaDuD6C7Fb+TRQ9fvGmHaHSdToK9Ua1Ll37Dd43Yp6Kn81xoTp6RmHoIPU55S4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776962089; c=relaxed/simple; bh=SddOEk71s5ZNjyMSXVIiJTxbAbNJCkJjg57RoW56KlQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rQU7a1s/ga8yakvMi7ftgD9qi8nPUHlYA+kyBPqSHuKLQ8N9d+/NopaFnVED1gXdsSziD3g4n3FX4wX7JXtrOUcEAdBelg4Xrt3j8Toi9vAzug2Do0EnDAQJRgGK5va8yzHgelAfvf3/GGOYUfE+d3WcklrNmkK81QE0bLWJHi0= 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=vDYcEPhd; arc=none smtp.client-ip=74.125.82.201 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="vDYcEPhd" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2bdf75bc88fso8698360eec.0 for ; Thu, 23 Apr 2026 09:34:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1776962085; x=1777566885; 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=V8jf+KmiYWt405SLVCkdGEX6YLKwma920ZC5K+EWf6U=; b=vDYcEPhdyqjrbOrhpNSe//tEsQuYPGlTf8zoDkVus+klvMbt0lkGCLqmQlHbxpNS5r 6dgyAGkOMC/B+x5zm1JymxFuw1nKuKZBKPfwjAuhI7C3VW8rP8TVNrUH+CdUN/fQY7PJ +dks8fqJ7dlEM76k2CxW0BOGzLpa5JqAHhCzu5S2+g9BClYE2QZFlT3xNXFysdOkItA7 9wbAPOqzPUosWg6ZxpHMd7vkHAWP2G3bzg6dhdfD+LgD71iVU4sV/UukRdYVyRWLXMKV TYGcGS8IBkRNPhFV7bJcOUNPJ4mooFXgzAIeWXnPPIzcpSFkHrbcNtqQ2U0J+udGwMsz UG/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776962085; x=1777566885; 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=V8jf+KmiYWt405SLVCkdGEX6YLKwma920ZC5K+EWf6U=; b=pvKHuuwQzAqiyqEsR+mKXvVbJYWLJqgJPJAFpkY1m4p9YjRJDX0lvicrewm4Y5gp8b PQ0yN3J88A8AMloAB+8QBSZU6AkXyAdsRvIGwUcczHtMj/OR2cFwVMQM0+YSmMp99k0q mlNS0TPEYuYngwB6B9hE8QLUb5QL5OcDALiPfUPe0hGLSs5+F9O0trd1JsQu04JAe12g NDZdjB58qr8wNWMQog84PEzhDuefzSctPoB5v79YLPIdJHzd4j5H5raS8cX1cmG1XTNM 6ARHJkj/IWwywUKLcu5AkklixlxN1eC4B/Jwdd1nGKIm5HO+Xw9uDZPcKj7j8I817Z8K 88NQ== X-Forwarded-Encrypted: i=1; AFNElJ88ERyPCVw2P1detm6cONb/976Y8Aql4qJRBMQOjgbNcph/hMiiB/fetmiQPdQF1UbsOLS2WX/zEAtsw1vr0i01@vger.kernel.org X-Gm-Message-State: AOJu0YzHCdK6bdm2Nav640Ke5I8/DuP71NLoPYA/8Cs20u3WofEyfkgn 4qvZl1E31H4q4iuAR0BIV1M76UQHMQcD05xAqDL6Xszn2XkY9gXmZwqt+ySgp5sjCqxVrcHw1nf FqvKUzvrMKQ== X-Received: from dycqr6.prod.google.com ([2002:a05:7300:ff46:b0:2dd:67ce:b8c5]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:748f:b0:2e0:909a:b9c with SMTP id 5a478bee46e88-2e478839eaamr14667122eec.15.1776962084639; Thu, 23 Apr 2026 09:34:44 -0700 (PDT) Date: Thu, 23 Apr 2026 09:33:21 -0700 In-Reply-To: <20260423163406.1779809-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260423161006.1762700-1-irogers@google.com> <20260423163406.1779809-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260423163406.1779809-14-irogers@google.com> Subject: [PATCH v4 13/58] perf python: Use evsel in sample in pyrf_event From: Ian Rogers To: irogers@google.com, acme@kernel.org, adrian.hunter@intel.com, james.clark@linaro.org, leo.yan@linux.dev, namhyung@kernel.org, tmricht@linux.ibm.com Cc: 9erthalion6@gmail.com, adityab1@linux.ibm.com, alexandre.chartre@oracle.com, alice.mei.rogers@gmail.com, ankur.a.arora@oracle.com, ashelat@redhat.com, atrajeev@linux.ibm.com, blakejones@google.com, changbin.du@huawei.com, chuck.lever@oracle.com, collin.funk1@gmail.com, coresight@lists.linaro.org, ctshao@google.com, dapeng1.mi@linux.intel.com, derek.foreman@collabora.com, dsterba@suse.com, gautam@linux.ibm.com, howardchu95@gmail.com, john.g.garry@oracle.com, jolsa@kernel.org, jonathan.cameron@huawei.com, justinstitt@google.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mike.leach@arm.com, mingo@redhat.com, morbo@google.com, nathan@kernel.org, nichen@iscas.ac.cn, nick.desaulniers+lkml@gmail.com, pan.deng@intel.com, peterz@infradead.org, ravi.bangoria@amd.com, ricky.ringler@proton.me, stephen.s.brennan@oracle.com, sun.jian.kdev@gmail.com, suzuki.poulose@arm.com, swapnil.sapkal@amd.com, tanze@kylinos.cn, terrelln@fb.com, thomas.falcon@intel.com, tianyou.li@intel.com, tycho@kernel.org, wangyang.guo@intel.com, xiaqinxin@huawei.com, yang.lee@linux.alibaba.com, yuzhuo@google.com, zhiguo.zhou@intel.com, zli94@ncsu.edu Content-Type: text/plain; charset="UTF-8" Avoid a duplicated evsel by using the one in sample. Add evsel__get/put to the evsel in perf_sample. Signed-off-by: Ian Rogers --- tools/perf/util/evsel.c | 2 +- tools/perf/util/python.c | 10 +++------- tools/perf/util/sample.c | 17 ++++++++++++----- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index 3015b9b4b4da..9b16d832810f 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -3235,7 +3235,7 @@ int evsel__parse_sample(struct evsel *evsel, union perf_event *event, union u64_swap u; perf_sample__init(data, /*all=*/true); - data->evsel = evsel; + data->evsel = evsel__get(evsel); data->cpu = data->pid = data->tid = -1; data->stream_id = data->id = data->time = -1ULL; data->period = evsel->core.attr.sample_period; diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0162d8a625de..0424290f8b77 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -43,7 +43,6 @@ PyMODINIT_FUNC PyInit_perf(void); struct pyrf_event { PyObject_HEAD - struct evsel *evsel; struct perf_sample sample; union perf_event event; }; @@ -274,7 +273,6 @@ static PyMemberDef pyrf_sample_event__members[] = { static void pyrf_sample_event__delete(struct pyrf_event *pevent) { - evsel__put(pevent->evsel); perf_sample__exit(&pevent->sample); Py_TYPE(pevent)->tp_free((PyObject*)pevent); } @@ -296,7 +294,7 @@ static PyObject *pyrf_sample_event__repr(const struct pyrf_event *pevent) #ifdef HAVE_LIBTRACEEVENT static bool is_tracepoint(const struct pyrf_event *pevent) { - return pevent->evsel->core.attr.type == PERF_TYPE_TRACEPOINT; + return pevent->sample.evsel->core.attr.type == PERF_TYPE_TRACEPOINT; } static PyObject* @@ -343,7 +341,7 @@ tracepoint_field(const struct pyrf_event *pe, struct tep_format_field *field) static PyObject* get_tracepoint_field(struct pyrf_event *pevent, PyObject *attr_name) { - struct evsel *evsel = pevent->evsel; + struct evsel *evsel = pevent->sample.evsel; struct tep_event *tp_format = evsel__tp_format(evsel); struct tep_format_field *field; @@ -509,7 +507,7 @@ static PyObject *pyrf_event__new(const union perf_event *event) pevent = PyObject_New(struct pyrf_event, ptype); if (pevent != NULL) { memcpy(&pevent->event, event, event->header.size); - pevent->evsel = NULL; + perf_sample__init(&pevent->sample, /*all=*/false); } return (PyObject *)pevent; } @@ -1788,8 +1786,6 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist, return Py_None; } - pevent->evsel = evsel__get(evsel); - perf_mmap__consume(&md->core); err = evsel__parse_sample(evsel, &pevent->event, &pevent->sample); diff --git a/tools/perf/util/sample.c b/tools/perf/util/sample.c index cf73329326d7..7ec534dedc5c 100644 --- a/tools/perf/util/sample.c +++ b/tools/perf/util/sample.c @@ -1,18 +1,23 @@ /* SPDX-License-Identifier: GPL-2.0 */ #include "sample.h" + +#include +#include + +#include +#include + #include "debug.h" +#include "evsel.h" #include "thread.h" -#include +#include "../../arch/x86/include/asm/insn.h" + #ifndef EM_CSKY #define EM_CSKY 252 #endif #ifndef EM_LOONGARCH #define EM_LOONGARCH 258 #endif -#include -#include -#include -#include "../../arch/x86/include/asm/insn.h" void perf_sample__init(struct perf_sample *sample, bool all) { @@ -29,6 +34,8 @@ void perf_sample__init(struct perf_sample *sample, bool all) void perf_sample__exit(struct perf_sample *sample) { + evsel__put(sample->evsel); + sample->evsel = NULL; zfree(&sample->user_regs); zfree(&sample->intr_regs); if (sample->merged_callchain) { -- 2.54.0.rc2.533.g4f5dca5207-goog