[PATCH] docs: kdoc: handle TRACE_EVENT_FN() family in tracepoint parser
From: Omokefe Emmanuel Onanaroghene
Date: Thu Oct 01 2026 - 22:35:15 EST
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@xxxxxxxxx>
---
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 d9ad1ddc87dd..28c325665c17 100644
--- a/tools/lib/python/kdoc/kdoc_parser.py
+++ b/tools/lib/python/kdoc/kdoc_parser.py
@@ -1542,6 +1542,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)
@@ -1601,7 +1617,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 c4a76ed13dbc..398e11a8737e 100755
--- a/tools/unittests/test_kdoc_parser.py
+++ b/tools/unittests/test_kdoc_parser.py
@@ -418,6 +418,34 @@ class TestSelfValidate(GenerateKdocItem):
"""
self.run_test(self.SOURCE, [self.DEFAULT.copy()], self.EXPORTS)
+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