Apply a1e2c031ec39 and e32683c6f7d2 to 5.15 and earlier

From: Nathan Chancellor <nathan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Sasha Levin <sashal@kernel.org>
Cc: stable@vger.kernel.org, linux-kernel@vger.kernel.org,
	llvm@lists.linux.dev, Josh Poimboeuf <jpoimboe@kernel.org>,
	Peter Zijlstra <peterz@infradead.org>,
	x86@kernel.org
Subject: Apply a1e2c031ec39 and e32683c6f7d2 to 5.15 and earlier
Date: Fri, 27 Oct 2023 09:01:44 -0700	[thread overview]
Message-ID: <20231027160144.GA232578@dev-arch.thelio-3990X> (raw)

[-- Attachment #1: Type: text/plain, Size: 1292 bytes --]

Hi Greg and Sasha,

Please consider applying the following mbox files to their respective
stable trees, which contains commit a1e2c031ec39 ("x86/mm: Simplify
RESERVE_BRK()") and commit e32683c6f7d2 ("x86/mm: Fix RESERVE_BRK() for
older binutils"). This resolves a link failure noticed in the Android
trees due to a new diagnostic in ld.lld:

https://github.com/llvm/llvm-project/commit/1981b1b6b92f7579a30c9ed32dbdf3bc749c1b40

  ld.lld: error: relocation refers to a symbol in a discarded section: __brk_reservation_fn_dmi_alloc__
  >>> defined in vmlinux.o
  >>> referenced by ld-temp.o
  >>>               vmlinux.o:(exit_amd_microcode.cfi_jt)

  ld.lld: error: relocation refers to a symbol in a discarded section: __brk_reservation_fn_early_pgt_alloc__
  >>> defined in vmlinux.o
  >>> referenced by ld-temp.o
  >>>               vmlinux.o:(exit_amd_microcode.cfi_jt)

While I think this may be related to Android's downstream use of LTO and
CFI, I see no reason that this could not happen without LTO due to
RESERVE_BRK() prior to those upstream commits residing in the
.discard.text section.

I confirmed they resolve the Android build problem and I did an
ARCH=x86_64 defconfig build and boot test in QEMU and an allmodconfig
build with GCC, which had no regressions.

Cheers,
Nathan

[-- Attachment #2: 4.14.mbox --]
[-- Type: application/mbox, Size: 8593 bytes --]

[-- Attachment #3: 4.19.mbox --]
[-- Type: application/mbox, Size: 8593 bytes --]

[-- Attachment #4: 5.4.mbox --]
[-- Type: application/mbox, Size: 8618 bytes --]

[-- Attachment #5: 5.10.mbox --]
[-- Type: application/mbox, Size: 9117 bytes --]

[-- Attachment #6: 5.15.mbox --]
[-- Type: application/mbox, Size: 8940 bytes --]