Commit d7731b81 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'perf-urgent-for-mingo-5.3-20190808' of... 

Merge tag 'perf-urgent-for-mingo-5.3-20190808' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

perf/urgent fixes:

db-export:

  Adrian Hunter:

  - Fix thread__exec_comm() picking of main thread COMM for pre-existing,
    synthesized from /proc data records.

annotate:

  Arnaldo Carvalho de Melo:

  - Fix printing of unaugmented disassembled instructions from BPF, some
    lines were leaving leftovers from the previous screen, due to use of
    newlines by binutils's libopcode disassembler.

perf ftrace:

  He Zhe:

  - Fix cpumask problems when only one CPU is present.

PMU events:

  Jin Yao:

  - Add missing "cpu_clk_unhalted.core" event.

perf bench:

  Jiri Olsa:

  - Fix cpu0 binding in the NUMA benchmarks.

s390:

  Thomas Richter:

  - Fix module size calculations.

build system:

  Masanari Iida:

  - Fix a typo in a variable name in the Documentation Makefile

misc:

  Ian Rogers:

  - Fix include paths in ui directory.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents b3c303be 8e6e5bea

tools/perf/Documentation/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ $(OUTPUT)doc.dep : $(wildcard *.txt) build-docdep.perl 
	$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \

	mv $@+ $@



-include $(OUPTUT)doc.dep

-include $(OUTPUT)doc.dep



_cmds_txt = cmds-ancillaryinterrogators.txt \

	cmds-ancillarymanipulators.txt \

tools/perf/arch/s390/util/machine.c

+30 −1
Original line number Diff line number Diff line
@@ -6,8 +6,9 @@ 
#include "machine.h"

#include "api/fs/fs.h"

#include "debug.h"

#include "symbol.h"



int arch__fix_module_text_start(u64 *start, const char *name)

int arch__fix_module_text_start(u64 *start, u64 *size, const char *name)

{

	u64 m_start = *start;

	char path[PATH_MAX];
@@ -17,7 +18,35 @@ int arch__fix_module_text_start(u64 *start, const char *name) 
	if (sysfs__read_ull(path, (unsigned long long *)start) < 0) {

		pr_debug2("Using module %s start:%#lx\n", path, m_start);

		*start = m_start;

	} else {

		/* Successful read of the modules segment text start address.

		 * Calculate difference between module start address

		 * in memory and module text segment start address.

		 * For example module load address is 0x3ff8011b000

		 * (from /proc/modules) and module text segment start

		 * address is 0x3ff8011b870 (from file above).

		 *

		 * Adjust the module size and subtract the GOT table

		 * size located at the beginning of the module.

		 */

		*size -= (*start - m_start);

	}



	return 0;

}



/* On s390 kernel text segment start is located at very low memory addresses,

 * for example 0x10000. Modules are located at very high memory addresses,

 * for example 0x3ff xxxx xxxx. The gap between end of kernel text segment

 * and beginning of first module's text segment is very big.

 * Therefore do not fill this gap and do not assign it to the kernel dso map.

 */

void arch__symbols__fixup_end(struct symbol *p, struct symbol *c)

{

	if (strchr(p->name, '[') == NULL && strchr(c->name, '['))

		/* Last kernel symbol mapped to end of page */

		p->end = roundup(p->end, page_size);

	else

		p->end = c->start;

	pr_debug4("%s sym:%s end:%#lx\n", __func__, p->name, p->end);

}

tools/perf/bench/numa.c

+4 −2
Original line number Diff line number Diff line
@@ -379,8 +379,10 @@ static u8 *alloc_data(ssize_t bytes0, int map_flags, 


	/* Allocate and initialize all memory on CPU#0: */

	if (init_cpu0) {

		orig_mask = bind_to_node(0);

		bind_to_memnode(0);

		int node = numa_node_of_cpu(0);



		orig_mask = bind_to_node(node);

		bind_to_memnode(node);

	}



	bytes = bytes0 + HPSIZE;

tools/perf/builtin-ftrace.c

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ static int set_tracing_cpumask(struct cpu_map *cpumap) 
	int last_cpu;



	last_cpu = cpu_map__cpu(cpumap, cpumap->nr - 1);

	mask_size = (last_cpu + 3) / 4 + 1;

	mask_size = last_cpu / 4 + 2; /* one more byte for EOS */

	mask_size += last_cpu / 32; /* ',' is needed for every 32th cpus */



	cpumask = malloc(mask_size);

tools/perf/pmu-events/jevents.c

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ static struct fixed { 
	{ "inst_retired.any_p", "event=0xc0" },

	{ "cpu_clk_unhalted.ref", "event=0x0,umask=0x03" },

	{ "cpu_clk_unhalted.thread", "event=0x3c" },

	{ "cpu_clk_unhalted.core", "event=0x3c" },

	{ "cpu_clk_unhalted.thread_any", "event=0x3c,any=1" },

	{ NULL, NULL},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE