From a6a3095d68343736c51dc9be5368b0dab7ed4bd4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 18 Jan 2024 11:16:24 +0100 Subject: [PATCH] 6.1-stable patches added patches: bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch btf-scripts-exclude-rust-cus-with-pahole.patch --- ..._optimized-to-pahole-flags-for-v1.25.patch | 44 +++++++++++ ...scripts-exclude-rust-cus-with-pahole.patch | 76 +++++++++++++++++++ queue-6.1/series | 2 + 3 files changed, 122 insertions(+) create mode 100644 queue-6.1/bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch create mode 100644 queue-6.1/btf-scripts-exclude-rust-cus-with-pahole.patch diff --git a/queue-6.1/bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch b/queue-6.1/bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch new file mode 100644 index 00000000000..8608b4bb728 --- /dev/null +++ b/queue-6.1/bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch @@ -0,0 +1,44 @@ +From 7b99f75942da332e3f4f865e55a10fec95a30d4f Mon Sep 17 00:00:00 2001 +From: Alan Maguire +Date: Wed, 10 May 2023 14:02:41 +0100 +Subject: bpf: Add --skip_encoding_btf_inconsistent_proto, --btf_gen_optimized to pahole flags for v1.25 + +From: Alan Maguire + +commit 7b99f75942da332e3f4f865e55a10fec95a30d4f upstream. + +v1.25 of pahole supports filtering out functions with multiple inconsistent +function prototypes or optimized-out parameters from the BTF representation. +These present problems because there is no additional info in BTF saying which +inconsistent prototype matches which function instance to help guide attachment, +and functions with optimized-out parameters can lead to incorrect assumptions +about register contents. + +So for now, filter out such functions while adding BTF representations for +functions that have "."-suffixes (foo.isra.0) but not optimized-out parameters. +This patch assumes that below linked changes land in pahole for v1.25. + +Issues with pahole filtering being too aggressive in removing functions +appear to be resolved now, but CI and further testing will confirm. + +Signed-off-by: Alan Maguire +Acked-by: Jiri Olsa +Link: https://lore.kernel.org/r/20230510130241.1696561-1-alan.maguire@oracle.com +Signed-off-by: Alexei Starovoitov +Signed-off-by: Jiri Olsa +Signed-off-by: Greg Kroah-Hartman +--- + scripts/pahole-flags.sh | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/scripts/pahole-flags.sh ++++ b/scripts/pahole-flags.sh +@@ -23,5 +23,8 @@ if [ "${pahole_ver}" -ge "124" ]; then + # see PAHOLE_HAS_LANG_EXCLUDE + extra_paholeopt="${extra_paholeopt} --lang_exclude=rust" + fi ++if [ "${pahole_ver}" -ge "125" ]; then ++ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_inconsistent_proto --btf_gen_optimized" ++fi + + echo ${extra_paholeopt} diff --git a/queue-6.1/btf-scripts-exclude-rust-cus-with-pahole.patch b/queue-6.1/btf-scripts-exclude-rust-cus-with-pahole.patch new file mode 100644 index 00000000000..4199457a9f9 --- /dev/null +++ b/queue-6.1/btf-scripts-exclude-rust-cus-with-pahole.patch @@ -0,0 +1,76 @@ +From c1177979af9c616661a126a80dd486ad0543b836 Mon Sep 17 00:00:00 2001 +From: Martin Rodriguez Reboredo +Date: Wed, 11 Jan 2023 12:20:50 -0300 +Subject: btf, scripts: Exclude Rust CUs with pahole + +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 +Signed-off-by: Jiri Olsa +Signed-off-by: Greg Kroah-Hartman +--- + init/Kconfig | 2 +- + lib/Kconfig.debug | 9 +++++++++ + scripts/pahole-flags.sh | 4 ++++ + 3 files changed, 14 insertions(+), 1 deletion(-) + +--- 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. +--- 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 +--- 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} diff --git a/queue-6.1/series b/queue-6.1/series index f1d0915cf3f..0c53bd74218 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -82,3 +82,5 @@ drm-crtc-fix-uninitialized-variable-use.patch alsa-hda-realtek-fix-mute-and-mic-mute-leds-for-hp-envy-x360-13-ay0xxx.patch acpi-resource-add-another-dmi-match-for-the-tongfang-gmxxgxx.patch asoc-sof-intel-hda-codec-delay-the-codec-device-registration.patch +btf-scripts-exclude-rust-cus-with-pahole.patch +bpf-add-skip_encoding_btf_inconsistent_proto-btf_gen_optimized-to-pahole-flags-for-v1.25.patch -- 2.47.3