Merge tag 'objtool-urgent-2023-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

torvalds · torvalds · commit e54ca3c81f2d · 2023-09-17T10:59:37.000-07:00
Pull objtool fix from Ingo Molnar:
 "Fix a cold functions related false-positive objtool warning that
  triggers on Clang"

* tag 'objtool-urgent-2023-09-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  objtool: Fix _THIS_IP_ detection for cold functions
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
@@ -4333,7 +4333,8 @@ static int validate_ibt_insn(struct objtool_file *file, struct instruction *insn
 			continue;
 		}
 
-		if (insn_func(dest) && insn_func(dest) == insn_func(insn)) {
+		if (insn_func(dest) && insn_func(insn) &&
+		    insn_func(dest)->pfunc == insn_func(insn)->pfunc) {
 			/*
 			 * Anything from->to self is either _THIS_IP_ or
 			 * IRET-to-self.

Original file line number	Diff line number	Diff line change
`@@ -4333,7 +4333,8 @@ static int validate_ibt_insn(struct objtool_file file, struct instruction insn`
`4333`	`4333`	`continue;`
`4334`	`4334`	`}`
`4335`	`4335`
`4336`		`- if (insn_func(dest) && insn_func(dest) == insn_func(insn)) {`
	`4336`	`+ if (insn_func(dest) && insn_func(insn) &&`
	`4337`	`+ insn_func(dest)->pfunc == insn_func(insn)->pfunc) {`
`4337`	`4338`	`/*`
`4338`	`4339`	`* Anything from->to self is either _THIS_IP_ or`
`4339`	`4340`	`* IRET-to-self.`