Commit f6a8919d authored by Josh Poimboeuf's avatar Josh Poimboeuf Committed by Ingo Molnar
Browse files

vmlinux.lds: Fix TEXT_MAIN to include .text.start and friends 



Since:

  6568f14c ("vmlinux.lds: Exclude .text.startup and .text.exit from TEXT_MAIN")

the TEXT_MAIN macro uses a series of patterns to prevent the
.text.startup[.*] and .text.exit[.*] sections from getting
linked into the vmlinux runtime .text.

That commit is a tad too aggressive: it also inadvertently filters out
valid runtime text sections like .text.start and
.text.start.constprop.0, which can be generated for a function named
start() when -ffunction-sections is enabled.

As a result, those sections become orphans when building with
CONFIG_LD_DEAD_CODE_DATA_ELIMINATION for arm:

  arm-linux-gnueabi-ld: warning: orphan section `.text.start.constprop.0' from `drivers/usb/host/sl811-hcd.o' being placed in section `.text.start.constprop.0'
  arm-linux-gnueabi-ld: warning: orphan section `.text.start.constprop.0' from `drivers/media/dvb-frontends/drxk_hard.o' being placed in section `.text.start.constprop.0'
  arm-linux-gnueabi-ld: warning: orphan section `.text.start' from `drivers/media/dvb-frontends/stv0910.o' being placed in section `.text.start'
  arm-linux-gnueabi-ld: warning: orphan section `.text.start.constprop.0' from `drivers/media/pci/ddbridge/ddbridge-sx8.o' being placed in section `.text.start.constprop.0'

Fix that by explicitly adding the partial "substring" sections (.text.s,
.text.st, .text.sta, etc) and their cloned derivatives.

While this unfortunately means that TEXT_MAIN continues to grow,
these changes are ultimately necessary for proper support of
-ffunction-sections.

Fixes: 6568f14c ("vmlinux.lds: Exclude .text.startup and .text.exit from TEXT_MAIN")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarJosh Poimboeuf <jpoimboe@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: live-patching@vger.kernel.org
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://patch.msgid.link/cd588144e63df901a656b06b566855019c4a931d.1762991150.git.jpoimboe@kernel.org
Closes: https://lore.kernel.org/oe-kbuild-all/202511040812.DFGedJiy-lkp@intel.com/
parent d851f2b2

include/asm-generic/vmlinux.lds.h

+12 −11
Original line number Diff line number Diff line
@@ -90,8 +90,9 @@ 
 * Support -ffunction-sections by matching .text and .text.*,

 * but exclude '.text..*', .text.startup[.*], and .text.exit[.*].

 *

 * .text.startup and .text.startup.* are matched later by INIT_TEXT.

 * .text.exit and .text.exit.* are matched later by EXIT_TEXT.

 * .text.startup and .text.startup.* are matched later by INIT_TEXT, and

 * .text.exit and .text.exit.* are matched later by EXIT_TEXT, so they must be

 * explicitly excluded here.

 *

 * Other .text.* sections that are typically grouped separately, such as

 * .text.unlikely or .text.hot, must be matched explicitly before using
@@ -100,16 +101,16 @@ 
#define TEXT_MAIN							\

	.text								\

	.text.[_0-9A-Za-df-rt-z]*					\

	.text.s[_0-9A-Za-su-z]*						\

	.text.st[_0-9A-Zb-z]*						\

	.text.sta[_0-9A-Za-qs-z]*					\

	.text.star[_0-9A-Za-su-z]*					\

	.text.start[_0-9A-Za-tv-z]*					\

	.text.startu[_0-9A-Za-oq-z]*					\

	.text.s[_0-9A-Za-su-z]*		.text.s		.text.s.*	\

	.text.st[_0-9A-Zb-z]*		.text.st	.text.st.*	\

	.text.sta[_0-9A-Za-qs-z]*	.text.sta	.text.sta.*	\

	.text.star[_0-9A-Za-su-z]*	.text.star	.text.star.*	\

	.text.start[_0-9A-Za-tv-z]*	.text.start	.text.start.*	\

	.text.startu[_0-9A-Za-oq-z]*	.text.startu	.text.startu.*	\

	.text.startup[_0-9A-Za-z]*					\

	.text.e[_0-9A-Za-wy-z]*						\

	.text.ex[_0-9A-Za-hj-z]*					\

	.text.exi[_0-9A-Za-su-z]*					\

	.text.e[_0-9A-Za-wy-z]*		.text.e		.text.e.*	\

	.text.ex[_0-9A-Za-hj-z]*	.text.ex	.text.ex.*	\

	.text.exi[_0-9A-Za-su-z]*	.text.exi	.text.exi.*	\

	.text.exit[_0-9A-Za-z]*



/*