From: Greg Kroah-Hartman Date: Mon, 24 Jul 2023 07:09:54 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.41~11 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=57548fd39b67ac0feaf663a165854a2be42a1957;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: kallsyms-add-kallsyms_seqs_of_names-to-list-of-special-symbols.patch scripts-kallsyms-update-the-usage-in-the-comment-block.patch scripts-kallsyms.c-make-the-comment-up-to-date-with-current-implementation.patch --- diff --git a/queue-6.1/kallsyms-add-kallsyms_seqs_of_names-to-list-of-special-symbols.patch b/queue-6.1/kallsyms-add-kallsyms_seqs_of_names-to-list-of-special-symbols.patch new file mode 100644 index 00000000000..9d63e2e6348 --- /dev/null +++ b/queue-6.1/kallsyms-add-kallsyms_seqs_of_names-to-list-of-special-symbols.patch @@ -0,0 +1,41 @@ +From ced0f245ed951e2b8bd68f79c15238d7dd253662 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann +Date: Mon, 6 Mar 2023 11:14:50 +0100 +Subject: kallsyms: add kallsyms_seqs_of_names to list of special symbols + +From: Arnd Bergmann + +commit ced0f245ed951e2b8bd68f79c15238d7dd253662 upstream. + +My randconfig build setup ran into another kallsyms warning: + +Inconsistent kallsyms data +Try make KALLSYMS_EXTRA_PASS=1 as a workaround + +After adding some debugging code to kallsyms.c, I saw that the recently +added kallsyms_seqs_of_names symbol can sometimes cause the second stage +table to be slightly longer than the first stage, which makes the +build inconsistent. + +Add it to the exception table that contains all other kallsyms-generated +symbols. + +Fixes: 60443c88f3a8 ("kallsyms: Improve the performance of kallsyms_lookup_name()") +Signed-off-by: Arnd Bergmann +Reviewed-by: Zhen Lei +Signed-off-by: Masahiro Yamada +Signed-off-by: Greg Kroah-Hartman +--- + scripts/kallsyms.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/scripts/kallsyms.c ++++ b/scripts/kallsyms.c +@@ -118,6 +118,7 @@ static bool is_ignored_symbol(const char + "kallsyms_markers", + "kallsyms_token_table", + "kallsyms_token_index", ++ "kallsyms_seqs_of_names", + /* Exclude linker generated symbols which vary between passes */ + "_SDA_BASE_", /* ppc */ + "_SDA2_BASE_", /* ppc */ diff --git a/queue-6.1/scripts-kallsyms-update-the-usage-in-the-comment-block.patch b/queue-6.1/scripts-kallsyms-update-the-usage-in-the-comment-block.patch new file mode 100644 index 00000000000..73a6e73e44a --- /dev/null +++ b/queue-6.1/scripts-kallsyms-update-the-usage-in-the-comment-block.patch @@ -0,0 +1,31 @@ +From 79549da691edd4874c19d99c578a134471817c47 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Wed, 8 Mar 2023 20:52:43 +0900 +Subject: scripts/kallsyms: update the usage in the comment block + +From: Masahiro Yamada + +commit 79549da691edd4874c19d99c578a134471817c47 upstream. + +Commit 010a0aad39fc ("kallsyms: Correctly sequence symbols when +CONFIG_LTO_CLANG=y") added --lto-clang, and updated the usage() +function, but not the comment. Update it in the same way. + +Signed-off-by: Masahiro Yamada +Reviewed-by: Nick Desaulniers +Signed-off-by: Greg Kroah-Hartman +--- + scripts/kallsyms.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/kallsyms.c ++++ b/scripts/kallsyms.c +@@ -6,7 +6,7 @@ + * of the GNU General Public License, incorporated herein by reference. + * + * Usage: kallsyms [--all-symbols] [--absolute-percpu] +- * [--base-relative] in.map > out.S ++ * [--base-relative] [--lto-clang] in.map > out.S + * + * Table compression uses all the unused char codes on the symbols and + * maps these to the most used substrings (tokens). For instance, it might diff --git a/queue-6.1/scripts-kallsyms.c-make-the-comment-up-to-date-with-current-implementation.patch b/queue-6.1/scripts-kallsyms.c-make-the-comment-up-to-date-with-current-implementation.patch new file mode 100644 index 00000000000..c80419e2947 --- /dev/null +++ b/queue-6.1/scripts-kallsyms.c-make-the-comment-up-to-date-with-current-implementation.patch @@ -0,0 +1,34 @@ +From adc40221bf676f3e722d135889a7b913b4162dc2 Mon Sep 17 00:00:00 2001 +From: Yuma Ueda +Date: Fri, 18 Nov 2022 22:36:31 +0900 +Subject: scripts/kallsyms.c Make the comment up-to-date with current implementation + +From: Yuma Ueda + +commit adc40221bf676f3e722d135889a7b913b4162dc2 upstream. + +The comment in scripts/kallsyms.c describing the usage of +scripts/kallsyms does not reflect the latest implementation. +Fix the comment to be equivalent to what the usage() function prints. + +Signed-off-by: Yuma Ueda +Reviewed-by: Miguel Ojeda +Link: https://lore.kernel.org/r/20221118133631.4554-1-cyan@0x00a1e9.dev +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman +--- + scripts/kallsyms.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/scripts/kallsyms.c ++++ b/scripts/kallsyms.c +@@ -5,7 +5,8 @@ + * This software may be used and distributed according to the terms + * of the GNU General Public License, incorporated herein by reference. + * +- * Usage: nm -n vmlinux | scripts/kallsyms [--all-symbols] > symbols.S ++ * Usage: kallsyms [--all-symbols] [--absolute-percpu] ++ * [--base-relative] in.map > out.S + * + * Table compression uses all the unused char codes on the symbols and + * maps these to the most used substrings (tokens). For instance, it might diff --git a/queue-6.1/series b/queue-6.1/series index d429e34ca08..edfd23ded46 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -166,3 +166,6 @@ jbd2-recheck-chechpointing-non-dirty-buffer.patch tracing-histograms-return-an-error-if-we-fail-to-add-histogram-to-hist_vars-list.patch drm-ttm-fix-bulk_move-corruption-when-adding-a-entry.patch spi-dw-remove-misleading-comment-for-mount-evans-soc.patch +kallsyms-add-kallsyms_seqs_of_names-to-list-of-special-symbols.patch +scripts-kallsyms.c-make-the-comment-up-to-date-with-current-implementation.patch +scripts-kallsyms-update-the-usage-in-the-comment-block.patch