Skip to content

Commit

Permalink
jump_label: Free jump_entry::key bit1 for build use
Browse files Browse the repository at this point in the history
Have jump_label_init() set jump_entry::key bit1 to either 0 ot 1
unconditionally. This makes it available for build-time games.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210506194157.906893264@infradead.org
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed May 12, 2021
1 parent 001951b commit 5af0ea2
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
7 changes: 5 additions & 2 deletions include/linux/jump_label.h
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,12 @@ static inline bool jump_entry_is_init(const struct jump_entry *entry)
return (unsigned long)entry->key & 2UL;
}

static inline void jump_entry_set_init(struct jump_entry *entry)
static inline void jump_entry_set_init(struct jump_entry *entry, bool set)
{
entry->key |= 2;
if (set)
entry->key |= 2;
else
entry->key &= ~2;
}

static inline int jump_entry_size(struct jump_entry *entry)
Expand Down
10 changes: 6 additions & 4 deletions kernel/jump_label.c
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,14 @@ void __init jump_label_init(void)

for (iter = iter_start; iter < iter_stop; iter++) {
struct static_key *iterk;
bool in_init;

/* rewrite NOPs */
if (jump_label_type(iter) == JUMP_LABEL_NOP)
arch_jump_label_transform_static(iter, JUMP_LABEL_NOP);

if (init_section_contains((void *)jump_entry_code(iter), 1))
jump_entry_set_init(iter);
in_init = init_section_contains((void *)jump_entry_code(iter), 1);
jump_entry_set_init(iter, in_init);

iterk = jump_entry_key(iter);
if (iterk == key)
Expand Down Expand Up @@ -634,9 +635,10 @@ static int jump_label_add_module(struct module *mod)

for (iter = iter_start; iter < iter_stop; iter++) {
struct static_key *iterk;
bool in_init;

if (within_module_init(jump_entry_code(iter), mod))
jump_entry_set_init(iter);
in_init = within_module_init(jump_entry_code(iter), mod);
jump_entry_set_init(iter, in_init);

iterk = jump_entry_key(iter);
if (iterk == key)
Expand Down

0 comments on commit 5af0ea2

Please sign in to comment.