From: Josh Poimboeuf <jpoimboe@kernel.org>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
Peter Zijlstra <peterz@infradead.org>, Rong Xu <xur@google.com>,
Han Shen <shenhan@google.com>,
Sriraman Tallam <tmsriram@google.com>,
Krzysztof Pszeniczny <kpszeniczny@google.com>
Subject: [PATCH 6/6] objtool: Remove second pass of .cold function correlation
Date: Thu, 20 Nov 2025 12:52:20 -0800 [thread overview]
Message-ID: <bdab245a38000a5407f663a031f39e14c67a43d4.1763671318.git.jpoimboe@kernel.org> (raw)
In-Reply-To: <cover.1763671318.git.jpoimboe@kernel.org>
The .cold function parent/child correlation logic has two passes: one in
read_symbols() and one in add_jump_destinations().
The second pass was added with commit cd77849a69cf ("objtool: Fix GCC 8
cold subfunction detection for aliased functions") to ensure that if the
parent symbol had aliases then the canonical symbol was chosen as the
parent.
That solution was rather clunky, not to mention incomplete due to the
existence of alternatives and switch tables. Now that we have
sym->alias, the canonical alias fix can be done much simpler in the
first pass, making the second pass obsolete.
Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
tools/objtool/check.c | 23 +----------------------
tools/objtool/elf.c | 3 ++-
2 files changed, 3 insertions(+), 23 deletions(-)
diff --git a/tools/objtool/check.c b/tools/objtool/check.c
index 6a4a29f8f2f5..1a20ff89df74 100644
--- a/tools/objtool/check.c
+++ b/tools/objtool/check.c
@@ -1623,34 +1623,13 @@ static int add_jump_destinations(struct objtool_file *file)
continue;
}
- if (!insn->sym || insn->sym == dest_insn->sym)
+ if (!insn->sym || insn->sym->pfunc == dest_sym->pfunc)
goto set_jump_dest;
/*
* Internal cross-function jump.
*/
- /*
- * For GCC 8+, create parent/child links for any cold
- * subfunctions. This is _mostly_ redundant with a
- * similar initialization in read_symbols().
- *
- * If a function has aliases, we want the *first* such
- * function in the symbol table to be the subfunction's
- * parent. In that case we overwrite the
- * initialization done in read_symbols().
- *
- * However this code can't completely replace the
- * read_symbols() code because this doesn't detect the
- * case where the parent function's only reference to a
- * subfunction is through a jump table.
- */
- if (func && dest_sym->cold) {
- func->cfunc = dest_sym;
- dest_sym->pfunc = func;
- goto set_jump_dest;
- }
-
if (is_first_func_insn(file, dest_insn)) {
/* Internal sibling call */
if (add_call_dest(file, insn, dest_sym, true))
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 7e2c0ae6b41a..6a8ed9c62323 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -658,8 +658,9 @@ static int read_symbols(struct elf *elf)
return -1;
}
- sym->pfunc = pfunc;
+ sym->pfunc = pfunc->alias;
pfunc->cfunc = sym;
+ pfunc->alias->cfunc = sym;
/*
* Unfortunately, -fnoreorder-functions puts the child
--
2.51.1
next prev parent reply other threads:[~2025-11-20 20:52 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-20 20:52 [PATCH 0/6] objtool: AUTOFDO fixes + alias improvements Josh Poimboeuf
2025-11-20 20:52 ` [PATCH 1/6] objtool: Support Clang AUTOFDO .cold functions Josh Poimboeuf
2025-11-20 22:18 ` Rong Xu
2025-11-21 9:58 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2025-11-20 20:52 ` [PATCH 2/6] objtool: Fix .cold function detection for duplicate symbols Josh Poimboeuf
2025-11-21 9:57 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2025-11-20 20:52 ` [PATCH 3/6] objtool: Don't alias undefined symbols Josh Poimboeuf
2025-11-21 9:57 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2025-11-20 20:52 ` [PATCH 4/6] objtool: Return canonical symbol when aliases exist in symbol finding helpers Josh Poimboeuf
2025-11-21 9:57 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2025-11-20 20:52 ` [PATCH 5/6] objtool: Skip non-canonical aliased symbols in add_jump_table_alts() Josh Poimboeuf
2025-11-21 9:57 ` [tip: objtool/core] " tip-bot2 for Josh Poimboeuf
2025-11-20 20:52 ` Josh Poimboeuf [this message]
2025-11-21 9:57 ` [tip: objtool/core] objtool: Remove second pass of .cold function correlation tip-bot2 for Josh Poimboeuf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=bdab245a38000a5407f663a031f39e14c67a43d4.1763671318.git.jpoimboe@kernel.org \
--to=jpoimboe@kernel.org \
--cc=kpszeniczny@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=shenhan@google.com \
--cc=tmsriram@google.com \
--cc=x86@kernel.org \
--cc=xur@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®