Skip to contentSkip to conversation

Patch "perf symbols: Check symbol_conf.allow_aliases for kallsyms loading too" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Oct 29, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

perf symbols: Check symbol_conf.allow_aliases for kallsyms loading too

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-symbols-check-symbol_conf.allow_aliases-for-kallsyms-loading-too.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From c97b40e4d15f13a36cd037d598e45cbe9e1e5757 Mon Sep 17 00:00:00 2001

From: Arnaldo Carvalho de Melo <[email protected]>
Date: Thu, 1 Sep 2016 10:56:06 -0300
Subject: perf symbols: Check symbol_conf.allow_aliases for kallsyms loading too

From: Arnaldo Carvalho de Melo <[email protected]>

commit c97b40e4d15f13a36cd037d598e45cbe9e1e5757 upstream.

We can allow aliases to be kept, but we were checking this just when loading vmlinux files, be consistent, do it for any symbol table loading code that calls symbol__fixup_duplicate() by making this function check .allow_aliases instead.

Cc Adrian Hunter <[email protected]>
Cc David Ahern <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Masami Hiramatsu <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Wang Nan <[email protected]>
Fixes 680d926a8cb0 ("perf symbols: Allow symbol alias when loading map for symbol name")
---
 tools/perf/util/symbol-elf.c |    3 +--
 tools/perf/util/symbol.c     |    3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)
tools/perf/util/symbol-elf.c +1 -2
@@ -1113,8 +1113,7 @@ new_symbol:
 	 * For misannotated, zeroed, ASM function sizes.
 	 */
 	if (nr > 0) {
-		if (!symbol_conf.allow_aliases)
-			symbols__fixup_duplicate(&dso->symbols[map->type]);
+		symbols__fixup_duplicate(&dso->symbols[map->type]);
 		symbols__fixup_end(&dso->symbols[map->type]);
 		if (kmap) {
 			/*
tools/perf/util/symbol.c +3 -0
@@ -152,6 +152,9 @@ void symbols__fixup_duplicate(struct rb_
 	struct rb_node *nd;
 	struct symbol *curr, *next;
 
+	if (symbol_conf.allow_aliases)
+		return;
+
 	nd = rb_first(symbols);
 
 	while (nd) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/perf-ui-stdio-always-reset-output-width-for-hierarchy.patch queue-4.8/perf-ui-tui-reset-output-width-for-hierarchy.patch queue-4.8/perf-powerpc-fix-build-test-failure.patch queue-4.8/perf-data-fix-building-in-32-bit-platform-with-libbabeltrace.patch queue-4.8/perf-hists-browser-fix-event-group-display.patch queue-4.8/perf-symbols-check-symbol_conf.allow_aliases-for-kallsyms-loading-too.patch queue-4.8/perf-symbols-fixup-symbol-sizes-before-picking-best-ones.patch