Clean up & simplify
Subsystems (2)
v2 cover Clean up & simplify
Hi,
This series removes some redundant code and simply RV.
Changes in v2:
- drop the "nop" reactor removal patch
- clarify commit description of reference counter removal patch
Nam Cao (5):
rv: Remove unused field in struct rv_monitor_def
rv: Merge struct rv_monitor_def into struct rv_monitor
rv: Merge struct rv_reactor_def into struct rv_reactor
rv: Remove rv_reactor's reference counter
rv: Remove struct rv_monitor::reacting
include/linux/rv.h | 8 ++ kernel/trace/rv/rv.c | 210 +++++++++++++++------------------- kernel/trace/rv/rv.h | 39 +------ kernel/trace/rv/rv_reactors.c | 132 +++++++-------------- 4 files changed, 149 insertions(+), 240 deletions(-)
Signature · 1 line
2.39.5
PATCH v2 1/5 Remove unused field in struct rv_monitor_def
rv_monitor_def::task_monitor is not used. Delete it.
--- kernel/trace/rv/rv.h | 1 - 1 file changed, 1 deletion(-)
kernel/trace/rv/rv.h +0 -1
@@ -41,7 +41,6 @@ struct rv_monitor_def {struct rv_reactor_def *rdef;bool reacting;#endif -bool task_monitor; };struct dentry *get_monitors_root (void );
Signature · 1 line
2.39.5
PATCH v2 2/5 Merge struct rv_monitor_def into struct rv_monitor
In reply to Nam CaoEach struct rv_monitor has a unique struct rv_monitor_def associated with it. struct rv_monitor is statically allocated, while struct rv_monitor_def is dynamically allocated.
This makes the code more complicated than it should be:
- Lookup is required to get the associated rv_monitor_def from rv_monitor
- Dynamic memory allocation is required for rv_monitor_def. This is harder to get right compared to static memory. For instance, there is an existing mistake: rv_unregister_monitor() does not free the memory allocated by rv_register_monitor(). This is fortunately not a real memory leak problem, as rv_unregister_monitor() is never called.
Simplify and merge rv_monitor_def into rv_monitor.
--- include/linux/rv.h | 8 ++ kernel/trace/rv/rv.c | 211 +++++++++++++++------------------- kernel/trace/rv/rv.h | 27 ++--- kernel/trace/rv/rv_reactors.c | 62 +++++----- 4 files changed, 140 insertions(+), 168 deletions(-)
include/linux/rv.h +8 -0
@@ -7,6 +7,9 @@#ifndef _LINUX_RV_H#define _LINUX_RV_H +#include <linux/types.h> +#include <linux/list.h> +#define MAX_DA_NAME_LEN 32#ifdef CONFIG_RV
@@ -98,8 +101,13 @@ struct rv_monitor {void (*disable)(void );void (*reset)(void );#ifdef CONFIG_RV_REACTORS +struct rv_reactor_def *rdef; __printf(1, 2) void (*react)(const char *msg, ...); +bool reacting;#endif +struct list_head list; +struct rv_monitor *parent; +struct dentry *root_d; };bool rv_monitoring_on (void );
kernel/trace/rv/rv.c +93 -118
476 lines not on this page · raw message
kernel/trace/rv/rv.h +8 -19
@@ -32,34 +32,23 @@ struct rv_reactor_def { };#endif -struct rv_monitor_def { -struct list_head list; -struct rv_monitor *monitor; -struct rv_monitor *parent; -struct dentry *root_d; -#ifdef CONFIG_RV_REACTORS -struct rv_reactor_def *rdef; -bool reacting; -#endif -}; -struct dentry *get_monitors_root (void ); -int rv_disable_monitor (struct rv_monitor_def *mdef); -int rv_enable_monitor (struct rv_monitor_def *mdef); -bool rv_is_container_monitor (struct rv_monitor_def *mdef); -bool rv_is_nested_monitor (struct rv_monitor_def *mdef); +int rv_disable_monitor (struct rv_monitor *mon); +int rv_enable_monitor (struct rv_monitor *mon); +bool rv_is_container_monitor (struct rv_monitor *mon); +bool rv_is_nested_monitor (struct rv_monitor *mon);#ifdef CONFIG_RV_REACTORS -int reactor_populate_monitor (struct rv_monitor_def *mdef); -void reactor_cleanup_monitor (struct rv_monitor_def *mdef); +int reactor_populate_monitor (struct rv_monitor *mon); +void reactor_cleanup_monitor (struct rv_monitor *mon);int init_rv_reactors (struct dentry *root_dir);#else -static inline int reactor_populate_monitor (struct rv_monitor_def *mdef) +static inline int reactor_populate_monitor (struct rv_monitor *mon) {return 0 ; } -static inline void reactor_cleanup_monitor (struct rv_monitor_def *mdef) +static inline void reactor_cleanup_monitor (struct rv_monitor *mon) {return ; }
kernel/trace/rv/rv_reactors.c +31 -31
161 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH v2 3/5 Merge struct rv_reactor_def into struct rv_reactor
In reply to Nam CaoEach struct rv_reactor has a unique struct rv_reactor_def associated with it. struct rv_reactor is statically allocated, while struct rv_reactor_def is dynamically allocated.
This makes the code more complicated than it should be:
- Lookup is required to get the associated rv_reactor_def from rv_reactor
- Dynamic memory allocation is required for rv_reactor_def. This is harder to get right compared to static memory. For instance, there is an existing mistake: rv_unregister_reactor() does not free the memory allocated by rv_register_reactor(). This is fortunately not a real memory leak problem as rv_unregister_reactor() is never called.
Simplify and merge rv_reactor_def into rv_reactor.
--- include/linux/rv.h | 5 +- kernel/trace/rv/rv.h | 9 ---- kernel/trace/rv/rv_reactors.c | 92 +++++++++++++++-------------------- 3 files changed, 43 insertions(+), 63 deletions(-)
include/linux/rv.h +4 -1
@@ -90,6 +90,9 @@ struct rv_reactor {const char *name;const char *description; __printf(1, 2) void (*react)(const char *msg, ...); +struct list_head list; +/* protected by the monitor interface lock */ + int counter; };#endif
@@ -101,7 +104,7 @@ struct rv_monitor {void (*disable)(void );void (*reset)(void );#ifdef CONFIG_RV_REACTORS -struct rv_reactor_def *rdef; +struct rv_reactor *reactor; __printf(1, 2) void (*react)(const char *msg, ...);bool reacting;#endif
kernel/trace/rv/rv.h +0 -9
@@ -23,15 +23,6 @@ struct rv_interface {extern struct mutex rv_interface_lock;extern struct list_head rv_monitors_list; -#ifdef CONFIG_RV_REACTORS -struct rv_reactor_def { -struct list_head list; -struct rv_reactor *reactor; -/* protected by the monitor interface lock */ -int counter; -}; -#endif -struct dentry *get_monitors_root (void );int rv_disable_monitor (struct rv_monitor *mon);int rv_enable_monitor (struct rv_monitor *mon);
kernel/trace/rv/rv_reactors.c +39 -53
206 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH v2 4/5 Remove rv_reactor's reference counter
In reply to Nam Caorv_reactor has a reference counter to ensure it is not removed while monitors are still using it.
However, this is futile, as __exit functions are not expected to fail and will proceed normally despite rv_unregister_reactor() returning an error.
At the moment, reactors do not support being built as modules, therefore they are never removed and the reference counters are not necessary.
If we support building RV reactors as modules in the future, kernel module's centralized facilities such as try_module_get(), module_put() or MODULE_SOFTDEP should be used instead of this custom implementation.
Remove this reference counter.
--- include/linux/rv.h | 2 -- kernel/trace/rv/rv.c | 1 - kernel/trace/rv/rv.h | 6 ------ kernel/trace/rv/rv_reactors.c | 33 ++------------------------------- 4 files changed, 2 insertions(+), 40 deletions(-)
include/linux/rv.h +0 -2
@@ -91,8 +91,6 @@ struct rv_reactor {const char *description; __printf(1, 2) void (*react)(const char *msg, ...); struct list_head list; -/* protected by the monitor interface lock */ - int counter; };#endif
kernel/trace/rv/rv.c +0 -1
@@ -769,7 +769,6 @@ static const struct file_operations monitoring_on_fops = {static void destroy_monitor_dir (struct rv_monitor *mon) { -reactor_cleanup_monitor (mon);rv_remove (mon->root_d); }
kernel/trace/rv/rv.h +0 -6
@@ -31,7 +31,6 @@ bool rv_is_nested_monitor(struct rv_monitor *mon);#ifdef CONFIG_RV_REACTORS int reactor_populate_monitor (struct rv_monitor *mon); -void reactor_cleanup_monitor (struct rv_monitor *mon);int init_rv_reactors (struct dentry *root_dir);#else static inline int reactor_populate_monitor (struct rv_monitor *mon)
@@ -39,11 +38,6 @@ static inline int reactor_populate_monitor(struct rv_monitor *mon)return 0 ; } -static inline void reactor_cleanup_monitor (struct rv_monitor *mon) -{ -return ; -} -static inline int init_rv_reactors (struct dentry *root_dir) {return 0 ;
kernel/trace/rv/rv_reactors.c +2 -31
@@ -172,10 +172,6 @@ static void monitor_swap_reactors_single(struct rv_monitor *mon,if (monitor_enabled)rv_disable_monitor (mon); -/* swap reactor's usage */ - mon->reactor->counter--; - reactor->counter++; - mon->reactor = reactor; mon->reacting = reacting; mon->react = reactor->react;
@@ -343,23 +339,10 @@ int rv_register_reactor(struct rv_reactor *reactor)*/ int rv_unregister_reactor (struct rv_reactor *reactor) { -int ret =0 ; -mutex_lock (&rv_interface_lock); - -if (!reactor->counter) { -list_del (&reactor->list); - }else { -printk (KERN_WARNING -"rv: the rv_reactor %s is in use by %d monitor(s)\n" , - reactor->name, reactor->counter); -printk (KERN_WARNING "rv: the rv_reactor %s cannot be removed\n" , - reactor->name); - ret = -EBUSY ; - } - +list_del (&reactor->list);mutex_unlock (&rv_interface_lock); -return ret; +return 0 ; }/*
@@ -456,23 +439,11 @@ int reactor_populate_monitor(struct rv_monitor *mon)* Configure as the rv_nop reactor. */ mon->reactor =get_reactor_rdef_by_name ("nop" ); - mon->reactor->counter++; mon->reacting = false;return 0 ; } -/** -* reactor_cleanup_monitor - cleanup a monitor reference -* @mon: the monitor. -*/ -void reactor_cleanup_monitor (struct rv_monitor *mon) -{ -lockdep_assert_held (&rv_interface_lock); - mon->reactor->counter--; -WARN_ON_ONCE (mon->reactor->counter <0 ); -} -/* * Nop reactor register */
Signature · 1 line
2.39.5
PATCH v2 5/5 Remove struct rv_monitor::reacting
In reply to Nam CaoThe field 'reacting' in struct rv_monitor is set but never used. Delete it.
--- include/linux/rv.h | 1 - kernel/trace/rv/rv_reactors.c | 13 +++++-------- 2 files changed, 5 insertions(+), 9 deletions(-)
include/linux/rv.h +0 -1
@@ -104,7 +104,6 @@ struct rv_monitor {#ifdef CONFIG_RV_REACTORS struct rv_reactor *reactor; __printf(1, 2) void (*react)(const char *msg, ...); -bool reacting;#endif struct list_head list;struct rv_monitor *parent;
kernel/trace/rv/rv_reactors.c +5 -8
@@ -160,7 +160,7 @@ static const struct seq_operations monitor_reactors_seq_ops = {static void monitor_swap_reactors_single (struct rv_monitor *mon,struct rv_reactor *reactor, -bool reacting,bool nested) +bool nested) {bool monitor_enabled;
@@ -173,7 +173,6 @@ static void monitor_swap_reactors_single(struct rv_monitor *mon,rv_disable_monitor (mon); mon->reactor = reactor; - mon->reacting = reacting; mon->react = reactor->react;/* enable only once if iterating through a container */
@@ -181,8 +180,7 @@ static void monitor_swap_reactors_single(struct rv_monitor *mon,rv_enable_monitor (mon); } -static void monitor_swap_reactors (struct rv_monitor *mon, -struct rv_reactor *reactor,bool reacting) +static void monitor_swap_reactors (struct rv_monitor *mon,struct rv_reactor *reactor) {struct rv_monitor *p = mon;
@@ -190,7 +188,7 @@ static void monitor_swap_reactors(struct rv_monitor *mon,list_for_each_entry_continue (p, &rv_monitors_list, list) {if (p->parent != mon)break ; -monitor_swap_reactors_single (p, reactor, reacting, true); +monitor_swap_reactors_single (p, reactor, true); }/* * This call enables and disables the monitor if they were active.
@@ -198,7 +196,7 @@ static void monitor_swap_reactors(struct rv_monitor *mon,* All nested monitors are enabled also if they were off, we may refine * this logic in the future. */ -monitor_swap_reactors_single (mon, reactor, reacting, false); +monitor_swap_reactors_single (mon, reactor, false); } static ssize_t
@@ -248,7 +246,7 @@ monitor_reactors_write(struct file *file, const char __user *user_buf,else enable = true; -monitor_swap_reactors (mon, reactor, enable); +monitor_swap_reactors (mon, reactor); retval = count;break ;
@@ -439,7 +437,6 @@ int reactor_populate_monitor(struct rv_monitor *mon)* Configure as the rv_nop reactor. */ mon->reactor =get_reactor_rdef_by_name ("nop" ); - mon->reacting = false;return 0 ; }
Signature · 1 line
2.39.5
kernel test robot
build botRe: [PATCH v2 5/5] rv: Remove struct rv_monitor::reacting
kernel test robot noticed the following build warnings:
Hi Nam,
kernel test robot noticed the following build warnings:
[auto build test WARNING on trace/for-next]
[also build test WARNING on next-20250723]
[cannot apply to linus/master v6.16-rc7]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Nam-Cao/rv-Remove-unused-field-in-struct-rv_monitor_def/20250723-144825 base: https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace for-next patch link: https://lore.kernel.org/r/58c63faec76ffb36552fcd1fdcc4b9dd841efd94.1753252872.git.namcao%40linutronix.de patch subject: [PATCH v2 5/5] rv: Remove struct rv_monitor::reacting config: arc-randconfig-002-20250724 (https://download.01.org/0day-ci/archive/20250724/[email protected]/config) compiler: arc-linux-gcc (GCC) 15.1.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250724/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
kernel/trace/rv/rv_reactors.c: In function 'monitor_reactors_write':
>> kernel/trace/rv/rv_reactors.c:211:14: warning: variable 'enable' set but not used [-Wunused-but-set-variable]
211 | bool enable;
| ^~~~~~vim +/enable +211 kernel/trace/rv/rv_reactors.c
cb85c660fcd4b3a Gabriele Monaco 2025-03-05 201
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 202 static ssize_t
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 203 monitor_reactors_write(struct file *file, const char __user *user_buf,
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 204 size_t count, loff_t *ppos)
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 205 {
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 206 char buff[MAX_RV_REACTOR_NAME_SIZE + 2];
98b2531fbe93031 Nam Cao 2025-07-23 207 struct rv_monitor *mon;
aef8790cfb7b07f Nam Cao 2025-07-23 208 struct rv_reactor *reactor;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 209 struct seq_file *seq_f;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 210 int retval = -EINVAL;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 @211 bool enable;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 212 char *ptr;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 213 int len;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 214
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 215 if (count < 1 || count > MAX_RV_REACTOR_NAME_SIZE + 1)
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 216 return -EINVAL;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 217
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 218 memset(buff, 0, sizeof(buff));
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 219
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 220 retval = simple_write_to_buffer(buff, sizeof(buff) - 1, ppos, user_buf, count);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 221 if (retval < 0)
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 222 return -EFAULT;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 223
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 224 ptr = strim(buff);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 225
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 226 len = strlen(ptr);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 227 if (!len)
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 228 return count;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 229
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 230 /*
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 231 * See monitor_reactors_open()
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 232 */
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 233 seq_f = file->private_data;
98b2531fbe93031 Nam Cao 2025-07-23 234 mon = seq_f->private;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 235
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 236 mutex_lock(&rv_interface_lock);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 237
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 238 retval = -EINVAL;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 239
aef8790cfb7b07f Nam Cao 2025-07-23 240 list_for_each_entry(reactor, &rv_reactors_list, list) {
aef8790cfb7b07f Nam Cao 2025-07-23 241 if (strcmp(ptr, reactor->name) != 0)
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 242 continue;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 243
aef8790cfb7b07f Nam Cao 2025-07-23 244 if (strcmp(reactor->name, "nop"))
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 245 enable = false;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 246 else
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 247 enable = true;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 248
a96356e99938184 Nam Cao 2025-07-23 249 monitor_swap_reactors(mon, reactor);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 250
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 251 retval = count;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 252 break;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 253 }
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 254
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 255 mutex_unlock(&rv_interface_lock);
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 256
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 257 return retval;
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 258 }
04acadcb4453cf8 Daniel Bristot de Oliveira 2022-07-29 259 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki