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 EFED430C142 for ; Tue, 16 Jun 2026 01:16:16 +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=1781572578; cv=none; b=GbUolZmCN3Ph+687RFYMitgxJXnZNLI+YBJVcsly9JiJRjY7vFul35ZWzIuxUSsd3AqpUEHs6igtv7jkK1EEYMmR/VF56mRExeQGD4NhOtTKG+x7SsQuUPYel2RGK6ZMF0cyiuzqySyHHXbF2m54STVDd6Mo0mmwFh+YrkSexsI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781572578; c=relaxed/simple; bh=qR3mvXk3qSGjHGbvlt2YcCG/2EMoKTURFKP+0Zyxamo=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=DwcyJUK5cfKQLQCU0NVlJ1V3tqV1dpi6ouD9YFkzHX4+KO22Lyw7WMxMZcvnMIv/X87pgbKnGpGIVxa5j69RFaY0nidd9GKbIqLNEtaPy/Eb/aHhwkH6sM3uti2ZS95olpPQV+1CXka7ZaHesFL6HBm9ymnzBXuD3q/WQhrsTCE= 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=pGA7qXsZ; 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="pGA7qXsZ" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-308004a2c49so459572eec.0 for ; Mon, 15 Jun 2026 18:16:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1781572576; x=1782177376; 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=advUMW+iZYV5O6gSB3jB78g5h5sVE6dkq2pCREP75fA=; b=pGA7qXsZNtNXlztSM8QHOxy9zWk7OUSb09mtNfKdBW7pfS52nCSZHuWACjpqdSgOuf r21qcDvhzMfxOVuXvW+sXj3Doz3OWAAtD/mZUUAHa3YkIiaNIoM4FotHu8VPUofLvDp0 WdukhI8E5aVAivb+HNuNWAgQjcQCIkMTZRuJZEkMEs66w51p6kBbQ3x33JalUAoU8+ax fhCJkhyVIETW3C8vMsnTlWgVgWbf3i/QqukfWK2op32/tS21SfXhM3yUL5QcHTciP5E0 EP6k8HjKJyI5YxBVRXV4T12y5oEOF2At6ZSrAp5IqDj4xEVgUfMKpCmBCnkZlPnnSZsx YzVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781572576; x=1782177376; 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=advUMW+iZYV5O6gSB3jB78g5h5sVE6dkq2pCREP75fA=; b=Yyu8NbimhRL0M1KTlCkQ4E09ejfcet/dQ05FixT0PKMjWXu1fWmRtw4kLFQyWc/Ib8 ZkBxgMALmtBn4bCM5BFxVxANw3ZPaOxh54OKuKeklSREnkMFRHm36js9eYYE52NXxeaQ yN0xxvyfeu+BQMLDp8Kvu4AQEfI7mQw5P+YomZpzBNpljpJLkiQWGoCDv7GvB19eeuc+ aD+CMxbRGBT9Lz48V6BCZIJ1C2jNQiI1z6RWqBrLJea6jpMBzUvnhnET2kgj1l+SyUWW 0cyvE290nVtxFHyjoIKCPKc6jqybwuan97kx2OrUNKcYsQCVU745KwzyfovSerImvPRG cEBw== X-Forwarded-Encrypted: i=1; AFNElJ+F7zMqbOhbS0XSsc+4LT1SvBJoNJSMflRyAzcnAQ0J/0GRQe+/XL4WJkp5L5RAXhZvH8GfJs9D4yAFDIc=@vger.kernel.org X-Gm-Message-State: AOJu0YxsWUhSVdSFWgWInvq/Ssugct55h0f2GAmCAwkVoVhxzIgmaMlM qzvAufYxvo+fO79vezlePSqhIe4YWSJfh2TgaGpnkxMQEQivTQbBKk7u7uudaKBes0S3ApAJMOa a688e0HFfZA== X-Received: from dykh40.prod.google.com ([2002:a05:7300:5728:b0:2df:46bf:2390]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:1805:b0:2ea:ed3e:13b7 with SMTP id 5a478bee46e88-30ba591286fmr1113513eec.7.1781572575882; Mon, 15 Jun 2026 18:16:15 -0700 (PDT) Date: Mon, 15 Jun 2026 18:15:34 -0700 In-Reply-To: <20260616011543.4037138-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: <20260615223011.3873955-1-irogers@google.com> <20260616011543.4037138-1-irogers@google.com> X-Mailer: git-send-email 2.54.0.1136.gdb2ca164c4-goog Message-ID: <20260616011543.4037138-13-irogers@google.com> Subject: [PATCH v21 12/21] perf python: Add mmap2 event From: Ian Rogers To: irogers@google.com, acme@kernel.org, namhyung@kernel.org Cc: 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, 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 --- tools/perf/util/python.c | 153 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/python.c b/tools/perf/util/python.c index 72d297156ad0..1d27df207cc5 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,147 @@ 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[] = { @@ -801,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); @@ -830,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 +1021,9 @@ static PyObject *pyrf_event__new(const union perf_event *event, struct evsel *ev if (copy_size < sizeof(pevent->event)) memset((char *)&pevent->event + copy_size, 0, sizeof(pevent->event) - copy_size); + if (event->header.type == PERF_RECORD_MMAP2) + pevent->event.mmap2.filename[sizeof(pevent->event.mmap2.filename) - 1] = '\0'; + perf_sample__init(&pevent->sample, /*all=*/true); pevent->al_resolved = false; addr_location__init(&pevent->al); @@ -3330,6 +3478,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