Merge: Update userspace / kernel rv to latest upstream kernel

MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/3367

Update userspace / kernel rv to latest upstream kernel

JIRA: https://issues.redhat.com/browse/RHEL-10080

Commit List:
73e053c rv: Remove redundant assignment to variable retval
2fd5ed8 rv/reactor: remove MODULE_LICENSE in non-modules
ae3edea rv: remove redundant initialization of pointer ptr
bfa87ac rv/monitors: Move monitor structure in rodata

Signed-off-by: John Kacur <[email protected]>

Approved-by: Phil Auld <[email protected]>
Approved-by: John B. Wyatt IV <[email protected]>

Signed-off-by: Jan Stancek <[email protected]>

Author: jstancek

kernel/trace/rv/monitors/wip/wip.h

@@ -27,7 +27,7 @@ struct automaton_wip {
 	bool final_states[state_max_wip];
 };
 
-static struct automaton_wip automaton_wip = {
+static const struct automaton_wip automaton_wip = {
 	.state_names = {
 		"preemptive",
 		"non_preemptive"

kernel/trace/rv/monitors/wwnr/wwnr.h

@@ -27,7 +27,7 @@ struct automaton_wwnr {
 	bool final_states[state_max_wwnr];
 };
 
-static struct automaton_wwnr automaton_wwnr = {
+static const struct automaton_wwnr automaton_wwnr = {
 	.state_names = {
 		"not_running",
 		"running"

kernel/trace/rv/reactor_panic.c

@@ -38,6 +38,5 @@ static void __exit unregister_react_panic(void)
 module_init(register_react_panic);
 module_exit(unregister_react_panic);
 
-MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Daniel Bristot de Oliveira");
 MODULE_DESCRIPTION("panic rv reactor: panic if an exception is found.");

kernel/trace/rv/reactor_printk.c

@@ -41,6 +41,5 @@ static void __exit unregister_react_printk(void)
 module_init(register_react_printk);
 module_exit(unregister_react_printk);
 
-MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Daniel Bristot de Oliveira");
 MODULE_DESCRIPTION("printk rv reactor: printk if an exception is hit.");

kernel/trace/rv/rv.c

@@ -290,8 +290,6 @@ static ssize_t monitor_enable_write_data(struct file *filp, const char __user *u
 	if (retval)
 		return retval;
 
-	retval = count;
-
 	mutex_lock(&rv_interface_lock);
 
 	if (val)
@@ -516,7 +514,7 @@ static ssize_t enabled_monitors_write(struct file *filp, const char __user *user
 	struct rv_monitor_def *mdef;
 	int retval = -EINVAL;
 	bool enable = true;
-	char *ptr = buff;
+	char *ptr;
 	int len;
 
 	if (count < 1 || count > MAX_RV_MONITOR_NAME_SIZE + 1)

tools/verification/dot2/dot2c.py

@@ -111,7 +111,7 @@ def format_automaton_definition(self):
 
     def format_aut_init_header(self):
         buff = []
-        buff.append("static struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def))
+        buff.append("static const struct %s %s = {" % (self.struct_automaton_def, self.var_automaton_def))
         return buff
 
     def __get_string_vector_per_line_content(self, buff):