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 A4FDB14003; Wed, 17 Jan 2024 09:44:39 +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=1705484679; cv=none; b=H1GnlUnbBRVd3sNeGtf8X8P+cyJlcT0HwFFa93c7xTMorFECav5AEoLlAstYCfj7mf8pqE/+LlViz+uE4PnMpcYvtcMPbpN1bUva2dM72wrgALUGzojmreBKgTxRpx0mtG3ya2lvP44tg9vpb87GCz0C8eUHI6+CMmQZa+wHNyo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705484679; c=relaxed/simple; bh=IY6on8fIAeOETPkvgR8MiN5QMYSUEF+zX8bkKiYLVgE=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding; b=UJssfYQmTcAot4YHohUyxWS60Yx2ef+5XLStDJJ3Rs52rV9eXqAIBzY+n0Z+zQqwzE32wc+9mKiDslgVk/kWZZ2vWA+r4QNyyhVS1xEnLyJamBqZc3T69z83mpezVig8UNQtp5XzKZUzCE9qF3XcFRprEte99swp9wgbZsOlPuM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j91C0Ulx; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="j91C0Ulx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DCE3BC433F1; Wed, 17 Jan 2024 09:44:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705484679; bh=IY6on8fIAeOETPkvgR8MiN5QMYSUEF+zX8bkKiYLVgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j91C0UlxZS6u+cKZHF8nXKYsE2oAXvWVuNWkCU44ssFJgCBrwuOVMCfdVuhsMK3yf O8MiEY3lQJ54XZ2T4YVdIMP+MKGpGxAr88b39fkRtLhvHneW8xySc17i6Y65W4ZCaK 5hqZQyAV7zjn1shE5bOAKmuTs9tAoPqsaAU26bPc/GCfN4BwaWSdRY85lkd8nWGtih O+JZj9T/igqlJ46ImZ+Bp/F9ZFNDHW7IS/5gbdLmMhxVQM4HArhAe+xHLpmHIooQ8o JDdaeX1tmQ1mwQ1p2IgLxODLlrQPQhUc8DXl63sCkIkIsDygo5r7kLE5QPRMyvgx4G kR9m/Tpg5iWyg== From: Jiri Olsa To: stable@vger.kernel.org Cc: Eric Curtin , Neal Gompa , Miguel Ojeda , Arnaldo Carvalho de Melo , bpf@vger.kernel.org, Daniel Borkmann , Martin Rodriguez Reboredo , Alan Maguire Subject: [PATCH stable 6.1 1/2] btf, scripts: Exclude Rust CUs with pahole Date: Wed, 17 Jan 2024 10:44:23 +0100 Message-ID: <20240117094424.487462-2-jolsa@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240117094424.487462-1-jolsa@kernel.org> References: <20240117094424.487462-1-jolsa@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Martin Rodriguez Reboredo commit c1177979af9c616661a126a80dd486ad0543b836 upstream. Version 1.24 of pahole has the capability to exclude compilation units (CUs) of specific languages [1] [2]. Rust, as of writing, is not currently supported by pahole and if it's used with a build that has BTF debugging enabled it results in malformed kernel and module binaries [3]. So it's better for pahole to exclude Rust CUs until support for it arrives. Co-developed-by: Eric Curtin Signed-off-by: Eric Curtin Signed-off-by: Martin Rodriguez Reboredo Signed-off-by: Daniel Borkmann Tested-by: Eric Curtin Reviewed-by: Neal Gompa Acked-by: Miguel Ojeda Acked-by: Arnaldo Carvalho de Melo Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=49358dfe2aaae4e90b072332c3e324019826783f [1] Link: https://git.kernel.org/pub/scm/devel/pahole/pahole.git/commit/?id=8ee363790b7437283c53090a85a9fec2f0b0fbc4 [2] Link: https://github.com/Rust-for-Linux/linux/issues/735 [3] Link: https://lore.kernel.org/bpf/20230111152050.559334-1-yakoyoku@gmail.com --- init/Kconfig | 2 +- lib/Kconfig.debug | 9 +++++++++ scripts/pahole-flags.sh | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/init/Kconfig b/init/Kconfig index de255842f5d0..148704640252 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1914,7 +1914,7 @@ config RUST depends on !MODVERSIONS depends on !GCC_PLUGINS depends on !RANDSTRUCT - depends on !DEBUG_INFO_BTF + depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE select CONSTRUCTORS help Enables Rust support in the kernel. diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 4db0199651f5..95541b99aa8e 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -364,6 +364,15 @@ config PAHOLE_HAS_BTF_TAG btf_decl_tag) or not. Currently only clang compiler implements these attributes, so make the config depend on CC_IS_CLANG. +config PAHOLE_HAS_LANG_EXCLUDE + def_bool PAHOLE_VERSION >= 124 + help + Support for the --lang_exclude flag which makes pahole exclude + compilation units from the supplied language. Used in Kbuild to + omit Rust CUs which are not supported in version 1.24 of pahole, + otherwise it would emit malformed kernel and module binaries when + using DEBUG_INFO_BTF_MODULES. + config DEBUG_INFO_BTF_MODULES def_bool y depends on DEBUG_INFO_BTF && MODULES && PAHOLE_HAS_SPLIT_BTF diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh index 0d99ef17e4a5..1f1f1d397c39 100755 --- a/scripts/pahole-flags.sh +++ b/scripts/pahole-flags.sh @@ -19,5 +19,9 @@ fi if [ "${pahole_ver}" -ge "122" ]; then extra_paholeopt="${extra_paholeopt} -j" fi +if [ "${pahole_ver}" -ge "124" ]; then + # see PAHOLE_HAS_LANG_EXCLUDE + extra_paholeopt="${extra_paholeopt} --lang_exclude=rust" +fi echo ${extra_paholeopt} -- 2.43.0