* [PATCH v2 0/2] verification/rvgen: validate the monitor type
@ 2026-11-21 11:31 Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 2/2] verification/rvgen: Cover an invalid " Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 1/2] verification/rvgen: Validate the " Chaosheng Qu
0 siblings, 2 replies; 3+ messages in thread
From: Chaosheng Qu @ 2026-11-21 11:31 UTC (permalink / raw)
To: Steven Rostedt, Gabriele Monaco; +Cc: linux-trace-kernel, linux-kernel
rvgen takes the monitor type on the command line and pastes it into the
generated monitor as RV_MON_<TYPE>. Nothing validates it, so a typo
produces a monitor that cannot build while the tool still exits 0.
Monitor.monitor_types already holds the accepted set; pass it to
argparse as choices. Patch 2 covers the rejection next to the other
error tests.
v2:
- Thread the series; 2/2 replies to this cover letter.
- Tag both patches verification/rvgen: and capitalise the subject.
- Patch content unchanged.
Link: https://lore.kernel.org/linux-trace-kernel/179447882046.254241.15114935256138596418@gmail.com/
Link: https://lore.kernel.org/linux-trace-kernel/179447882047.254241.3226415982233977960@gmail.com/
Testing: make check in tools/verification/rvgen -- 31/31 pass.
Chaosheng Qu (2):
verification/rvgen: Validate the monitor type
verification/rvgen: Cover an invalid monitor type
tools/verification/rvgen/__main__.py | 1 +
tools/verification/rvgen/tests/rvgen_monitor.t | 4 ++++
2 files changed, 5 insertions(+)
--
2.43.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/2] verification/rvgen: Validate the monitor type
2026-11-21 11:31 [PATCH v2 0/2] verification/rvgen: validate the monitor type Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 2/2] verification/rvgen: Cover an invalid " Chaosheng Qu
@ 2026-11-21 11:31 ` Chaosheng Qu
1 sibling, 0 replies; 3+ messages in thread
From: Chaosheng Qu @ 2026-11-21 11:31 UTC (permalink / raw)
To: Steven Rostedt, Gabriele Monaco; +Cc: linux-trace-kernel, linux-kernel
The monitor type is pasted into the generated monitor as RV_MON_<TYPE>.
Nothing checks it, so a typo yields a monitor that cannot build and the
tool still exits 0:
$ rvgen monitor -c da -s test_da.dot -t bogus_type -n bm
$ grep RV_MON_TYPE bm/bm.c
#define RV_MON_TYPE RV_MON_BOGUS_TYPE
include/linux/rv.h defines only RV_MON_GLOBAL, RV_MON_PER_CPU,
RV_MON_PER_TASK and RV_MON_PER_OBJ, so that macro never resolves.
The accepted set is already in Monitor.monitor_types, which the help text
prints. Pass it to argparse as choices.
Signed-off-by: Chaosheng Qu <chaosheng.qu.linux@gmail.com>
---
tools/verification/rvgen/__main__.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/verification/rvgen/__main__.py b/tools/verification/rvgen/__main__.py
index 246b43fa2..6053db5e5 100644
--- a/tools/verification/rvgen/__main__.py
+++ b/tools/verification/rvgen/__main__.py
@@ -38,6 +38,7 @@ if __name__ == '__main__':
monitor_parser.add_argument('-s', "--spec", dest="spec", required=True,
help="Monitor specification file")
monitor_parser.add_argument('-t', "--monitor_type", dest="monitor_type", required=True,
+ choices=list(Monitor.monitor_types.keys()),
help=f"Available options: {', '.join(Monitor.monitor_types.keys())}")
container_parser = subparsers.add_parser("container", parents=[parent_parser])
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2 2/2] verification/rvgen: Cover an invalid monitor type
2026-11-21 11:31 [PATCH v2 0/2] verification/rvgen: validate the monitor type Chaosheng Qu
@ 2026-11-21 11:31 ` Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 1/2] verification/rvgen: Validate the " Chaosheng Qu
1 sibling, 0 replies; 3+ messages in thread
From: Chaosheng Qu @ 2026-11-21 11:31 UTC (permalink / raw)
To: Steven Rostedt, Gabriele Monaco; +Cc: linux-trace-kernel, linux-kernel
Add a rejection test next to the other ones, so the new check is
exercised. Without the check the command exits 0 and leaves a generated
tree behind, so the test fails on both the exit code and the message.
Signed-off-by: Chaosheng Qu <chaosheng.qu.linux@gmail.com>
---
tools/verification/rvgen/tests/rvgen_monitor.t | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/verification/rvgen/tests/rvgen_monitor.t b/tools/verification/rvgen/tests/rvgen_monitor.t
index 5f2562600..2a48a7b54 100644
--- a/tools/verification/rvgen/tests/rvgen_monitor.t
+++ b/tools/verification/rvgen/tests/rvgen_monitor.t
@@ -64,6 +64,10 @@ check "invalid monitor class" \
"$RVGEN monitor -c invalid -s tests/specs/test_da.dot -t per_cpu" 1 \
"Unknown monitor class" "Traceback (most recent call last)"
+check "invalid monitor type" \
+ "$RVGEN monitor -c da -s tests/specs/test_da.dot -t invalid" 2 \
+ "invalid choice: 'invalid'" "Traceback (most recent call last)"
+
check "missing dot file" \
"$RVGEN monitor -c da -s tests/specs/nonexistent.dot -t per_cpu" 1 \
"No such file or directory" "Traceback (most recent call last)"
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-11-21 11:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-21 11:31 [PATCH v2 0/2] verification/rvgen: validate the monitor type Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 2/2] verification/rvgen: Cover an invalid " Chaosheng Qu
2026-11-21 11:31 ` [PATCH v2 1/2] verification/rvgen: Validate the " Chaosheng Qu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox