Received: by 2002:a05:7412:1e0b:b0:fc:a2b0:25d7 with SMTP id kr11csp330100rdb; Thu, 15 Feb 2024 01:05:49 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXSEQe9KerahRLeTArcecnXcVvGf1wcRdCWJ64nCff3tLl5Y8AlDN17eXy0s299oPqSsVRzXcBSV4UwbutSSv7Ty4Xt2qTA+gK2VrNG2Q== X-Google-Smtp-Source: AGHT+IExTAWQbQZLGy1xuSc2KcYEDIy88tcths0o7unTgPfRmw/WAgxQ3IN7ZFPPAvpQQ2Uz1z3A X-Received: by 2002:a05:6a20:9c8b:b0:19e:aa16:2189 with SMTP id mj11-20020a056a209c8b00b0019eaa162189mr1408976pzb.42.1707987949473; Thu, 15 Feb 2024 01:05:49 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707987949; cv=pass; d=google.com; s=arc-20160816; b=x9uvffqZUZpFXiG24nDtqbBISTryMJ/cGJnxrVQA8FCxqKFn56nqbGg4YD/F+Q177A Diaqt5G8EJ68r16DROwSwwfnX1UMF1KZQwUg4eMEv2+/6c2M609bxYMjaqeJdtyrallY 83f5xlxTDdpFEXPzbnnagnBsxAe9in49tCEJIPJMWPCBUOlziwXfkqn284bAIqRmJduH 3/JMaXyKk0TITyl/HGSADEzsc07Gor0KijsD3JEDnPLsb3kPgLRUvqAWM2rhA0Bm8ZqS 7U38YIa/bHKV6rFAsg1mf6bWY0zfUUXVug2mKip9bGzBPHGoOIiKT7HxXm/r3Wf4+CYY /7lQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=9yei4yE4F7M+3XF3mhk4Fo3c+mqlCoU6JxdvVex6G64=; fh=x5xJqo5CDSr2iiM9FJHp/aIv64j76InavPkx23duqiY=; b=dXHXKFPDijL0tAvybU5KC0/JnoGamzzyM4NCXNl0jOB2jfY6jKZCR2hlAdCV0BeBfp RU3G+dy6RgHyk9kbIE9Pm2kJhS2S1a/4g7HVDXc7mTQjFOGdUCL/j85O1D0nrZOmdrZT 4TFa0usHDgbUCqpEq2sdXWMxFpzKNVKH/AT5I9pk5x9h6BamMkhMw/zMTNVj0bJ8EjTl iGjSeblMsb30oYFYmIKH1A45wsOnU+vYZ7sjXU76lKLG06Or2Wqvucr00HgZhyOqVHP6 txiOxX+WrthV12sGrLs0HNmAHG1OUJBDjqFBV49mMw3JuiRXZn9y31sXNxyUXg8zMipd EL/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i8QsKOXK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-66419-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66419-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id be15-20020a056a001f0f00b006e0f4907ebasi834692pfb.113.2024.02.15.01.05.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 01:05:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-66419-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=i8QsKOXK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-66419-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-66419-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 41605B25D67 for ; Thu, 15 Feb 2024 08:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9E021125CD; Thu, 15 Feb 2024 08:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="i8QsKOXK" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C9AE0B67D; Thu, 15 Feb 2024 08:32:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707985951; cv=none; b=scFJ6IA2rSFVXstrJY6Gse8NZy1XolZC6a0kLymwkagHGUMrdSAWeREiFNVIOOpSt0GCKyQ4owJIs1v1SYSR2XB6GukXtDUwr6EP/QL5uDa8E5dHz3YiklFtjTN6LhpVZNFj4N4gbUphhdcU/Kg1qHFJyqeEZfz69glzt8A9Vmo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707985951; c=relaxed/simple; bh=UGfF3lZh/KRtVtdUp6G6TZfp0sNrsZF0XSORI0xUMqc=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=t/mRUZrrHF+pyq17F9j9WVDurhskwxTAgFPiUdXnmEVxM4Lm9lb3ddsJX301A9dSwrhOWLMvzp65P83dvV2YgNX+VaLAZCRm8ZQBrIYswJ4RFExOWBpwWm4FMZFl5LjiDrVyo8FlHv+JRDfbE6NER3W90Sn5AAeJaIlCiPJQN+4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i8QsKOXK; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A71FC433F1; Thu, 15 Feb 2024 08:32:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707985951; bh=UGfF3lZh/KRtVtdUp6G6TZfp0sNrsZF0XSORI0xUMqc=; h=From:To:Cc:Subject:Date:From; b=i8QsKOXKyHAd6n28S9dhVqcePsxd7+GXhKkS0K6gYkoj6rN9LqZ0Rc0QgZiG1WZJu EW3mQrItGu4KHyMPz12l9rhBTpYClYR4MN+UWhFyF1dTjO/Z/DieqmrTYwjY1F21id tad+V68IP0d5n4lIQjhUELQMdh+lojWDIc/fUYYhfz5hshSl4mv8ruEG+ntj/ZDng5 8gUJqbVJBI77WMkSVfI9ims40OuBZUZ+VfhwskM2AkUgnfekCz2pnukWlZEp7kVUIG 6zElqNqeDA4KRJ+rVBGNOml2711HtD7oE0KnGfTja69xEjloD3YPq8j8nAD5LwmfeI koCu3N2PTpowQ== From: Arnd Bergmann To: Masahiro Yamada , Arnd Bergmann Cc: Nathan Chancellor , Nicolas Schier , =?UTF-8?q?Pierre-Cl=C3=A9ment=20Tosi?= , Nick Desaulniers , Ard Biesheuvel , "Russell King (Oracle)" , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] [v2] kallsyms: ignore ARMv4 thunks along with others Date: Thu, 15 Feb 2024 09:32:08 +0100 Message-Id: <20240215083225.3976252-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnd Bergmann lld is now able to build ARMv4 and ARMv4T kernels, which means it can generate thunks for those (__ARMv4PILongThunk_*, __ARMv4PILongBXThunk_*) that can interfere with kallsyms table generation since they do not get ignore like the corresponding ARMv5+ ones are: Inconsistent kallsyms data Try "make KALLSYMS_EXTRA_PASS=1" as a workaround Replace the hardcoded list of thunk symbols with a more general regex that covers this one along with future symbols that follow the same pattern. Fixes: 5eb6e280432d ("ARM: 9289/1: Allow pre-ARMv5 builds with ld.lld 16.0.0 and newer") Fixes: efe6e3068067 ("kallsyms: fix nonconverging kallsyms table with lld") Suggested-by: Masahiro Yamada Signed-off-by: Arnd Bergmann --- v2: use a regular expression instead of listing each one. --- scripts/mksysmap | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scripts/mksysmap b/scripts/mksysmap index 9ba1c9da0a40..57ff5656d566 100755 --- a/scripts/mksysmap +++ b/scripts/mksysmap @@ -48,17 +48,8 @@ ${NM} -n ${1} | sed >${2} -e " / __kvm_nvhe_\\$/d / __kvm_nvhe_\.L/d -# arm64 lld -/ __AArch64ADRPThunk_/d - -# arm lld -/ __ARMV5PILongThunk_/d -/ __ARMV7PILongThunk_/d -/ __ThumbV7PILongThunk_/d - -# mips lld -/ __LA25Thunk_/d -/ __microLA25Thunk_/d +# lld arm/aarch64/mips thunks +/ __[[:alnum:]]*Thunk_/d # CFI type identifiers / __kcfi_typeid_/d -- 2.39.2