Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12ad143e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf updates from Thomas Gleixner:
 "Perf updates and fixes:

  Kernel:
   - Handle events which have the bpf_event attribute set as side band
     events as they carry information about BPF programs.
   - Add missing switch-case fall-through comments

  Libraries:
   - Fix leaks and double frees in error code paths.
   - Prevent buffer overflows in libtraceevent

  Tools:
   - Improvements in handling Intel BT/PTS
   - Add BTF ELF markers to perf trace BPF programs to improve output
   - Support --time, --cpu, --pid and --tid filters for perf diff
   - Calculate the column width in perf annotate as the hardcoded 6
     characters for the instruction are not sufficient
   - Small fixes all over the place"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (38 commits)
  perf/core: Mark expected switch fall-through
  perf/x86/intel/uncore: Fix client IMC events return huge result
  perf/ring_buffer: Use high order allocations for AUX buffers optimistically
  perf data: Force perf_data__open|close zero data->file.path
  perf session: Fix double free in perf_data__close
  perf evsel: Probe for precise_ip with simple attr
  perf tools: Read and store caps/max_precise in perf_pmu
  perf hist: Fix memory leak of srcline
  perf hist: Add error path into hist_entry__init
  perf c2c: Fix c2c report for empty numa node
  perf script python: Add Python3 support to intel-pt-events.py
  perf script python: Add Python3 support to event_analyzing_sample.py
  perf script python: add Python3 support to check-perf-trace.py
  perf script python: Add Python3 support to futex-contention.py
  perf script python: Remove mixed indentation
  perf diff: Support --pid/--tid filter options
  perf diff: Support --cpu filter option
  perf diff: Support --time filter option
  perf thread: Generalize function to copy from thread addr space from intel-bts code
  perf annotate: Calculate the max instruction name, align column to that
  ...
parents 262d6a9a b339da48

arch/x86/events/intel/uncore.c

+1 −0
Original line number Diff line number Diff line
@@ -732,6 +732,7 @@ static int uncore_pmu_event_init(struct perf_event *event) 
		/* fixed counters have event field hardcoded to zero */

		hwc->config = 0ULL;

	} else if (is_freerunning_event(event)) {

		hwc->config = event->attr.config;

		if (!check_valid_freerunning_event(box, event))

			return -EINVAL;

		event->hw.idx = UNCORE_PMC_IDX_FREERUNNING;

arch/x86/events/intel/uncore.h

+6 −6
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ static inline 
unsigned int uncore_freerunning_counter(struct intel_uncore_box *box,

					struct perf_event *event)

{

	unsigned int type = uncore_freerunning_type(event->attr.config);

	unsigned int idx = uncore_freerunning_idx(event->attr.config);

	unsigned int type = uncore_freerunning_type(event->hw.config);

	unsigned int idx = uncore_freerunning_idx(event->hw.config);

	struct intel_uncore_pmu *pmu = box->pmu;



	return pmu->type->freerunning[type].counter_base +
@@ -377,7 +377,7 @@ static inline 
unsigned int uncore_freerunning_bits(struct intel_uncore_box *box,

				     struct perf_event *event)

{

	unsigned int type = uncore_freerunning_type(event->attr.config);

	unsigned int type = uncore_freerunning_type(event->hw.config);



	return box->pmu->type->freerunning[type].bits;

}
@@ -385,7 +385,7 @@ unsigned int uncore_freerunning_bits(struct intel_uncore_box *box, 
static inline int uncore_num_freerunning(struct intel_uncore_box *box,

					 struct perf_event *event)

{

	unsigned int type = uncore_freerunning_type(event->attr.config);

	unsigned int type = uncore_freerunning_type(event->hw.config);



	return box->pmu->type->freerunning[type].num_counters;

}
@@ -399,8 +399,8 @@ static inline int uncore_num_freerunning_types(struct intel_uncore_box *box, 
static inline bool check_valid_freerunning_event(struct intel_uncore_box *box,

						 struct perf_event *event)

{

	unsigned int type = uncore_freerunning_type(event->attr.config);

	unsigned int idx = uncore_freerunning_idx(event->attr.config);

	unsigned int type = uncore_freerunning_type(event->hw.config);

	unsigned int idx = uncore_freerunning_idx(event->hw.config);



	return (type < uncore_num_freerunning_types(box, event)) &&

	       (idx < uncore_num_freerunning(box, event));

arch/x86/events/intel/uncore_snb.c

+3 −1
Original line number Diff line number Diff line
@@ -442,9 +442,11 @@ static int snb_uncore_imc_event_init(struct perf_event *event) 


	/* must be done before validate_group */

	event->hw.event_base = base;

	event->hw.config = cfg;

	event->hw.idx = idx;



	/* Convert to standard encoding format for freerunning counters */

	event->hw.config = ((cfg - 1) << 8) | 0x10ff;



	/* no group validation needed, we have free running counters */



	return 0;

kernel/events/core.c

+3 −1
Original line number Diff line number Diff line
@@ -4238,7 +4238,8 @@ static bool is_sb_event(struct perf_event *event) 
	if (attr->mmap || attr->mmap_data || attr->mmap2 ||

	    attr->comm || attr->comm_exec ||

	    attr->task || attr->ksymbol ||

	    attr->context_switch)

	    attr->context_switch ||

	    attr->bpf_event)

		return true;

	return false;

}
@@ -9174,6 +9175,7 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, 
		case IF_SRC_KERNELADDR:

		case IF_SRC_KERNEL:

			kernel = 1;

			/* fall through */



		case IF_SRC_FILEADDR:

		case IF_SRC_FILE:

kernel/events/ring_buffer.c

+15 −17
Original line number Diff line number Diff line
@@ -598,12 +598,11 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event, 
{

	bool overwrite = !(flags & RING_BUFFER_WRITABLE);

	int node = (event->cpu == -1) ? -1 : cpu_to_node(event->cpu);

	int ret = -ENOMEM, max_order = 0;

	int ret = -ENOMEM, max_order;



	if (!has_aux(event))

		return -EOPNOTSUPP;



	if (event->pmu->capabilities & PERF_PMU_CAP_AUX_NO_SG) {

	/*

	 * We need to start with the max_order that fits in nr_pages,

	 * not the other way around, hence ilog2() and not get_order.
@@ -621,7 +620,6 @@ int rb_alloc_aux(struct ring_buffer *rb, struct perf_event *event, 


		max_order--;

	}

	}



	rb->aux_pages = kcalloc_node(nr_pages, sizeof(void *), GFP_KERNEL,

				     node);