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 3FB6233D6DD for ; Fri, 24 Apr 2026 16:48:30 +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=1777049313; cv=none; b=FqHS7psGZqaGHuKzsRTNRqnrEgGp+JaRyiCjSsZlJlEhrNnYkEWewu/hfXB2BqeWi4OyBpZhocHmm02XJEOb/gT1gn+yak9HQZ3nRjmnjrBQb4xMyeRZE0QgQXxlCr4HhN9hUzJKdlcjRatanw947EbXsPRE+4qlPoo6AduCVFE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777049313; c=relaxed/simple; bh=Xs7DO30JLva3xhjOB9hY2Msil8E9Felmxs1W5cdlAIM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DMZKjUKeASHgHYwoy2lmQaVHLIJQgg3YOjwtBww3RmtwTQzVnBINEUdxa7rOF9H0GTukewO4F0rAaYnj/l0HxZa9JHp2BEmNWzJP+ud1OSZ1FZwh/zOoJBVhllzH0TvIQ/PmT3/1duhOxCoOXS9fS+aVnLkwRNKl3lUMQJuQrZY= 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=noJLPN9J; 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="noJLPN9J" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2d9da2559aeso21249359eec.0 for ; Fri, 24 Apr 2026 09:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777049309; x=1777654109; 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=v/GPyVwDCpJjt6s/fMuS2x3pB1WGSLhH82Ue3kSnZpg=; b=noJLPN9JMvl50+UrViwmoCZrQ95IKWUK3fwJgInn4d0ZT4jM/TJG/RtlRIJrhiubV2 xcZSk+8W5axoHDe4i16Saj3AVZrvIatGNOuQq1QRyW/5a1w52/gZvCXsH005sO3jCAHW KpIwh3ycA73PP3opRAj+ke6hewIXXjXb5HnHuo8vXpG93Y4J/+IdJ1sUptb6X9bMg+q2 6jAcSB7Ny043NXSvVJIyjimXGtJST6tJiWDImKmIcILNeY9Id3QBUkejgDdC40GCCYWA AKfgB22eMzdtxkJ7IHikiUVhrDjd6Cn+6HmmcByiD3rVci65WZJl3uvfa1OWOYO8Vtxf qNog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777049309; x=1777654109; 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=v/GPyVwDCpJjt6s/fMuS2x3pB1WGSLhH82Ue3kSnZpg=; b=RMq+pWOOXdmtInsgRHiBZclJvRdYMJrWv5yKkgyndepsBcM5x8Z1bJiPFjt75dipPV xJeYwlwrjU+Zet424hM4jCEdvulv8yGrYJJveW8YsXZPgiBxC8+MISsgRAzBDP4fXL48 PQgrdBY7wrcaCio2WTlLhSHvssjhmpw7gqDYULkrGCQU3Rn7nWNxWw6i6tTlYIrwTQ83 iaaKb1Bp39B35NLPC/VeUG2NifehGyhN8EL0E97LtBI8GzvWjQE5KC6N2P8wNU5IZ570 vateJg9IhzHZ+b2XF0IA7r2DYv2Jviei4JFAqhkWC4PA8ZWFPz7ZvvBBef97OMvlLxTC 3exA== X-Forwarded-Encrypted: i=1; AFNElJ+DLXtnmOxb0Olf08BhGjEQpgcDmktNgQySFItZE+DQozBZ8nydlq5rl2GaYBlMPfnY2QinoXhghaMpdwEuq1qh@vger.kernel.org X-Gm-Message-State: AOJu0YyXRam3qUJgo9Xxsl1v9uRqXoJG/nen/zPjF2pGyI1USCu0CDvz +sOy1mCtOi3C2i0x5ba38jkgU9qD0ksfKkvxhNhXFVWBNCLIITlY8JZAhCVpwm3J1o2laFOFnRy j5rQ3WUx+Cg== X-Received: from dybgt36.prod.google.com ([2002:a05:7301:2224:b0:2d1:6536:ac8a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:d512:b0:2c7:3a7:c7a7 with SMTP id 5a478bee46e88-2e47951866bmr18879658eec.25.1777049309118; Fri, 24 Apr 2026 09:48:29 -0700 (PDT) Date: Fri, 24 Apr 2026 09:46:42 -0700 In-Reply-To: <20260424164721.2229025-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: <20260423163406.1779809-1-irogers@google.com> <20260424164721.2229025-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.545.g6539524ca2-goog Message-ID: <20260424164721.2229025-21-irogers@google.com> Subject: [PATCH v5 20/58] perf python: Extend API for stat events in python.c From: Ian Rogers To: acme@kernel.org, adrian.hunter@intel.com, james.clark@linaro.org, leo.yan@linux.dev, namhyung@kernel.org, tmricht@linux.ibm.com Cc: alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, Ian Rogers Content-Type: text/plain; charset="UTF-8" Add stat information to the session. Add call backs for stat events. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Avoided Name Collision: Renamed the second "type" field in pyrf_stat_round_event__members[] to "stat_round_type" to prevent it from hiding the event header's type attribute. 2. Fixed Leak and Exception Handling in Callback: Added proper reference count handling for the result of PyObject_CallFunction() in pyrf_session_tool__stat() , and added an exception check that aborts the loop if the Python callback fails. 3. Fixed Leak in Destructor: Added Py_XDECREF(psession->stat); to pyrf_session__delete() to release the stat callback reference. --- tools/perf/util/python.c | 170 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 166 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index dc10d8a42d92..c4f0e01b64f3 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -299,6 +299,76 @@ static PyTypeObject pyrf_lost_event__type = { .tp_repr = (reprfunc)pyrf_lost_event__repr, }; +static const char pyrf_stat_event__doc[] = PyDoc_STR("perf stat event object."); + +static PyMemberDef pyrf_stat_event__members[] = { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + member_def(perf_record_stat, id, T_ULONGLONG, "event id"), + member_def(perf_record_stat, cpu, T_UINT, "event cpu"), + member_def(perf_record_stat, thread, T_UINT, "event thread"), + member_def(perf_record_stat, val, T_ULONGLONG, "counter value"), + member_def(perf_record_stat, ena, T_ULONGLONG, "enabled time"), + member_def(perf_record_stat, run, T_ULONGLONG, "running time"), + { .name = NULL, }, +}; + +static PyObject *pyrf_stat_event__repr(const struct pyrf_event *pevent) +{ + return PyUnicode_FromFormat( + "{ type: stat, id: %llu, cpu: %u, thread: %u, val: %llu, ena: %llu, run: %llu }", + pevent->event.stat.id, + pevent->event.stat.cpu, + pevent->event.stat.thread, + pevent->event.stat.val, + pevent->event.stat.ena, + pevent->event.stat.run); +} + +static PyTypeObject pyrf_stat_event__type = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "perf.stat_event", + .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_stat_event__doc, + .tp_members = pyrf_stat_event__members, + .tp_getset = pyrf_event__getset, + .tp_repr = (reprfunc)pyrf_stat_event__repr, +}; + +static const char pyrf_stat_round_event__doc[] = PyDoc_STR("perf stat round event object."); + +static PyMemberDef pyrf_stat_round_event__members[] = { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + { .name = "stat_round_type", .type = T_ULONGLONG, + .offset = offsetof(struct perf_record_stat_round, type), .doc = "round type" }, + member_def(perf_record_stat_round, time, T_ULONGLONG, "round time"), + { .name = NULL, }, +}; + +static PyObject *pyrf_stat_round_event__repr(const struct pyrf_event *pevent) +{ + return PyUnicode_FromFormat("{ type: stat_round, type: %llu, time: %llu }", + pevent->event.stat_round.type, + pevent->event.stat_round.time); +} + +static PyTypeObject pyrf_stat_round_event__type = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "perf.stat_round_event", + .tp_basicsize = sizeof(struct pyrf_event), + .tp_new = PyType_GenericNew, + .tp_dealloc = (destructor)pyrf_event__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_stat_round_event__doc, + .tp_members = pyrf_stat_round_event__members, + .tp_getset = pyrf_event__getset, + .tp_repr = (reprfunc)pyrf_stat_round_event__repr, +}; + static const char pyrf_read_event__doc[] = PyDoc_STR("perf read event object."); static PyMemberDef pyrf_read_event__members[] = { @@ -986,6 +1056,12 @@ static int pyrf_event__setup_types(void) if (err < 0) goto out; err = PyType_Ready(&pyrf_context_switch_event__type); + if (err < 0) + goto out; + err = PyType_Ready(&pyrf_stat_event__type); + if (err < 0) + goto out; + err = PyType_Ready(&pyrf_stat_round_event__type); if (err < 0) goto out; err = PyType_Ready(&pyrf_callchain_node__type); @@ -1010,6 +1086,8 @@ static PyTypeObject *pyrf_event__type[] = { [PERF_RECORD_SAMPLE] = &pyrf_sample_event__type, [PERF_RECORD_SWITCH] = &pyrf_context_switch_event__type, [PERF_RECORD_SWITCH_CPU_WIDE] = &pyrf_context_switch_event__type, + [PERF_RECORD_STAT] = &pyrf_stat_event__type, + [PERF_RECORD_STAT_ROUND] = &pyrf_stat_round_event__type, }; static PyObject *pyrf_event__new(const union perf_event *event) @@ -1020,7 +1098,9 @@ static PyObject *pyrf_event__new(const union perf_event *event) if ((event->header.type < PERF_RECORD_MMAP || event->header.type > PERF_RECORD_SAMPLE) && !(event->header.type == PERF_RECORD_SWITCH || - event->header.type == PERF_RECORD_SWITCH_CPU_WIDE)) { + event->header.type == PERF_RECORD_SWITCH_CPU_WIDE || + event->header.type == PERF_RECORD_STAT || + event->header.type == PERF_RECORD_STAT_ROUND)) { PyErr_Format(PyExc_TypeError, "Unexpected header type %u", event->header.type); return NULL; @@ -1880,7 +1960,40 @@ static PyObject *pyrf_evsel__get_attr_wakeup_events(PyObject *self, void */*clos return PyLong_FromUnsignedLong(pevsel->evsel->core.attr.wakeup_events); } +static PyObject *pyrf_evsel__get_ids(struct pyrf_evsel *pevsel, void *closure __maybe_unused) +{ + struct evsel *evsel = pevsel->evsel; + PyObject *list = PyList_New(0); + + if (!list) + return NULL; + + for (u32 i = 0; i < evsel->core.ids; i++) { + PyObject *id = PyLong_FromUnsignedLongLong(evsel->core.id[i]); + int ret; + + if (!id) { + Py_DECREF(list); + return NULL; + } + ret = PyList_Append(list, id); + Py_DECREF(id); + if (ret < 0) { + Py_DECREF(list); + return NULL; + } + } + + return list; +} + static PyGetSetDef pyrf_evsel__getset[] = { + { + .name = "ids", + .get = (getter)pyrf_evsel__get_ids, + .set = NULL, + .doc = "event IDs.", + }, { .name = "tracking", .get = pyrf_evsel__get_tracking, @@ -2640,6 +2753,8 @@ static const struct perf_constant perf__constants[] = { PERF_CONST(RECORD_LOST_SAMPLES), PERF_CONST(RECORD_SWITCH), PERF_CONST(RECORD_SWITCH_CPU_WIDE), + PERF_CONST(RECORD_STAT), + PERF_CONST(RECORD_STAT_ROUND), PERF_CONST(RECORD_MISC_SWITCH_OUT), { .name = NULL, }, @@ -3056,6 +3171,46 @@ static int pyrf_session_tool__sample(const struct perf_tool *tool, return 0; } +static int pyrf_session_tool__stat(const struct perf_tool *tool, + struct perf_session *session, + union perf_event *event) +{ + struct pyrf_session *psession = container_of(tool, struct pyrf_session, tool); + PyObject *pyevent = pyrf_event__new(event); + struct evsel *evsel = evlist__id2evsel(session->evlist, event->stat.id); + const char *name = evsel ? evsel__name(evsel) : "unknown"; + PyObject *ret; + + if (pyevent == NULL) + return -ENOMEM; + + ret = PyObject_CallFunction(psession->stat, "Os", pyevent, name); + if (!ret) { + PyErr_Print(); + Py_DECREF(pyevent); + return -1; + } + Py_DECREF(ret); + Py_DECREF(pyevent); + return 0; +} + +static int pyrf_session_tool__stat_round(const struct perf_tool *tool, + struct perf_session *session __maybe_unused, + union perf_event *event) +{ + struct pyrf_session *psession = container_of(tool, struct pyrf_session, tool); + PyObject *pyevent = pyrf_event__new(event); + + if (pyevent == NULL) + return -ENOMEM; + + PyObject_CallFunction(psession->stat, "O", pyevent); + Py_DECREF(pyevent); + return 0; +} + + static PyObject *pyrf_session__process(struct pyrf_session *psession, PyObject *args) { struct machine *machine; @@ -3088,10 +3243,11 @@ static int pyrf_session__init(struct pyrf_session *psession, PyObject *args, PyO { struct pyrf_data *pdata; PyObject *sample = NULL; - static char *kwlist[] = { "data", "sample", NULL }; + PyObject *stat = NULL; + static char *kwlist[] = { "data", "sample", "stat", NULL }; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O", kwlist, &pyrf_data__type, &pdata, - &sample)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|OO", kwlist, &pyrf_data__type, &pdata, + &sample, &stat)) return -1; Py_INCREF(pdata); @@ -3113,8 +3269,13 @@ static int pyrf_session__init(struct pyrf_session *psession, PyObject *args, PyO } while (0) ADD_TOOL(sample); + ADD_TOOL(stat); #undef ADD_TOOL + if (stat) + psession->tool.stat_round = pyrf_session_tool__stat_round; + + psession->tool.comm = perf_event__process_comm; psession->tool.mmap = perf_event__process_mmap; psession->tool.mmap2 = perf_event__process_mmap2; @@ -3156,6 +3317,7 @@ static void pyrf_session__delete(struct pyrf_session *psession) { Py_XDECREF(psession->pdata); Py_XDECREF(psession->sample); + Py_XDECREF(psession->stat); perf_session__delete(psession->session); Py_TYPE(psession)->tp_free((PyObject *)psession); } -- 2.54.0.545.g6539524ca2-goog