From mboxrd@z Thu Jan 1 00:00:00 1970 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 714A74C9016 for ; Thu, 11 Jun 2026 17:18:52 +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=1781198342; cv=none; b=nVtP/ZfIlhx6VAvtlWg2rhpj+Y3lunI8VUALWDU71DgEmf6B534338jsxFrvrKo/G+Rgpl5mX4trF3yqnnvJqc5X5QG4O3TJ9cGffxPlLYGxmDxYgy2/S+fziPaa9KCa6lYGjhApeGGHq77/gxiDdr1ItGU9iN9F3qDa5JogcGs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781198342; c=relaxed/simple; bh=6fvlxaerL7T1FlfRDA/ba0DHW2YNWCE85B6KLDEKdIY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=rXCVDIDG184S2riw+QRSHk3LvrnFYrSW3LomL6Ty5cvks+l04TuEYI5orbXwK2I9V5/z4B8H6ams1Vdwtehv7H7bz9Yy5VL/MjJx8TzKvEYa+nB6KhdWnFOw29ozKyIPxraRfCh1lBrYO+FRrlTkOhbCMcsPXi0dnsDWxrhrLIY= 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=H+FQ/hik; 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="H+FQ/hik" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-307fe856724so84732eec.1 for ; Thu, 11 Jun 2026 10:18:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781198331; x=1781803131; 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=a/ZxSOfXrNuy5mjLhx0UnPHsAivXFI/Kb0MWpZgq0sM=; b=H+FQ/hikQ2ilmatyZnroxAYpjwRVfefFhap1JifqwmulmlbmxyZ4ETOj74Xfk6CiTl B3pgXcA996MXK0+f/YzlAr6ioNOk1XkHkvX1EkMIp4xOwHimHjC9Iwc/bNOF4ptofTYS ASbtcluzIcdJ07SC8AnEtRmmFcj3+9Y6gMi02qRIGOTX+o3JVTnKJP1F8jDbgmMU5fK4 Uk2/EhGEN1LNwIETw5tdNKfjpdYXLmK13XHy/8n+7KO2ktK/NDsbe+VGq1uGakmFwtk7 oWAiI2n4p8XJ3/idwki4j7fiPHWorYTt9vVSxMxZ20DIIeKJagt1jS98br1LtOsqCp7H qhdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781198331; x=1781803131; 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=a/ZxSOfXrNuy5mjLhx0UnPHsAivXFI/Kb0MWpZgq0sM=; b=B33wyJ0nPaq04zDurm3/nxGEstldlo7VaU8mm28G3U6gUs2BmgKD4A0p8pZXeK2Z/1 pe3jyo7JDm2gywlQic1OwPkkRmUtDROjHk4Bt0Xm5LNN/vPnwI77cfEXNB7m20kKsya4 aLWfaVd0IxPcJ6tQoIgaKOyZj45sw2HFpzFSjL2xs7jd2TckkdMq39Q1sVdMhjAipk6O 8g0oUuJvu6L7CJsjOGU3lSO7d859fvEv92k+HaWNNysr2XfR+hEboDSCEAr+cxeeN5Vk ZTiR04Y70t5O+rJvU8xnOrV4v8uywJ7lfom26RpuSktq13VrRr8I8sASi87JzFG6QK2I FoWQ== X-Forwarded-Encrypted: i=1; AFNElJ+XZjcHsDwqPxpf3wJS/egPkghfWD8QS+eIn6DoShCGeGhoyDFP5HDVH1+ZVZKO8iQL1qgAoPsJDi+EHQ0=@vger.kernel.org X-Gm-Message-State: AOJu0Yzw7TmRwNvRg+zJGzc6U4nUKbRoZTMzW6hK8tWwklNp8v83BXwn ApbB711jwzPwfvpdNgS4j+DlNdGE+TFpvKJh/v3QtsLXmoGKuxiagNAfivOPBVQ/FPNHCcgofWF /MeYobeSkKw== X-Received: from dyfh15.prod.google.com ([2002:a05:7300:50f:b0:2f6:cacc:a338]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:434f:b0:307:3a6c:e708 with SMTP id 5a478bee46e88-3080460737cmr3342969eec.5.1781198331011; Thu, 11 Jun 2026 10:18:51 -0700 (PDT) Date: Thu, 11 Jun 2026 10:17:49 -0700 In-Reply-To: <20260611171756.4008769-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: <20260605191500.2477026-1-irogers@google.com> <20260611171756.4008769-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260611171756.4008769-13-irogers@google.com> Subject: [PATCH v12 12/19] perf python: Add mmap2 event From: Ian Rogers To: irogers@google.com Cc: acme@kernel.org, adrian.hunter@intel.com, alice.mei.rogers@gmail.com, dapeng1.mi@linux.intel.com, james.clark@linaro.org, leo.yan@linux.dev, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, namhyung@kernel.org, peterz@infradead.org, tmricht@linux.ibm.com Content-Type: text/plain; charset="UTF-8" If mmap is handled so should mmap2 events. Add support as a distinct python event type. Assisted-by: Gemini:gemini-3.1-pro-preview Signed-off-by: Ian Rogers --- v12: - Used `copy_size` to bound `max_len` for NUL termination of mmap2 and comm events to fix an out-of-bounds write. --- tools/perf/util/python.c | 158 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 157 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 7011a773e450..a00c27e3e677 100644 --- a/tools/perf/util/python.c +++ b/tools/perf/util/python.c @@ -133,7 +133,7 @@ static const char pyrf_mmap_event__doc[] = PyDoc_STR("perf mmap event object."); static PyMemberDef pyrf_mmap_event__members[] = { sample_members member_def(perf_event_header, type, T_UINT, "event type"), - member_def(perf_event_header, misc, T_UINT, "event misc"), + member_def(perf_event_header, misc, T_USHORT, "event misc"), member_def(perf_record_mmap, pid, T_UINT, "event pid"), member_def(perf_record_mmap, tid, T_UINT, "event tid"), member_def(perf_record_mmap, start, T_ULONGLONG, "start of the map"), @@ -174,6 +174,149 @@ static PyTypeObject pyrf_mmap_event__type = { .tp_repr = (reprfunc)pyrf_mmap_event__repr, }; +static const char pyrf_mmap2_event__doc[] = PyDoc_STR("perf mmap2 event object."); + +static PyObject *pyrf_mmap2_event__get_maj(PyObject *self, void *closure __maybe_unused) +{ + struct pyrf_event *pevent = (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(pevent->event.mmap2.maj); +} + +static PyObject *pyrf_mmap2_event__get_min(PyObject *self, void *closure __maybe_unused) +{ + struct pyrf_event *pevent = (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLong(pevent->event.mmap2.min); +} + +static PyObject *pyrf_mmap2_event__get_ino(PyObject *self, void *closure __maybe_unused) +{ + struct pyrf_event *pevent = (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->event.mmap2.ino); +} + +static PyObject *pyrf_mmap2_event__get_ino_generation(PyObject *self, void *closure __maybe_unused) +{ + struct pyrf_event *pevent = (void *)self; + + if (pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID) + Py_RETURN_NONE; + + return PyLong_FromUnsignedLongLong(pevent->event.mmap2.ino_generation); +} + +static PyObject *pyrf_mmap2_event__get_build_id(PyObject *self, void *closure __maybe_unused) +{ + struct pyrf_event *pevent = (void *)self; + + if (!(pevent->event.header.misc & PERF_RECORD_MISC_MMAP_BUILD_ID)) + Py_RETURN_NONE; + + int size = pevent->event.mmap2.build_id_size; + + if (size > 20) + size = 20; + + return PyBytes_FromStringAndSize((const char *)pevent->event.mmap2.build_id, size); +} + +static PyGetSetDef pyrf_mmap2_event__getset[] = { + { + .name = "evsel", + .get = pyrf_event__get_evsel, + .set = NULL, + .doc = "tracking event.", + }, + { + .name = "maj", + .get = pyrf_mmap2_event__get_maj, + .set = NULL, + .doc = "major number.", + }, + { + .name = "min", + .get = pyrf_mmap2_event__get_min, + .set = NULL, + .doc = "minor number.", + }, + { + .name = "ino", + .get = pyrf_mmap2_event__get_ino, + .set = NULL, + .doc = "inode number.", + }, + { + .name = "ino_generation", + .get = pyrf_mmap2_event__get_ino_generation, + .set = NULL, + .doc = "inode generation.", + }, + { + .name = "build_id", + .get = pyrf_mmap2_event__get_build_id, + .set = NULL, + .doc = "binary build ID.", + }, + { .name = NULL, }, +}; + +static PyMemberDef pyrf_mmap2_event__members[] = { + sample_members + member_def(perf_event_header, type, T_UINT, "event type"), + member_def(perf_event_header, misc, T_USHORT, "event misc"), + member_def(perf_record_mmap2, pid, T_UINT, "event pid"), + member_def(perf_record_mmap2, tid, T_UINT, "event tid"), + member_def(perf_record_mmap2, start, T_ULONGLONG, "start of the map"), + member_def(perf_record_mmap2, len, T_ULONGLONG, "map length"), + member_def(perf_record_mmap2, pgoff, T_ULONGLONG, "page offset"), + member_def(perf_record_mmap2, prot, T_UINT, "protection"), + member_def(perf_record_mmap2, flags, T_UINT, "flags"), + member_def(perf_record_mmap2, filename, T_STRING_INPLACE, "backing store"), + { .name = NULL, }, +}; + +static PyObject *pyrf_mmap2_event__repr(const struct pyrf_event *pevent) +{ + PyObject *ret; + char *s; + + if (asprintf(&s, "{ type: mmap2, pid: %u, tid: %u, start: %#" PRI_lx64 ", " + "length: %#" PRI_lx64 ", offset: %#" PRI_lx64 ", " + "flags: %#x, prot: %#x, filename: %s }", + pevent->event.mmap2.pid, pevent->event.mmap2.tid, + pevent->event.mmap2.start, pevent->event.mmap2.len, + pevent->event.mmap2.pgoff, pevent->event.mmap2.flags, + pevent->event.mmap2.prot, pevent->event.mmap2.filename) < 0) + return PyErr_NoMemory(); + + ret = PyUnicode_FromString(s); + free(s); + return ret; +} + +static PyTypeObject pyrf_mmap2_event__type = { + PyVarObject_HEAD_INIT(NULL, 0) + .tp_name = "perf.mmap2_event", + .tp_basicsize = sizeof(struct pyrf_event), + .tp_dealloc = (destructor)pyrf_event__delete, + .tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_BASETYPE, + .tp_doc = pyrf_mmap2_event__doc, + .tp_members = pyrf_mmap2_event__members, + .tp_getset = pyrf_mmap2_event__getset, + .tp_repr = (reprfunc)pyrf_mmap2_event__repr, +}; + static const char pyrf_task_event__doc[] = PyDoc_STR("perf task (fork/exit) event object."); static PyMemberDef pyrf_task_event__members[] = { @@ -799,6 +942,9 @@ static int pyrf_event__setup_types(void) int err; err = PyType_Ready(&pyrf_mmap_event__type); + if (err < 0) + goto out; + err = PyType_Ready(&pyrf_mmap2_event__type); if (err < 0) goto out; err = PyType_Ready(&pyrf_lost_event__type); @@ -828,6 +974,7 @@ static int pyrf_event__setup_types(void) static PyTypeObject *pyrf_event__type[] = { [PERF_RECORD_MMAP] = &pyrf_mmap_event__type, + [PERF_RECORD_MMAP2] = &pyrf_mmap2_event__type, [PERF_RECORD_LOST] = &pyrf_lost_event__type, [PERF_RECORD_COMM] = &pyrf_comm_event__type, [PERF_RECORD_EXIT] = &pyrf_task_event__type, @@ -876,6 +1023,12 @@ static PyObject *pyrf_event__new(const union perf_event *event, struct evsel *ev offsetof(struct perf_record_mmap, filename); pevent->event.mmap.filename[max_len - 1] = '\0'; + } else if (event->header.type == PERF_RECORD_MMAP2) { + /* Ensure '\0' string termination. */ + size_t max_len = copy_size - + offsetof(struct perf_record_mmap2, filename); + + pevent->event.mmap2.filename[max_len - 1] = '\0'; } else if (event->header.type == PERF_RECORD_COMM) { /* Ensure '\0' string termination. */ size_t max_len = copy_size - @@ -3317,6 +3470,9 @@ PyMODINIT_FUNC PyInit_perf(void) Py_INCREF(&pyrf_mmap_event__type); PyModule_AddObject(module, "mmap_event", (PyObject *)&pyrf_mmap_event__type); + Py_INCREF(&pyrf_mmap2_event__type); + PyModule_AddObject(module, "mmap2_event", (PyObject *)&pyrf_mmap2_event__type); + Py_INCREF(&pyrf_lost_event__type); PyModule_AddObject(module, "lost_event", (PyObject *)&pyrf_lost_event__type); -- 2.54.0.1136.gdb2ca164c4-goog