From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795042891; b=4ecEkz33kKUIbyk8O4ibSQEx9J+bFFGGii75qK134/FYmBos6FCv9KYAcVhLOsxclJUz X/hFho8FcPlCqviYsO20o4WgENkOpBz2FJ0ImUED6T/T3KGuB8NyH90g6t0+0Y1sO138g bGGIkZKnv8nRzm2kAV/CyIGglC0GtXdHAV0/MTnr+nai2kNFieJjb5N6nRmqQfIJd4d7B 6zCoT8yqmHWKql+kyLq/6W/6yi0VRRLpz/g740fV6dDlY7iELDM/au4ZJs3B0cCFAYvEI cpPQ5Oenmqt82353h/uHWRs0aoLGbq+bVegSMFfc1R2VfkMyDrqPIDAs7Ah9YiwNJTQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795042891; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=3gZ9ZL8giFONarCE6uyIpOhAZzMGYw43eqUCw9cBLBc=; b=by+L61yoztcabUXhKGCziFk6ONRqoYKl3k2g3U76a2g3XrwiwsuaUFtJoOXsxvyug6b7 71dZy+Hgf/x1iv/WCfPWGuo9fCgbE4FXjzVs10Ri/1KP+eyVB7eL324TAG4w9yoNfCgHQ ure3mpAO73w6XbyszdEPEHtmWnJP+xbn8dL3Z9PHRMPZuimTx7IfnNpufZQInwPx2iOtW 2g2chPUgwVBMbf6Sfs+TuL9E5jdHBFp0/4Kl86HJSLafr8JoqJRYUhUZdoeoBCVrJMLNa OkkgPIKDk9vE0kBRZsuRmtQcTK7T2ZWj2tVnhuyLfjq4voF93xQ9z54qSNnj6IqjbFA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="BbjQy/37"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4F7CF606A31C; Wed, 18 Nov 2026 23:01:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=BbjQy/37 Received: by smtp.kernel.org (Postfix) with ESMTPSA id A48631F000C4; Wed, 18 Nov 2026 23:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795042891; bh=3gZ9ZL8giFONarCE6uyIpOhAZzMGYw43eqUCw9cBLBc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=BbjQy/37xbtbfT3LiXlF7fd5ZZJ2cLSYDzs5kg8R2DSXN/zRU26b/5+Vkzgqtm3ao 6zKDGez9rC8Vpsfxy/HNkepH7R1lE02uFHxPuK3pIHiX8anSoPsU7TUv4jPxYrN/JR 7k2J2T4zcdXLMJBRmjwe8Kr5+lJX/PhRBIGJewoo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Andr=C3=A9=20Draszik?= , Nathan Chancellor , Nicolas Schier , Sasha Levin Subject: [PATCH 6.1 0009/2857] kbuild: link-vmlinux.sh: improve detection of third pass requirement Date: Wed, 18 Nov 2026 15:17:23 +0100 Message-ID: <20261118150201.653978810@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: André Draszik commit 14b8b4bf2d7bd5d58c17adbeed0edfda1dfc1a7f upstream. It can happen that symbol sizes within .tmp_vmlinux1.kallsyms.o and .tmp_vmlinux2.kallsyms.o differ, without affecting file size on disk because of section alignment and/or padding emitted by the assembler. link-vmlinux.sh doesn't detect this case currently and keeps using .tmp_vmlinux2.kallsyms.o to link the final vmlinux. Due to the different symbol sizes, other symbols are shifted within the final image compared to .tmp_vmlinux2, and the final comparison of System.map against "${kallsyms_sysmap}" fails with the message: Inconsistent kallsyms data Try "make KALLSYMS_EXTRA_PASS=1" as a workaround This can happen in particular if the linker emits additional symbols that might have different names between our (re-)linking steps, e.g. because those names depend on the virtual address of the symbol. Linker stubs for ARM errata work-arounds are one such case. These changed symbol names can cause the output of the token compression of kallsyms.c to change due to the changed symbol substring count, which in turn can change the size of the kallsyms_names symbol itself, causing the potential shift of subsequent symbol addresses in .tmp_vmlinux2.kallsyms.o and therefore the final image. Update link-vmlinux.sh to not rely on file size of .tmp_vmlinux?.kallsyms.o alone but to also consider symbol offsets within to resolve this, and do a third pass if required. [AD: kallsymso_prev is already tracked by kallsyms_step() here, so only add kallsymso_changed() and use it] Signed-off-by: André Draszik Tested-by: Nathan Chancellor Reviewed-by: Nicolas Schier Signed-off-by: Nicolas Schier Signed-off-by: André Draszik Signed-off-by: Sasha Levin --- scripts/link-vmlinux.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index 019560548ac98..f16776861bf3b 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -144,6 +144,18 @@ gen_btf() printf "${et_rel}" | dd of=${2} conv=notrunc bs=1 seek=16 status=none } +# Check if kallsymso_prev and kallsymso differ +# If symbol sizes within ${kallsymso} change, any symbols within vmlinux are +# likely to shift, invalidating ${kallsymso}. +# Since file size can remain unchanged even if symbol sizes change, compare the +# actual symbols instead of relying on file size only. +kallsymso_changed() +{ + ${NM} -n "${kallsymso_prev}" > "${kallsymso_prev}.sym" + ${NM} -n "${kallsymso}" > "${kallsymso}.sym" + ! cmp -s "${kallsymso_prev}.sym" "${kallsymso}.sym" +} + # Create ${2} .S file with all symbols from the ${1} object file kallsyms() { @@ -269,7 +281,12 @@ if is_enabled CONFIG_KALLSYMS; then size1=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso_prev}) size2=$(${CONFIG_SHELL} "${srctree}/scripts/file-size.sh" ${kallsymso}) - if [ $size1 -ne $size2 ] || [ -n "${KALLSYMS_EXTRA_PASS}" ]; then + # Due to alignment, file size of the kallsymso object file might remain + # unchanged even if individual symbols within change size. Changed + # symbol sizes can still shift other symbols, though. Therefore, don't + # rely on file size alone. + if [ $size1 -ne $size2 ] || kallsymso_changed || \ + [ -n "${KALLSYMS_EXTRA_PASS}" ]; then kallsyms_step 3 fi fi -- 2.53.0