aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-09-29 14:11:09 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-10-25 14:54:42 -0400
commite71a5be15e47a73a2964712967fe93ee8ccf551b (patch)
tree64d85dec15ab2ddfa11ea06d4c70dadd2a4f2897 /arch
parent61f42183fd15d5e666236f474d73b3555c7b83d1 (diff)
x86/jump_label: add arch_jump_label_transform_static()
This allows jump-label entries to be cheaply updated on code which is not yet live. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Acked-by: Jason Baron <jbaron@redhat.com> Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/jump_label.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index 2ad029876c8c..ea9d5f2f13ef 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -24,8 +24,9 @@ union jump_code_union {
24 } __attribute__((packed)); 24 } __attribute__((packed));
25}; 25};
26 26
27void arch_jump_label_transform(struct jump_entry *entry, 27static void __jump_label_transform(struct jump_entry *entry,
28 enum jump_label_type type) 28 enum jump_label_type type,
29 void *(*poker)(void *, const void *, size_t))
29{ 30{
30 union jump_code_union code; 31 union jump_code_union code;
31 32
@@ -35,11 +36,24 @@ void arch_jump_label_transform(struct jump_entry *entry,
35 (entry->code + JUMP_LABEL_NOP_SIZE); 36 (entry->code + JUMP_LABEL_NOP_SIZE);
36 } else 37 } else
37 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE); 38 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
39
40 (*poker)((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE);
41}
42
43void arch_jump_label_transform(struct jump_entry *entry,
44 enum jump_label_type type)
45{
38 get_online_cpus(); 46 get_online_cpus();
39 mutex_lock(&text_mutex); 47 mutex_lock(&text_mutex);
40 text_poke_smp((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE); 48 __jump_label_transform(entry, type, text_poke_smp);
41 mutex_unlock(&text_mutex); 49 mutex_unlock(&text_mutex);
42 put_online_cpus(); 50 put_online_cpus();
43} 51}
44 52
53void arch_jump_label_transform_static(struct jump_entry *entry,
54 enum jump_label_type type)
55{
56 __jump_label_transform(entry, type, text_poke_early);
57}
58
45#endif 59#endif