Skip to content

Commit 336711c

Browse files
Peter Zijlstraksacilotto
authored andcommitted
jump_label: Fix usage in module __init
BugLink: https://bugs.launchpad.net/bugs/1950462 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 (cherry picked from commit 55d2eba) Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Acked-by: Stefan Bader <stefan.bader@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
1 parent db5df35 commit 336711c

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
@@ -787,6 +787,7 @@ int jump_label_text_reserved(void *start, void *end)
787787
static void jump_label_update(struct static_key *key)
788788
{
789789
struct jump_entry *stop = __stop___jump_table;
790+
bool init = system_state < SYSTEM_RUNNING;
790791
struct jump_entry *entry;
791792
#ifdef CONFIG_MODULES
792793
struct module *mod;
@@ -798,15 +799,16 @@ static void jump_label_update(struct static_key *key)
798799

799800
preempt_disable();
800801
mod = __module_address((unsigned long)key);
801-
if (mod)
802+
if (mod) {
802803
stop = mod->jump_entries + mod->num_jump_entries;
804+
init = mod->state == MODULE_STATE_COMING;
805+
}
803806
preempt_enable();
804807
#endif
805808
entry = static_key_entries(key);
806809
/* if there are no users, entry can be NULL */
807810
if (entry)
808-
__jump_label_update(key, entry, stop,
809-
system_state < SYSTEM_RUNNING);
811+
__jump_label_update(key, entry, stop, init);
810812
}
811813

812814
#ifdef CONFIG_STATIC_KEYS_SELFTEST

0 commit comments

Comments
 (0)