]> www.infradead.org Git - users/hch/misc.git/commitdiff
jump_label: Use RCU in all users of __module_address().
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Wed, 8 Jan 2025 09:04:52 +0000 (10:04 +0100)
committerPetr Pavlu <petr.pavlu@suse.com>
Mon, 10 Mar 2025 10:54:46 +0000 (11:54 +0100)
__module_address() can be invoked within a RCU section, there is no
requirement to have preemption disabled.

Replace the preempt_disable() section around __module_address() with RCU.

Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: Jason Baron <jbaron@akamai.com>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20250108090457.512198-24-bigeasy@linutronix.de
Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
kernel/jump_label.c

index 93a822d3c468ca2de59eb5a24cd227c9f7083fa4..7fcf4017cb3838f389dbf14ab426c48056b8d35c 100644 (file)
@@ -746,9 +746,9 @@ static int jump_label_add_module(struct module *mod)
                                kfree(jlm);
                                return -ENOMEM;
                        }
-                       preempt_disable();
-                       jlm2->mod = __module_address((unsigned long)key);
-                       preempt_enable();
+                       scoped_guard(rcu)
+                               jlm2->mod = __module_address((unsigned long)key);
+
                        jlm2->entries = static_key_entries(key);
                        jlm2->next = NULL;
                        static_key_set_mod(key, jlm2);
@@ -906,13 +906,13 @@ static void jump_label_update(struct static_key *key)
                return;
        }
 
-       preempt_disable();
-       mod = __module_address((unsigned long)key);
-       if (mod) {
-               stop = mod->jump_entries + mod->num_jump_entries;
-               init = mod->state == MODULE_STATE_COMING;
+       scoped_guard(rcu) {
+               mod = __module_address((unsigned long)key);
+               if (mod) {
+                       stop = mod->jump_entries + mod->num_jump_entries;
+                       init = mod->state == MODULE_STATE_COMING;
+               }
        }
-       preempt_enable();
 #endif
        entry = static_key_entries(key);
        /* if there are no users, entry can be NULL */