From mboxrd@z Thu Jan 1 00:00:00 1970 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 4FD711509BC; Tue, 20 Feb 2024 21:13:54 +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=1708463634; cv=none; b=mODXzxfdcKsAkSf1nJnEU+9w/gXU3KKelKhWkTxqP2/LOqret/1n0yjwGR0FYgiwpBoPf36lyEcCjFlRhPRnnowEy604JaTtDtydEE2mvhQp4ocR9CFou6j3zoO6zELfak2p6f200HTqN5J76pxyvRx6CGl4mxhzbNooAUW4edM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708463634; c=relaxed/simple; bh=Wd/1WhjFpQtO3GsgCkYw207kQYhDGrbM7nOi8hiiMnQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sSBuY4HE30zuF/zKW7kFE5bwA5lCrWJf73CDv7WLqPIDJVEvnwT7/+R69/rd5vwvtdGdxSqoJzMH0UtKjjikm+t00UVuztaCpzLVUMykkHXTAuNZljiajB1P4ReAl+RLFcR6H8XCsJGiQzk4vo2eyTNsFUuOtMhtl9cbb1uNeYs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HTbWZAx/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HTbWZAx/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1624C433F1; Tue, 20 Feb 2024 21:13:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708463634; bh=Wd/1WhjFpQtO3GsgCkYw207kQYhDGrbM7nOi8hiiMnQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HTbWZAx/cuAYeDjqlqh/Qk25njuUsrURLEYUIlGiYYEFwBr+PKAA5hTFXcq48WZVz Wpa2A1KgXlEz4F0p6T5wW4hYILrRrkm/yty5ZKuDFKxms1WTOQ3wVTQ8iGJwRvw/Gh 1yO10o1G1ymaznwjt5RVUfAmWHPiokhDH224v3FQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Masahiro Yamada , Arnd Bergmann , Ard Biesheuvel , Sasha Levin Subject: [PATCH 6.6 104/331] kallsyms: ignore ARMv4 thunks along with others Date: Tue, 20 Feb 2024 21:53:40 +0100 Message-ID: <20240220205640.860230015@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220205637.572693592@linuxfoundation.org> References: <20240220205637.572693592@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnd Bergmann [ Upstream commit a951884d82886d8453d489f84f20ac168d062b38 ] 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 Reviewed-by: Ard Biesheuvel Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- 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.43.0