Move the check of if a jump_entry is valid to a function.
Signed-off-by: Daniel Bristot de Oliveira <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Borislav Petkov <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Pavel Tatashin <[email protected]>
Cc: Masami Hiramatsu <[email protected]>
Cc: "Steven Rostedt (VMware)" <[email protected]>
Cc: Zhou Chengming <[email protected]>
Cc: Jiri Kosina <[email protected]>
Cc: Josh Poimboeuf <[email protected]>
Cc: "Peter Zijlstra (Intel)" <[email protected]>
Cc: Chris von Recklinghausen <[email protected]>
Cc: Jason Baron <[email protected]>
Cc: Scott Wood <[email protected]>
Cc: Marcelo Tosatti <[email protected]>
Cc: Clark Williams <[email protected]>
Cc: [email protected]
Cc: [email protected]
---
kernel/jump_label.c | 29 ++++++++++++++++++-----------
1 file changed, 18 insertions(+), 11 deletions(-)
diff --git a/kernel/jump_label.c b/kernel/jump_label.c
index e853916a3b46..940ba7819c87 100644
--- a/kernel/jump_label.c
+++ b/kernel/jump_label.c
@@ -361,22 +361,29 @@ static enum jump_label_type jump_label_type(struct
jump_entry *entry)
return enabled ^ branch;
}
+bool jump_label_can_update_check(struct jump_entry *entry)
+{
+ /*
+ * An entry->code of 0 indicates an entry which has been
+ * disabled because it was in an init text area.
+ */
+ if (entry->code) {
+ if (kernel_text_address(entry->code))
+ return 1;
+ else
+ WARN_ONCE(1, "can't patch jump_label at %pS",
+ (void *)(unsigned long)entry->code);
+ }
+ return 0;
+}
+
static void __jump_label_update(struct static_key *key,
struct jump_entry *entry,
struct jump_entry *stop)
{
for_each_label_entry(key, entry, stop) {
- /*
- * An entry->code of 0 indicates an entry which has been
- * disabled because it was in an init text area.
- */
- if (entry->code) {
- if (kernel_text_address(entry->code))
- arch_jump_label_transform(entry,
jump_label_type(entry));
- else
- WARN_ONCE(1, "can't patch jump_label at %pS",
- (void *)(unsigned long)entry->code);
- }
+ if (jump_label_can_update_check(entry))
+ arch_jump_label_transform(entry,
jump_label_type(entry));
}
}
--
2.17.1
