Skip to content

Commit 55d2eba

Browse files
author
Peter Zijlstra
committed
jump_label: Fix usage in module __init
When the static_key is part of the module, and the module calls static_key_inc/enable() from it's __init section *AND* has a static_branch_*() user in that very same __init section, things go wobbly. If the static_key lives outside the module, jump_label_add_module() would append this module's sites to the key and jump_label_update() would take the static_key_linked() branch and all would be fine. If all the sites are outside of __init, then everything will be fine too. However, when all is aligned just as described above, jump_label_update() calls __jump_label_update(.init = false) and we'll not update sites in __init text. Fixes: 1948367 ("jump_label: Annotate entries that operate on __init code earlier") Reported-by: Dexuan Cui <decui@microsoft.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> Tested-by: Jessica Yu <jeyu@kernel.org> Link: https://lkml.kernel.org/r/20201216135435.GV3092@hirez.programming.kicks-ass.net
1 parent 2c85ebc commit 55d2eba

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

kernel/jump_label.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -793,6 +793,7 @@ int jump_label_text_reserved(void *start, void *end)
793793
static void jump_label_update(struct static_key *key)
794794
{
795795
struct jump_entry *stop = __stop___jump_table;
796+
bool init = system_state < SYSTEM_RUNNING;
796797
struct jump_entry *entry;
797798
#ifdef CONFIG_MODULES
798799
struct module *mod;
@@ -804,15 +805,16 @@ static void jump_label_update(struct static_key *key)
804805

805806
preempt_disable();
806807
mod = __module_address((unsigned long)key);
807-
if (mod)
808+
if (mod) {
808809
stop = mod->jump_entries + mod->num_jump_entries;
810+
init = mod->state == MODULE_STATE_COMING;
811+
}
809812
preempt_enable();
810813
#endif
811814
entry = static_key_entries(key);
812815
/* if there are no users, entry can be NULL */
813816
if (entry)
814-
__jump_label_update(key, entry, stop,
815-
system_state < SYSTEM_RUNNING);
817+
__jump_label_update(key, entry, stop, init);
816818
}
817819

818820
#ifdef CONFIG_STATIC_KEYS_SELFTEST

0 commit comments

Comments
 (0)