From: Omokefe Emmanuel Onanaroghene <emmaonana18@gmail.com>
To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: corbet@lwn.net, skhan@linuxfoundation.org, rdunlap@infradead.org,
mchehab@kernel.org, paulmck@kernel.org, linusw@kernel.org,
Julia.Lawall@inria.fr, emmaonana18@gmail.com,
rmk+kernel@armlinux.org.uk
Subject: [PATCH v2] docs: kdoc: handle TRACE_EVENT_FN() family in tracepoint parser
Date: Wed, 14 Oct 2026 23:31:34 +0100 [thread overview]
Message-ID: <20261014223134.14772-1-emmaonana18@gmail.com> (raw)
kernel-doc fails to parse tracepoint declarations that use
TRACE_EVENT_FN(), e.g. gpu_power_status:
drivers/gpu/drm/panthor/panthor_trace.h:28 ... Unrecognized
tracepoint format ...
... expecting prototype for gpu_power_status(). Prototype was for
TRACE_EVENT_FN() instead
tracepoint_munge() only matches TRACE_EVENT(), so the macro name is
kept as the prototype and the TP_PROTO() arguments leak into the
parameter list as garbage.
Match TRACE_EVENT_FN(), TRACE_EVENT_FN_COND(),
TRACE_EVENT_CONDITION() and TRACE_EVENT_SYSCALL() the same way as
TRACE_EVENT() and list them explicitly at the call site in
process_proto_function().
Add a regression test for the gpu_power_status declaration.
Signed-off-by: Omokefe Emmanuel Onanaroghene <emmaonana18@gmail.com>
---
tools/lib/python/kdoc/kdoc_parser.py | 18 +++++++++++++++++-
tools/unittests/test_kdoc_parser.py | 28 ++++++++++++++++++++++++++++
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/tools/lib/python/kdoc/kdoc_parser.py b/tools/lib/python/kdoc/kdoc_parser.py
index 80d4245acd17..a65bda3e81b9 100644
--- a/tools/lib/python/kdoc/kdoc_parser.py
+++ b/tools/lib/python/kdoc/kdoc_parser.py
@@ -1545,6 +1545,22 @@ class KernelDoc:
if r.search(proto):
tracepointname = r.group(1)
+ r = KernRe(r'TRACE_EVENT_FN\((.*?),')
+ if r.search(proto):
+ tracepointname = r.group(1)
+
+ r = KernRe(r'TRACE_EVENT_FN_COND\((.*?),')
+ if r.search(proto):
+ tracepointname = r.group(1)
+
+ r = KernRe(r'TRACE_EVENT_CONDITION\((.*?),')
+ if r.search(proto):
+ tracepointname = r.group(1)
+
+ r = KernRe(r'TRACE_EVENT_SYSCALL\((.*?),')
+ if r.search(proto):
+ tracepointname = r.group(1)
+
r = KernRe(r'DEFINE_SINGLE_EVENT\((.*?),')
if r.search(proto):
tracepointname = r.group(1)
@@ -1604,7 +1620,7 @@ class KernelDoc:
self.entry.prototype = self.syscall_munge(ln,
self.entry.prototype)
else:
- r = KernRe(r'TRACE_EVENT|DEFINE_EVENT|DEFINE_SINGLE_EVENT')
+ r = KernRe(r'TRACE_EVENT|TRACE_EVENT_FN|TRACE_EVENT_FN_COND|TRACE_EVENT_CONDITION|TRACE_EVENT_SYSCALL|DEFINE_EVENT|DEFINE_SINGLE_EVENT')
if r.search(self.entry.prototype):
self.entry.prototype = self.tracepoint_munge(ln,
self.entry.prototype)
diff --git a/tools/unittests/test_kdoc_parser.py b/tools/unittests/test_kdoc_parser.py
index 4baa78ca02b3..04dafae412e4 100755
--- a/tools/unittests/test_kdoc_parser.py
+++ b/tools/unittests/test_kdoc_parser.py
@@ -444,6 +444,34 @@ class TestContextLockStruct(GenerateKdocItem):
self.assertEqual(entries[0].name, "debugfs_cancellation")
self.assertEqual(entries[0].warnings, [])
+class TestTraceEventFn(GenerateKdocItem):
+ def test_trace_event_fn_declaration(self):
+ source = """
+ /**
+ * gpu_power_status - called when hardware turns on or off
+ * @dev: pointer to device
+ * @shader_bitmap: bitmap
+ */
+ TRACE_EVENT_FN(gpu_power_status,
+ TP_PROTO(const struct device *dev, u64 shader_bitmap),
+ TP_ARGS(dev, shader_bitmap),
+ TP_STRUCT__entry(__field(u64, shader_bitmap)),
+ TP_fast_assign(__entry->shader_bitmap = shader_bitmap;),
+ TP_printk("%s", __get_str(dev_name)),
+ my_register, my_unregister
+ );
+ """
+
+ kernel_doc = KernelDoc(self.config, "test.c", self.xforms)
+ patcher = patch('builtins.open', new_callable=mock_open,
+ read_data=dedent(source))
+ with patcher:
+ _, entries = kernel_doc.parse_kdoc()
+
+ self.assertEqual(len(entries), 1)
+ self.assertEqual(entries[0].name, "trace_gpu_power_status")
+ self.assertEqual(entries[0].warnings, [])
+
#
# Class and logic to create dynamic tests from YAML
#
--
2.43.0
reply other threads:[~2026-10-14 22:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261014223134.14772-1-emmaonana18@gmail.com \
--to=emmaonana18@gmail.com \
--cc=Julia.Lawall@inria.fr \
--cc=corbet@lwn.net \
--cc=linusw@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=paulmck@kernel.org \
--cc=rdunlap@infradead.org \
--cc=rmk+kernel@armlinux.org.uk \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®