aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/jump_label.c
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-10-03 14:01:46 -0400
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2011-10-25 14:54:31 -0400
commit20284aa77c0f6227da4783a920b72dc61d4bcc09 (patch)
tree46fb708a9508e3d718be7eb432367547e71208d3 /kernel/jump_label.c
parent92e02396d7214fdc7c25239eb647eb48e6fe6ba9 (diff)
jump_label: add arch_jump_label_transform_static() to optimise non-live code updates
When updating a newly loaded module, the code is definitely not yet executing on any processor, so it can be updated with no need for any heavyweight synchronization. This patch adds arch_jump_label_static() which is implemented as arch_jump_label_transform() by default, but architectures can override it if it avoids, say, a call to stop_machine(). 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 'kernel/jump_label.c')
-rw-r--r--kernel/jump_label.c18
1 files changed, 15 insertions, 3 deletions
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index 059202d5b77a..ff2028f35aa8 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -104,6 +104,18 @@ static int __jump_label_text_reserved(struct jump_entry *iter_start,
104 return 0; 104 return 0;
105} 105}
106 106
107/*
108 * Update code which is definitely not currently executing.
109 * Architectures which need heavyweight synchronization to modify
110 * running code can override this to make the non-live update case
111 * cheaper.
112 */
113void __weak arch_jump_label_transform_static(struct jump_entry *entry,
114 enum jump_label_type type)
115{
116 arch_jump_label_transform(entry, type);
117}
118
107static void __jump_label_update(struct jump_label_key *key, 119static void __jump_label_update(struct jump_label_key *key,
108 struct jump_entry *entry, 120 struct jump_entry *entry,
109 struct jump_entry *stop, int enable) 121 struct jump_entry *stop, int enable)
@@ -135,8 +147,8 @@ static __init int jump_label_init(void)
135 struct jump_label_key *iterk; 147 struct jump_label_key *iterk;
136 148
137 iterk = (struct jump_label_key *)(unsigned long)iter->key; 149 iterk = (struct jump_label_key *)(unsigned long)iter->key;
138 arch_jump_label_transform(iter, jump_label_enabled(iterk) ? 150 arch_jump_label_transform_static(iter, jump_label_enabled(iterk) ?
139 JUMP_LABEL_ENABLE : JUMP_LABEL_DISABLE); 151 JUMP_LABEL_ENABLE : JUMP_LABEL_DISABLE);
140 if (iterk == key) 152 if (iterk == key)
141 continue; 153 continue;
142 154
@@ -208,7 +220,7 @@ void jump_label_apply_nops(struct module *mod)
208 return; 220 return;
209 221
210 for (iter = iter_start; iter < iter_stop; iter++) 222 for (iter = iter_start; iter < iter_stop; iter++)
211 arch_jump_label_transform(iter, JUMP_LABEL_DISABLE); 223 arch_jump_label_transform_static(iter, JUMP_LABEL_DISABLE);
212} 224}
213 225
214static int jump_label_add_module(struct module *mod) 226static int jump_label_add_module(struct module *mod)