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

Commit 8eedce99 authored by Jason Baron's avatar Jason Baron Committed by Ingo Molnar
Browse files

static keys: Inline the static_key_enabled() function 



In the jump label enabled case, calling static_key_enabled()
results in a function call. The function returns the results of
a compare, so it really doesn't need the overhead of a full
function call. Let's make it 'static inline' for both the jump
label enabled and disabled cases.

Signed-off-by: default avatarJason Baron <jbaron@redhat.com>
Cc: a.p.zijlstra@chello.nl
Cc: rostedt@goodmis.org
Cc: mathieu.desnoyers@polymtl.ca
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/201202281849.q1SIn1p2023270@int-mx10.intmail.prod.int.phx2.redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a706d4fc

include/linux/jump_label.h

+5 −6
Original line number Original line Diff line number Diff line
@@ -127,7 +127,6 @@ extern int jump_label_text_reserved(void *start, void *end); 
extern void static_key_slow_inc(struct static_key *key);

extern void static_key_slow_inc(struct static_key *key);

extern void static_key_slow_dec(struct static_key *key);

extern void static_key_slow_dec(struct static_key *key);

extern void static_key_slow_dec_deferred(struct static_key_deferred *key);

extern void static_key_slow_dec_deferred(struct static_key_deferred *key);

extern bool static_key_enabled(struct static_key *key);

extern void jump_label_apply_nops(struct module *mod);

extern void jump_label_apply_nops(struct module *mod);

extern void

extern void

jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);

jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);
@@ -198,11 +197,6 @@ static inline int jump_label_text_reserved(void *start, void *end) 
static inline void jump_label_lock(void) {}

static inline void jump_label_lock(void) {}

static inline void jump_label_unlock(void) {}

static inline void jump_label_unlock(void) {}





static inline bool static_key_enabled(struct static_key *key)

{

	return (atomic_read(&key->enabled) > 0);

}



static inline int jump_label_apply_nops(struct module *mod)

static inline int jump_label_apply_nops(struct module *mod)

{

{

	return 0;

	return 0;
@@ -224,4 +218,9 @@ jump_label_rate_limit(struct static_key_deferred *key, 
#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE

#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE

#define jump_label_enabled static_key_enabled

#define jump_label_enabled static_key_enabled





static inline bool static_key_enabled(struct static_key *key)

{

	return (atomic_read(&key->enabled) > 0);

}



#endif	/* _LINUX_JUMP_LABEL_H */
 
#endif	/* _LINUX_JUMP_LABEL_H */

kernel/jump_label.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -29,12 +29,6 @@ void jump_label_unlock(void) 
	mutex_unlock(&jump_label_mutex);

	mutex_unlock(&jump_label_mutex);

}

}





bool static_key_enabled(struct static_key *key)

{

	return (atomic_read(&key->enabled) > 0);

}

EXPORT_SYMBOL_GPL(static_key_enabled);



static int jump_label_cmp(const void *a, const void *b)

static int jump_label_cmp(const void *a, const void *b)

{

{

	const struct jump_entry *jea = a;

	const struct jump_entry *jea = a;