Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37348804 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge
Browse files

jump_label: if a key has already been initialized, don't nop it out 



If a key has been enabled before jump_label_init() is called, don't
nop it out.

This removes arch_jump_label_text_poke_early() (which can only nop
out a site) and uses arch_jump_label_transform() instead.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Acked-by: default avatarJason Baron <jbaron@redhat.com>
Acked-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
parent 189c3fd6

include/linux/jump_label.h

+1 −2
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ extern void jump_label_lock(void); 
extern void jump_label_unlock(void);

extern void arch_jump_label_transform(struct jump_entry *entry,

				      enum jump_label_type type);

extern void arch_jump_label_text_poke_early(jump_label_t addr);

extern int jump_label_text_reserved(void *start, void *end);

extern void jump_label_inc(struct jump_label_key *key);

extern void jump_label_dec(struct jump_label_key *key);

kernel/jump_label.c

+8 −12
Original line number Diff line number Diff line
@@ -121,13 +121,6 @@ static void __jump_label_update(struct jump_label_key *key, 
	}

}



/*

 * Not all archs need this.

 */

void __weak arch_jump_label_text_poke_early(jump_label_t addr)

{

}



static __init int jump_label_init(void)

{

	struct jump_entry *iter_start = __start___jump_table;
@@ -139,12 +132,15 @@ static __init int jump_label_init(void) 
	jump_label_sort_entries(iter_start, iter_stop);



	for (iter = iter_start; iter < iter_stop; iter++) {

		arch_jump_label_text_poke_early(iter->code);

		if (iter->key == (jump_label_t)(unsigned long)key)

		struct jump_label_key *iterk;



		iterk = (struct jump_label_key *)(unsigned long)iter->key;

		arch_jump_label_transform(iter, jump_label_enabled(iterk) ?

					  JUMP_LABEL_ENABLE : JUMP_LABEL_DISABLE);

		if (iterk == key)

			continue;



		key = (struct jump_label_key *)(unsigned long)iter->key;

		atomic_set(&key->enabled, 0);

		key = iterk;

		key->entries = iter;

#ifdef CONFIG_MODULES

		key->next = NULL;
@@ -212,7 +208,7 @@ void jump_label_apply_nops(struct module *mod) 
		return;



	for (iter = iter_start; iter < iter_stop; iter++)

		arch_jump_label_text_poke_early(iter->code);

		arch_jump_label_transform(iter, JUMP_LABEL_DISABLE);

}



static int jump_label_add_module(struct module *mod)