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 5C54D33B6F4 for ; Fri, 24 Apr 2026 16:48:15 +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=1777049297; cv=none; b=O27MDBLNgb8Q5vPDrkvr63A1G0lXGv+WtrM7TE4tIFbtOssd5R4hk8KetZH0rf8On5DWec/NOGzQr7qUJLVJ9sO0jRs+t2Dy8NC0QdlHHG59x2JlBw82wghBkX/27EztTNGNuMA6YU9HOU0LjKxzn5qCOuMAE4bo9egdTClnrUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777049297; c=relaxed/simple; bh=gL7zg7JTJOEaEfnIKsA+ZHMroZi/N8zA92GiSrJF+0w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Zlt+lP/xMZE9XL+IVbfGSeXH31p9yX0+KEx3cFuVkdY8t3u9Uc+rmGRGcGoh5z03jwhCUHP+TjETlWncQ8uhmg95KgEHrIt020YqRFdtQpY3MFIqtmsUEXgkPNIKfvcUK/td/Xxm6NfFyvhiOy7EluRhLmvi8BZYxC4YFpE+OP0= 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=P2FZ8wtZ; 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="P2FZ8wtZ" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ddd8ef5343so7784489eec.1 for ; Fri, 24 Apr 2026 09:48:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1777049295; x=1777654095; 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=wM2h5mdu5BIohf7YOf7SjkCuYCdrfaX5/l3G92wMaFw=; b=P2FZ8wtZS6FYqnGZpixYchfPQlH8ycFxxxqkaXP8lx/RgsQBx3grd3e7VCEJE731dq PC01c4+aRDbt15Wq4FStzwPg9XxGjWIuq8Cvmnk0t2kIr8qgw6+oA492xbX/9lSgafaV Al7MfbNH0k/jG8OvpG4FVtQlIeZ+fA7aH8Z/ejd2vxTbHFpcp7l6Y14zCIzAPoZ2GOrq CDTUyzzxPzdp/edSqYeZDwshLss3DVf33XPvqGJ3X17aary44zT2spLlDgJc9e5oldGe 8CEuotkdZBEfGnVZ4HmOYhMxIcyuiJR2XuaWU4pjRbSEg9Qt79M54A9jXdVFY+U2+lPd SZNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777049295; x=1777654095; 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=wM2h5mdu5BIohf7YOf7SjkCuYCdrfaX5/l3G92wMaFw=; b=ScE2l9t5LOzpxsAmi1XuaMQPOr8Lmz4PIu0mTUtVb+790l7x2h0kLCJeIb3VQ5BMKp M2eK1Mc0je+FMt23vOgogrrVcTDRvyxPRMpEz5i+0fbzA6946gd/mEfw6S+9OYfUBaBe 8b84Mm8T3yUNH5Q+xqNiyZt/BBGtI++1KqckH+sBybbIdfqX+9q66Xt/uGTJLh42xuY5 CEpQjt4aEcU5CZ+EvEBg9jGOGEUkFCVR6p+8xw11jOSkERLoODCbKRRIXc82gXNsco5Y eZmYihR8/tyGrqCGSMAMmTd9Dw7M+FruYB2c+V3HL6Q4hX9T5beK/KcKxggckEO9px5+ 0jfg== X-Forwarded-Encrypted: i=1; AFNElJ9dVmi9ZZTjDCn8W7OSJqlUrUVCSRXz5iUTKunAT9SOxRasymK6dS4AX8tSxJlRrA/pYFQ0WayeCCO5m/B0rTvg@vger.kernel.org X-Gm-Message-State: AOJu0YwVui3mcr/bAdXdC3+SbQPRwUnL6ZYTKRbyvh4GZ3FAw+kb4bJi Psy882ZmmlB+CKsesKuXQkzbuPLJiyC2bVoNIfodATWx+E+4ipZ3SQeBu+3WxRlAARz8U+qJLv0 YUFcS1REUIA== X-Received: from dybkz15.prod.google.com ([2002:a05:7301:1a0f:b0:2d9:cb4f:864d]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:641b:b0:2d1:d434:d022 with SMTP id 5a478bee46e88-2e4521f9d92mr17381630eec.0.1777049294293; Fri, 24 Apr 2026 09:48:14 -0700 (PDT) Date: Fri, 24 Apr 2026 09:46:36 -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-15-irogers@google.com> Subject: [PATCH v5 14/58] perf python: Add wrapper for perf_data file abstraction 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" The perf_data struct is needed for session supported. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v2: 1. Fixed Memory & FD Leaks in pyrf_data__init : Added cleanup of old state (closing file and freeing path) if __init__ is called multiple times on the same object. 2. Fixed Invalid Free in pyrf_data__delete : Ensured pdata->data.path is always dynamically allocated via strdup() , even for the default "perf.data" . This avoids passing a static string literal to free(). 3. Fixed NULL Pointer Dereference in pyrf_data__str : Added a check for NULL path to prevent segfaults if str() or repr() is called on an uninitialized object. 4. Guarded fd Argument Usage: Added a check to ensure that if an fd is provided, it corresponds to a pipe, failing gracefully with a ValueError otherwise. --- tools/perf/util/python.c | 93 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 92 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 0424290f8b77..a2cdd92e0548 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -10,6 +10,7 @@ #include "callchain.h" #include "counts.h" +#include "data.h" #include "event.h" #include "evlist.h" #include "evsel.h" @@ -2296,6 +2297,92 @@ static PyObject *pyrf__metrics(PyObject *self, PyObject *args) return list; } +struct pyrf_data { + PyObject_HEAD + + struct perf_data data; +}; + +static int pyrf_data__init(struct pyrf_data *pdata, PyObject *args, PyObject *kwargs) +{ + static char *kwlist[] = { "path", "fd", NULL }; + char *path = NULL; + int fd = -1; + + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", kwlist, &path, &fd)) + return -1; + + if (pdata->data.open) + perf_data__close(&pdata->data); + free((char *)pdata->data.path); + + if (!path) + path = "perf.data"; + + pdata->data.path = strdup(path); + if (!pdata->data.path) { + PyErr_NoMemory(); + return -1; + } + + if (fd != -1) { + struct stat st; + + if (fstat(fd, &st) < 0 || !S_ISFIFO(st.st_mode)) { + PyErr_SetString(PyExc_ValueError, + "fd argument is only supported for pipes"); + free((char *)pdata->data.path); + pdata->data.path = NULL; + return -1; + } + } + + pdata->data.mode = PERF_DATA_MODE_READ; + pdata->data.file.fd = fd; + if (perf_data__open(&pdata->data) < 0) { + PyErr_Format(PyExc_IOError, "Failed to open perf data: %s", + pdata->data.path ? pdata->data.path : "perf.data"); + return -1; + } + return 0; +} + +static void pyrf_data__delete(struct pyrf_data *pdata) +{ + perf_data__close(&pdata->data); + free((char *)pdata->data.path); + Py_TYPE(pdata)->tp_free((PyObject *)pdata); +} + +static PyObject *pyrf_data__str(PyObject *self) +{ + const struct pyrf_data *pdata = (const struct pyrf_data *)self; + + if (!pdata->data.path) + return PyUnicode_FromString("[uninitialized]"); + return PyUnicode_FromString(pdata->data.path); +} + +static const char pyrf_data__doc[] = PyDoc_STR("perf data file object."); + +static PyTypeObject pyrf_data__type = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "perf.data", + .tp_basicsize = sizeof(struct pyrf_data), + .tp_dealloc = (destructor)pyrf_data__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_data__doc, + .tp_init = (initproc)pyrf_data__init, + .tp_repr = pyrf_data__str, + .tp_str = pyrf_data__str, +}; + +static int pyrf_data__setup_types(void) +{ + pyrf_data__type.tp_new = PyType_GenericNew; + return PyType_Ready(&pyrf_data__type); +} + static PyMethodDef perf__methods[] = { { .ml_name = "metrics", @@ -2358,7 +2445,8 @@ PyMODINIT_FUNC PyInit_perf(void) pyrf_cpu_map__setup_types() < 0 || pyrf_pmu_iterator__setup_types() < 0 || pyrf_pmu__setup_types() < 0 || - pyrf_counts_values__setup_types() < 0) + pyrf_counts_values__setup_types() < 0 || + pyrf_data__setup_types() < 0) return module; /* The page_size is placed in util object. */ @@ -2406,6 +2494,9 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_counts_values__type); PyModule_AddObject(module, "counts_values", (PyObject *)&pyrf_counts_values__type); + Py_INCREF(&pyrf_data__type); + PyModule_AddObject(module, "data", (PyObject *)&pyrf_data__type); + dict = PyModule_GetDict(module); if (dict == NULL) goto error; -- 2.54.0.545.g6539524ca2-goog