From: Greg Kroah-Hartman Date: Mon, 8 Aug 2016 13:17:56 +0000 (+0200) Subject: delete perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch X-Git-Tag: v3.14.75~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77434e724a1702ed864ef900b0ff088355165963;p=thirdparty%2Fkernel%2Fstable-queue.git delete perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch --- diff --git a/queue-4.4/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch b/queue-4.4/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch deleted file mode 100644 index 7b93a4fd2a1..00000000000 --- a/queue-4.4/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 53d0fe68275dbdaf6a532bb4e87f00db5d36c140 Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Tue, 19 Apr 2016 12:16:55 -0300 -Subject: perf test: Ignore kcore files in the "vmlinux matches kallsyms" test - -From: Arnaldo Carvalho de Melo - -commit 53d0fe68275dbdaf6a532bb4e87f00db5d36c140 upstream. - -Before: - - # perf test -v kallsyms - - Maps only in vmlinux: - ffffffff81d5e000-ffffffff81ec3ac8 115e000 [kernel].init.text - ffffffff81ec3ac8-ffffffffa0000000 12c3ac8 [kernel].exit.text - ffffffffa0000000-ffffffffa000c000 0 [fjes] - ffffffffa000c000-ffffffffa0017000 0 [video] - ffffffffa0017000-ffffffffa001c000 0 [grace] - - ffffffffa0a7f000-ffffffffa0ba5000 0 [xfs] - ffffffffa0ba5000-ffffffffffffffff 0 [veth] - Maps in vmlinux with a different name in kallsyms: - Maps only in kallsyms: - ffff880000100000-ffff88001000b000 80000103000 [kernel.kallsyms] - ffff88001000b000-ffff880100000000 8001000e000 [kernel.kallsyms] - ffff880100000000-ffffc90000000000 80100003000 [kernel.kallsyms] - - ffffffffa0000000-ffffffffff600000 7fffa0003000 [kernel.kallsyms] - ffffffffff600000-ffffffffffffffff 7fffff603000 [kernel.kallsyms] - test child finished with -1 - ---- end ---- - vmlinux symtab matches kallsyms: FAILED! - # - -After: - - # perf test -v 1 - 1: vmlinux symtab matches kallsyms : - --- start --- - test child forked, pid 7058 - Looking at the vmlinux_path (8 entries long) - Using /lib/modules/4.6.0-rc1+/build/vmlinux for symbols - 0xffffffff81076870: diff end addr for aesni_gcm_dec v: 0xffffffff810791f2 k: 0xffffffff81076902 - 0xffffffff81079200: diff end addr for aesni_gcm_enc v: 0xffffffff8107bb03 k: 0xffffffff81079292 - 0xffffffff8107e8d0: diff end addr for aesni_gcm_enc_avx_gen2 v: 0xffffffff81083e76 k: 0xffffffff8107e943 - 0xffffffff81083e80: diff end addr for aesni_gcm_dec_avx_gen2 v: 0xffffffff81089611 k: 0xffffffff81083ef3 - 0xffffffff81089990: diff end addr for aesni_gcm_enc_avx_gen4 v: 0xffffffff8108e7c4 k: 0xffffffff81089a03 - 0xffffffff8108e7d0: diff end addr for aesni_gcm_dec_avx_gen4 v: 0xffffffff810937ef k: 0xffffffff8108e843 - Maps only in vmlinux: - ffffffff81d5e000-ffffffff81ec3ac8 115e000 [kernel].init.text - ffffffff81ec3ac8-ffffffffa0000000 12c3ac8 [kernel].exit.text - Maps in vmlinux with a different name in kallsyms: - Maps only in kallsyms: - test child finished with -1 - ---- end ---- - vmlinux symtab matches kallsyms: FAILED! - # - -Cc: Adrian Hunter -Cc: David Ahern -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: Wang Nan -Fixes: 8e0cf965f95e ("perf symbols: Add support for reading from /proc/kcore") -Link: http://lkml.kernel.org/n/tip-n6vrwt9t89w8k769y349govx@git.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Greg Kroah-Hartman - ---- - tools/perf/tests/vmlinux-kallsyms.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/tools/perf/tests/vmlinux-kallsyms.c -+++ b/tools/perf/tests/vmlinux-kallsyms.c -@@ -54,8 +54,14 @@ int test__vmlinux_matches_kallsyms(void) - * Step 3: - * - * Load and split /proc/kallsyms into multiple maps, one per module. -+ * Do not use kcore, as this test was designed before kcore support -+ * and has parts that only make sense if using the non-kcore code. -+ * XXX: extend it to stress the kcorre code as well, hint: the list -+ * of modules extracted from /proc/kcore, in its current form, can't -+ * be compacted against the list of modules found in the "vmlinux" -+ * code and with the one got from /proc/modules from the "kallsyms" code. - */ -- if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, NULL) <= 0) { -+ if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true, NULL) <= 0) { - pr_debug("dso__load_kallsyms "); - goto out; - } diff --git a/queue-4.4/series b/queue-4.4/series index c72620ab7b8..0dc6975bcde 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,7 +12,6 @@ mm-compaction-prevent-vm_bug_on-when-terminating-freeing-scanner.patch mm-meminit-always-return-a-valid-node-from-early_pfn_to_nid.patch mm-meminit-ensure-node-is-online-before-checking-whether-pages-are-uninitialised.patch vmlinux.lds-account-for-destructor-sections.patch -perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch pps-do-not-crash-when-failed-to-register.patch kernel-sysrq-watchdog-sched-core-reset-watchdog-on-all-cpus-while-processing-sysrq-w.patch arc-unwind-warn-only-once-if-dw2_unwind-is-disabled.patch diff --git a/queue-4.6/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch b/queue-4.6/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch deleted file mode 100644 index 77bb527e350..00000000000 --- a/queue-4.6/perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 53d0fe68275dbdaf6a532bb4e87f00db5d36c140 Mon Sep 17 00:00:00 2001 -From: Arnaldo Carvalho de Melo -Date: Tue, 19 Apr 2016 12:16:55 -0300 -Subject: perf test: Ignore kcore files in the "vmlinux matches kallsyms" test - -From: Arnaldo Carvalho de Melo - -commit 53d0fe68275dbdaf6a532bb4e87f00db5d36c140 upstream. - -Before: - - # perf test -v kallsyms - - Maps only in vmlinux: - ffffffff81d5e000-ffffffff81ec3ac8 115e000 [kernel].init.text - ffffffff81ec3ac8-ffffffffa0000000 12c3ac8 [kernel].exit.text - ffffffffa0000000-ffffffffa000c000 0 [fjes] - ffffffffa000c000-ffffffffa0017000 0 [video] - ffffffffa0017000-ffffffffa001c000 0 [grace] - - ffffffffa0a7f000-ffffffffa0ba5000 0 [xfs] - ffffffffa0ba5000-ffffffffffffffff 0 [veth] - Maps in vmlinux with a different name in kallsyms: - Maps only in kallsyms: - ffff880000100000-ffff88001000b000 80000103000 [kernel.kallsyms] - ffff88001000b000-ffff880100000000 8001000e000 [kernel.kallsyms] - ffff880100000000-ffffc90000000000 80100003000 [kernel.kallsyms] - - ffffffffa0000000-ffffffffff600000 7fffa0003000 [kernel.kallsyms] - ffffffffff600000-ffffffffffffffff 7fffff603000 [kernel.kallsyms] - test child finished with -1 - ---- end ---- - vmlinux symtab matches kallsyms: FAILED! - # - -After: - - # perf test -v 1 - 1: vmlinux symtab matches kallsyms : - --- start --- - test child forked, pid 7058 - Looking at the vmlinux_path (8 entries long) - Using /lib/modules/4.6.0-rc1+/build/vmlinux for symbols - 0xffffffff81076870: diff end addr for aesni_gcm_dec v: 0xffffffff810791f2 k: 0xffffffff81076902 - 0xffffffff81079200: diff end addr for aesni_gcm_enc v: 0xffffffff8107bb03 k: 0xffffffff81079292 - 0xffffffff8107e8d0: diff end addr for aesni_gcm_enc_avx_gen2 v: 0xffffffff81083e76 k: 0xffffffff8107e943 - 0xffffffff81083e80: diff end addr for aesni_gcm_dec_avx_gen2 v: 0xffffffff81089611 k: 0xffffffff81083ef3 - 0xffffffff81089990: diff end addr for aesni_gcm_enc_avx_gen4 v: 0xffffffff8108e7c4 k: 0xffffffff81089a03 - 0xffffffff8108e7d0: diff end addr for aesni_gcm_dec_avx_gen4 v: 0xffffffff810937ef k: 0xffffffff8108e843 - Maps only in vmlinux: - ffffffff81d5e000-ffffffff81ec3ac8 115e000 [kernel].init.text - ffffffff81ec3ac8-ffffffffa0000000 12c3ac8 [kernel].exit.text - Maps in vmlinux with a different name in kallsyms: - Maps only in kallsyms: - test child finished with -1 - ---- end ---- - vmlinux symtab matches kallsyms: FAILED! - # - -Cc: Adrian Hunter -Cc: David Ahern -Cc: Jiri Olsa -Cc: Namhyung Kim -Cc: Wang Nan -Fixes: 8e0cf965f95e ("perf symbols: Add support for reading from /proc/kcore") -Link: http://lkml.kernel.org/n/tip-n6vrwt9t89w8k769y349govx@git.kernel.org -Signed-off-by: Arnaldo Carvalho de Melo -Signed-off-by: Greg Kroah-Hartman - ---- - tools/perf/tests/vmlinux-kallsyms.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - ---- a/tools/perf/tests/vmlinux-kallsyms.c -+++ b/tools/perf/tests/vmlinux-kallsyms.c -@@ -54,8 +54,14 @@ int test__vmlinux_matches_kallsyms(int s - * Step 3: - * - * Load and split /proc/kallsyms into multiple maps, one per module. -+ * Do not use kcore, as this test was designed before kcore support -+ * and has parts that only make sense if using the non-kcore code. -+ * XXX: extend it to stress the kcorre code as well, hint: the list -+ * of modules extracted from /proc/kcore, in its current form, can't -+ * be compacted against the list of modules found in the "vmlinux" -+ * code and with the one got from /proc/modules from the "kallsyms" code. - */ -- if (machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, NULL) <= 0) { -+ if (__machine__load_kallsyms(&kallsyms, "/proc/kallsyms", type, true, NULL) <= 0) { - pr_debug("dso__load_kallsyms "); - goto out; - } diff --git a/queue-4.6/series b/queue-4.6/series index bf5bc4284b4..3f265536612 100644 --- a/queue-4.6/series +++ b/queue-4.6/series @@ -16,7 +16,6 @@ uapi-export-lirc.h-header.patch mm-meminit-always-return-a-valid-node-from-early_pfn_to_nid.patch mm-meminit-ensure-node-is-online-before-checking-whether-pages-are-uninitialised.patch vmlinux.lds-account-for-destructor-sections.patch -perf-test-ignore-kcore-files-in-the-vmlinux-matches-kallsyms-test.patch mm-thp-refix-false-positive-bug-in-page_move_anon_rmap.patch mm-memcontrol-fix-cgroup-creation-failure-after-many-small-jobs.patch radix-tree-fix-radix_tree_iter_retry-for-tagged-iterators.patch