Merge tag 'locking-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit d1b178254ca3 · 2021-07-25T10:21:19.000-07:00
Pull x86 jump label fix from Thomas Gleixner:
 "A single fix for jump labels to prevent the compiler from agressive
  un-inlining which results in a section mismatch"

* tag 'locking-urgent-2021-07-25' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  jump_labels: Mark __jump_label_transform() as __always_inlined to work around aggressive compiler un-inlining
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
@@ -79,9 +79,10 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type)
 	return (struct jump_label_patch){.code = code, .size = size};
 }
 
-static inline void __jump_label_transform(struct jump_entry *entry,
-					  enum jump_label_type type,
-					  int init)
+static __always_inline void
+__jump_label_transform(struct jump_entry *entry,
+		       enum jump_label_type type,
+		       int init)
 {
 	const struct jump_label_patch jlp = __jump_label_patch(entry, type);
 

Original file line number	Diff line number	Diff line change
`@@ -79,9 +79,10 @@ __jump_label_patch(struct jump_entry *entry, enum jump_label_type type)`
`79`	`79`	`return (struct jump_label_patch){.code = code, .size = size};`
`80`	`80`	`}`
`81`	`81`
`82`		`-static inline void __jump_label_transform(struct jump_entry *entry,`
`83`		`- enum jump_label_type type,`
`84`		`- int init)`
	`82`	`+static __always_inline void`
	`83`	`+__jump_label_transform(struct jump_entry *entry,`
	`84`	`+ enum jump_label_type type,`
	`85`	`+ int init)`
`85`	`86`	`{`
`86`	`87`	`const struct jump_label_patch jlp = __jump_label_patch(entry, type);`
`87`	`88`