Commit 3e71713c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.18-2022-04-29' of... 

Merge tag 'perf-tools-fixes-for-v5.18-2022-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix Intel PT (Processor Trace) timeless decoding with perf.data
   directory.

 - ARM SPE (Statistical Profiling Extensions) address fixes, for
   synthesized events and for SPE events with physical addresses. Add a
   simple 'perf test' entry to make sure this doesn't regress.

 - Remove arch specific processing of kallsyms data to fixup symbol end
   address, fixing excessive memory consumption in the annotation code.

* tag 'perf-tools-fixes-for-v5.18-2022-04-29' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf symbol: Remove arch__symbols__fixup_end()
  perf symbol: Update symbols__fixup_end()
  perf symbol: Pass is_kallsyms to symbols__fixup_end()
  perf test: Add perf_event_attr test for Arm SPE
  perf arm-spe: Fix SPE events with phys addresses
  perf arm-spe: Fix addresses of synthesized SPE events
  perf intel-pt: Fix timeless decoding with perf.data directory
parents 2d0de93c a5d20d42

tools/perf/arch/arm64/util/arm-spe.c

+10 −0
Original line number Diff line number Diff line
@@ -148,6 +148,7 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	bool privileged = perf_event_paranoid_check(-1);

	struct evsel *tracking_evsel;

	int err;

	u64 bit;



	sper->evlist = evlist;
@@ -245,6 +246,15 @@ static int arm_spe_recording_options(struct auxtrace_record *itr, 
	 */

	evsel__set_sample_bit(arm_spe_evsel, DATA_SRC);



	/*

	 * The PHYS_ADDR flag does not affect the driver behaviour, it is used to

	 * inform that the resulting output's SPE samples contain physical addresses

	 * where applicable.

	 */

	bit = perf_pmu__format_bits(&arm_spe_pmu->format, "pa_enable");

	if (arm_spe_evsel->core.attr.config & bit)

		evsel__set_sample_bit(arm_spe_evsel, PHYS_ADDR);



	/* Add dummy event to keep tracking */

	err = parse_events(evlist, "dummy:u", NULL);

	if (err)

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

+0 −21
Original line number Diff line number Diff line
@@ -8,27 +8,6 @@ 
#include "callchain.h"

#include "record.h"



/* On arm64, kernel text segment starts at high memory address,

 * for example 0xffff 0000 8xxx xxxx. Modules start at a low memory

 * address, like 0xffff 0000 00ax xxxx. When only small amount of

 * memory is used by modules, gap between end of module's text segment

 * and start of kernel text segment may reach 2G.

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

 */



#define SYMBOL_LIMIT (1 << 12) /* 4K */



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

{

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

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

		/* Limit range of last symbol in module and kernel */

		p->end += SYMBOL_LIMIT;

	else

		p->end = c->start;

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

}



void arch__add_leaf_frame_record_opts(struct record_opts *opts)

{

	opts->sample_user_regs |= sample_reg_masks[PERF_REG_ARM64_LR].mask;

tools/perf/arch/powerpc/util/Build

+0 −1
Original line number Diff line number Diff line 
perf-y += header.o

perf-y += machine.o

perf-y += kvm-stat.o

perf-y += perf_regs.o

perf-y += mem-events.o

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

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <inttypes.h>

#include <stdio.h>

#include <string.h>

#include <internal/lib.h> // page_size

#include "debug.h"

#include "symbol.h"



/* On powerpc kernel text segment start at memory addresses, 0xc000000000000000

 * whereas the modules are located at very high memory addresses,

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

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

 * 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, '['))

		/* Limit the range of last kernel symbol */

		p->end += page_size;

	else

		p->end = c->start;

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

}

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

+0 −16
Original line number Diff line number Diff line
@@ -35,19 +35,3 @@ int arch__fix_module_text_start(u64 *start, u64 *size, const char *name) 


	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:%#" PRIx64 "\n", __func__, p->name, p->end);

}