History

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.

Jason Baron committed 14 years ago

Commit 8eedce91 parent a706d4f2 files · +5 −12Browse files

Unified · Split

2 files
  1. include/linux/jump_label.h +5 −6
  2. kernel/jump_label.c +0 −6
include/linux/jump_label.h+5−6
@@ -127,7 +127,6 @@ extern int jump_label_text_reserved(void *start, void *end); · 126 unmodified lines
127extern void static_key_slow_inc(struct static_key *key);127extern void static_key_slow_inc(struct static_key *key);
128extern void static_key_slow_dec(struct static_key *key);128extern void static_key_slow_dec(struct static_key *key);
129extern void static_key_slow_dec_deferred(struct static_key_deferred *key);129extern void static_key_slow_dec_deferred(struct static_key_deferred *key);
130extern bool static_key_enabled(struct static_key *key);
131extern void jump_label_apply_nops(struct module *mod);130extern void jump_label_apply_nops(struct module *mod);
132extern void131extern void
133jump_label_rate_limit(struct static_key_deferred *key, unsigned long rl);132jump_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) · 64 unmodified lines
198static inline void jump_label_lock(void) {}197static inline void jump_label_lock(void) {}
199static inline void jump_label_unlock(void) {}198static inline void jump_label_unlock(void) {}
200 199
201static inline bool static_key_enabled(struct static_key *key)
202{
203 return (atomic_read(&key->enabled) > 0);
204}
205
206static inline int jump_label_apply_nops(struct module *mod)200static inline int jump_label_apply_nops(struct module *mod)
207{201{
208 return 0;202 return 0;
@@ -224,4 +218,9 @@ jump_label_rate_limit(struct static_key_deferred *key, · 15 unmodified lines
224#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE218#define STATIC_KEY_INIT STATIC_KEY_INIT_FALSE
225#define jump_label_enabled static_key_enabled219#define jump_label_enabled static_key_enabled
226 220
221static inline bool static_key_enabled(struct static_key *key)
222{
223 return (atomic_read(&key->enabled) > 0);
224}
225
227#endif /* _LINUX_JUMP_LABEL_H */226#endif /* _LINUX_JUMP_LABEL_H */
kernel/jump_label.c+0−6
@@ -29,12 +29,6 @@ void jump_label_unlock(void) · 28 unmodified lines
29 mutex_unlock(&jump_label_mutex);29 mutex_unlock(&jump_label_mutex);
30}30}
31 31
32bool static_key_enabled(struct static_key *key)
33{
34 return (atomic_read(&key->enabled) > 0);
35}
36EXPORT_SYMBOL_GPL(static_key_enabled);
37
38static int jump_label_cmp(const void *a, const void *b)32static int jump_label_cmp(const void *a, const void *b)
39{33{
40 const struct jump_entry *jea = a;34 const struct jump_entry *jea = a;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t