From nobody Sat Jun 13 21:05:38 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 86B6148A2B7; Tue, 5 May 2026 10:56:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978614; cv=none; b=ZCWxW2KZNjtoRqGpqiCGfhzn5LP0V6gc0+EYuwF9PdPrcQv59EqPz4pFJLr0y+iByTQP3hCsEm78uRAC2U52CwTczfc0UVCSZWSz79YXbMluCULG3RKZCvIvn6H7kQ3G0GRrhNWy96mzZlMVAQjLoj84E4CXpFxQFtP47CuwXGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777978614; c=relaxed/simple; bh=oL/eUA6BU1PPEW7yedmSNa5evfrqhD+A4CMssOzT1Go=; h=Date:From:To:Subject:Cc:MIME-Version:Message-ID:Content-Type; b=hToweAgFUTrlg+0jgs7oI7GlQN8KtBxWdpZ/fj0zMkg51urdIQre4n0XbPTUnEco4C8FUyUKVpdfyyj87IfnyD/bjvebrgxLGHDZeK4mVXKVbjU0FTg02LQ6t0I5eDXiQE1X6c3jZe9905LQb1gf8fa2xf3pjRVYNVQxbPq48DU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=bS+cWl+z; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=jEU68kHM; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="bS+cWl+z"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="jEU68kHM" Date: Tue, 05 May 2026 10:56:50 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1777978611; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NZSSopCSgz2pXTjABcq9CnOngvOnNYFtr7bEUYfuRY=; b=bS+cWl+z62OCLYbdNPCIzGV401aKoXb6GCa+rj4kOriGy2CjBnjKRtwC5K1ygzKcx2vB8A p9rfYHtU7cCIzgRoU/lGKGdy5lgujjlL8RuEKL3m/jNLmCFqjCtQh9VTFKfBQi+zFNBd+i c2/Dogblml0ZCsqIEK4UZZ1+v5EthrmsKgJtLxMSB2+HkhHn1/G/81RPKOd+KmwYq3L1ag CEiuQowciTjjHTyv7rjkh/SPLibCvdM5BenQ0cVmf0iqoiCKaX7hcxRMMIZE/Mkva+EK9o Mv8tophYyr2lJXSLMRGXSyeFJcG9+Ncn8bxINeZSZxYtcFzNF2AvLhwfgBjAAQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1777978611; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9NZSSopCSgz2pXTjABcq9CnOngvOnNYFtr7bEUYfuRY=; b=jEU68kHMtiI8L3y2629vCdjdsmuiaVqlLAm4QpD+0sIwP5w9n/KGDKLICesC9yFVqdrICb ecFhUUZxowHOx1DQ== From: "tip-bot2 for Josh Poimboeuf" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: objtool/core] objtool/klp: Don't correlate absolute symbols Cc: Song Liu , Miroslav Benes , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177797861004.424702.1336675591136186627.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the objtool/core branch of tip: Commit-ID: 710c4c254688c37478fb72a0e870afad1f54715f Gitweb: https://git.kernel.org/tip/710c4c254688c37478fb72a0e870afad1= f54715f Author: Josh Poimboeuf AuthorDate: Sun, 12 Apr 2026 19:25:19 -07:00 Committer: Josh Poimboeuf CommitterDate: Mon, 04 May 2026 21:15:59 -07:00 objtool/klp: Don't correlate absolute symbols Some arch/x86/crypto/*.S files define local .set/.equ constants that get duplicated in vmlinux.o. This causes klp-diff to fail with "Multiple correlation candidates" errors since it can't uniquely match these between orig and patched builds. Skip ABS symbols in dont_correlate(). They're purely compile-time assembly constants that are never referenced by relocations, so they don't need correlation. Acked-by: Song Liu Reviewed-by: Miroslav Benes Signed-off-by: Josh Poimboeuf --- tools/objtool/klp-diff.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/objtool/klp-diff.c b/tools/objtool/klp-diff.c index 36753ee..27ebe1b 100644 --- a/tools/objtool/klp-diff.c +++ b/tools/objtool/klp-diff.c @@ -362,6 +362,15 @@ static bool is_addressable_sym(struct symbol *sym) } =20 /* + * ABS symbols are typically assembly .set/.equ constants which are never + * referenced by relocations. (Exclude FILE symbols which are also SHN_AB= S.) + */ +static bool is_abs_sym(struct symbol *sym) +{ + return sym->sym.st_shndx =3D=3D SHN_ABS && !is_file_sym(sym); +} + +/* * These symbols should never be correlated, so their local patched versio= ns * are used instead of linking to the originals. */ @@ -370,6 +379,7 @@ static bool dont_correlate(struct symbol *sym) return is_file_sym(sym) || is_null_sym(sym) || is_sec_sym(sym) || + is_abs_sym(sym) || is_prefix_func(sym) || is_uncorrelated_static_local(sym) || is_clang_tmp_label(sym) ||