Skip to content

Commit 0043ece

Browse files
xur-llvmmasahir0y
authored andcommitted
vmlinux.lds.h: Adjust symbol ordering in text output section
When the -ffunction-sections compiler option is enabled, each function is placed in a separate section named .text.function_name rather than putting all functions in a single .text section. However, using -function-sections can cause problems with the linker script. The comments included in include/asm-generic/vmlinux.lds.h note these issues.: “TEXT_MAIN here will match .text.fixup and .text.unlikely if dead code elimination is enabled, so these sections should be converted to use ".." first.” It is unclear whether there is a straightforward method for converting a suffix to "..". This patch modifies the order of subsections within the text output section. Specifically, it changes current order: .text.hot, .text, .text_unlikely, .text.unknown, .text.asan to the new order: .text.asan, .text.unknown, .text_unlikely, .text.hot, .text Here is the rationale behind the new layout: The majority of the code resides in three sections: .text.hot, .text, and .text.unlikely, with .text.unknown containing a negligible amount. .text.asan is only generated in ASAN builds. The primary goal is to group code segments based on their execution frequency (hotness). First, we want to place .text.hot adjacent to .text. Since we cannot put .text.hot after .text (Due to constraints with -ffunction-sections, placing .text.hot after .text is problematic), we need to put .text.hot before .text. Then it comes to .text.unlikely, we cannot put it after .text (same -ffunction-sections issue) . Therefore, we position .text.unlikely before .text.hot. .text.unknown and .tex.asan follow the same logic. This revised ordering effectively reverses the original arrangement (for .text.unlikely, .text.unknown, and .tex.asan), maintaining a similar level of affinity between sections. It also places .text.hot section at the beginning of a page to better utilize the TLB entry. Note that the limitation arises because the linker script employs glob patterns instead of regular expressions for string matching. While there is a method to maintain the current order using complex patterns, this significantly complicates the pattern and increases the likelihood of errors. This patch also changes vmlinux.lds.S for the sparc64 architecture to accommodate specific symbol placement requirements. Co-developed-by: Han Shen <[email protected]> Signed-off-by: Han Shen <[email protected]> Signed-off-by: Rong Xu <[email protected]> Suggested-by: Sriraman Tallam <[email protected]> Suggested-by: Krzysztof Pszeniczny <[email protected]> Tested-by: Yonghong Song <[email protected]> Tested-by: Yabin Cui <[email protected]> Tested-by: Nathan Chancellor <[email protected]> Reviewed-by: Kees Cook <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 52892ed commit 0043ece

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

arch/sparc/kernel/vmlinux.lds.S

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ SECTIONS
4848
{
4949
_text = .;
5050
HEAD_TEXT
51+
ALIGN_FUNCTION();
52+
#ifdef CONFIG_SPARC64
53+
/* Match text section symbols in head_64.S first */
54+
*head_64.o(.text)
55+
#endif
5156
TEXT_TEXT
5257
SCHED_TEXT
5358
LOCK_TEXT

include/asm-generic/vmlinux.lds.h

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -553,19 +553,24 @@
553553
* .text section. Map to function alignment to avoid address changes
554554
* during second ld run in second ld pass when generating System.map
555555
*
556-
* TEXT_MAIN here will match .text.fixup and .text.unlikely if dead
557-
* code elimination is enabled, so these sections should be converted
558-
* to use ".." first.
556+
* TEXT_MAIN here will match symbols with a fixed pattern (for example,
557+
* .text.hot or .text.unlikely) if dead code elimination or
558+
* function-section is enabled. Match these symbols first before
559+
* TEXT_MAIN to ensure they are grouped together.
560+
*
561+
* Also placing .text.hot section at the beginning of a page, this
562+
* would help the TLB performance.
559563
*/
560564
#define TEXT_TEXT \
561565
ALIGN_FUNCTION(); \
566+
*(.text.asan.* .text.tsan.*) \
567+
*(.text.unknown .text.unknown.*) \
568+
*(.text.unlikely .text.unlikely.*) \
569+
. = ALIGN(PAGE_SIZE); \
562570
*(.text.hot .text.hot.*) \
563571
*(TEXT_MAIN .text.fixup) \
564-
*(.text.unlikely .text.unlikely.*) \
565-
*(.text.unknown .text.unknown.*) \
566572
NOINSTR_TEXT \
567-
*(.ref.text) \
568-
*(.text.asan.* .text.tsan.*)
573+
*(.ref.text)
569574

570575

571576
/* sched.text is aling to function alignment to secure we have same

0 commit comments

Comments
 (0)