Skip to content

Commit 58d5f0d

Browse files
glemcorostedt
authored andcommitted
rv: Return init error when registering monitors
Monitors generated with dot2k have their registration function (the one called during monitor initialisation) return always 0, even if the registration failed on RV side. This can hide potential errors. Return the value returned by the RV register function. Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Tomas Glozar <tglozar@redhat.com> Cc: Juri Lelli <jlelli@redhat.com> Cc: Clark Williams <williams@redhat.com> Cc: John Kacur <jkacur@redhat.com> Link: https://lore.kernel.org/20250723161240.194860-6-gmonaco@redhat.com Reviewed-by: Nam Cao <namcao@linutronix.de> Signed-off-by: Gabriele Monaco <gmonaco@redhat.com> Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
1 parent 560473f commit 58d5f0d

File tree

11 files changed

+11
-22
lines changed

11 files changed

+11
-22
lines changed

kernel/trace/rv/monitors/sched/sched.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ struct rv_monitor rv_sched = {
2121

2222
static int __init register_sched(void)
2323
{
24-
rv_register_monitor(&rv_sched, NULL);
25-
return 0;
24+
return rv_register_monitor(&rv_sched, NULL);
2625
}
2726

2827
static void __exit unregister_sched(void)

kernel/trace/rv/monitors/sco/sco.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ static struct rv_monitor rv_sco = {
7171

7272
static int __init register_sco(void)
7373
{
74-
rv_register_monitor(&rv_sco, &rv_sched);
75-
return 0;
74+
return rv_register_monitor(&rv_sco, &rv_sched);
7675
}
7776

7877
static void __exit unregister_sco(void)

kernel/trace/rv/monitors/scpd/scpd.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ static struct rv_monitor rv_scpd = {
7979

8080
static int __init register_scpd(void)
8181
{
82-
rv_register_monitor(&rv_scpd, &rv_sched);
83-
return 0;
82+
return rv_register_monitor(&rv_scpd, &rv_sched);
8483
}
8584

8685
static void __exit unregister_scpd(void)

kernel/trace/rv/monitors/sncid/sncid.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ static struct rv_monitor rv_sncid = {
7979

8080
static int __init register_sncid(void)
8181
{
82-
rv_register_monitor(&rv_sncid, &rv_sched);
83-
return 0;
82+
return rv_register_monitor(&rv_sncid, &rv_sched);
8483
}
8584

8685
static void __exit unregister_sncid(void)

kernel/trace/rv/monitors/snep/snep.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ static struct rv_monitor rv_snep = {
7979

8080
static int __init register_snep(void)
8181
{
82-
rv_register_monitor(&rv_snep, &rv_sched);
83-
return 0;
82+
return rv_register_monitor(&rv_snep, &rv_sched);
8483
}
8584

8685
static void __exit unregister_snep(void)

kernel/trace/rv/monitors/snroc/snroc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,7 @@ static struct rv_monitor rv_snroc = {
6868

6969
static int __init register_snroc(void)
7070
{
71-
rv_register_monitor(&rv_snroc, &rv_sched);
72-
return 0;
71+
return rv_register_monitor(&rv_snroc, &rv_sched);
7372
}
7473

7574
static void __exit unregister_snroc(void)

kernel/trace/rv/monitors/tss/tss.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ static struct rv_monitor rv_tss = {
7474

7575
static int __init register_tss(void)
7676
{
77-
rv_register_monitor(&rv_tss, &rv_sched);
78-
return 0;
77+
return rv_register_monitor(&rv_tss, &rv_sched);
7978
}
8079

8180
static void __exit unregister_tss(void)

kernel/trace/rv/monitors/wip/wip.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,7 @@ static struct rv_monitor rv_wip = {
7171

7272
static int __init register_wip(void)
7373
{
74-
rv_register_monitor(&rv_wip, NULL);
75-
return 0;
74+
return rv_register_monitor(&rv_wip, NULL);
7675
}
7776

7877
static void __exit unregister_wip(void)

kernel/trace/rv/monitors/wwnr/wwnr.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ static struct rv_monitor rv_wwnr = {
7070

7171
static int __init register_wwnr(void)
7272
{
73-
rv_register_monitor(&rv_wwnr, NULL);
74-
return 0;
73+
return rv_register_monitor(&rv_wwnr, NULL);
7574
}
7675

7776
static void __exit unregister_wwnr(void)

tools/verification/rvgen/rvgen/templates/container/main.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ struct rv_monitor rv_%%MODEL_NAME%% = {
2121

2222
static int __init register_%%MODEL_NAME%%(void)
2323
{
24-
rv_register_monitor(&rv_%%MODEL_NAME%%, NULL);
25-
return 0;
24+
return rv_register_monitor(&rv_%%MODEL_NAME%%, NULL);
2625
}
2726

2827
static void __exit unregister_%%MODEL_NAME%%(void)

0 commit comments

Comments
 (0)