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

Commit 203b6609 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf updates from Ingo Molnar:
 "Lots of tooling updates - too many to list, here's a few highlights:

   - Various subcommand updates to 'perf trace', 'perf report', 'perf
     record', 'perf annotate', 'perf script', 'perf test', etc.

   - CPU and NUMA topology and affinity handling improvements,

   - HW tracing and HW support updates:
      - Intel PT updates
      - ARM CoreSight updates
      - vendor HW event updates

   - BPF updates

   - Tons of infrastructure updates, both on the build system and the
     library support side

   - Documentation updates.

   - ... and lots of other changes, see the changelog for details.

  Kernel side updates:

   - Tighten up kprobes blacklist handling, reduce the number of places
     where developers can install a kprobe and hang/crash the system.

   - Fix/enhance vma address filter handling.

   - Various PMU driver updates, small fixes and additions.

   - refcount_t conversions

   - BPF updates

   - error code propagation enhancements

   - misc other changes"

* 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (238 commits)
  perf script python: Add Python3 support to syscall-counts-by-pid.py
  perf script python: Add Python3 support to syscall-counts.py
  perf script python: Add Python3 support to stat-cpi.py
  perf script python: Add Python3 support to stackcollapse.py
  perf script python: Add Python3 support to sctop.py
  perf script python: Add Python3 support to powerpc-hcalls.py
  perf script python: Add Python3 support to net_dropmonitor.py
  perf script python: Add Python3 support to mem-phys-addr.py
  perf script python: Add Python3 support to failed-syscalls-by-pid.py
  perf script python: Add Python3 support to netdev-times.py
  perf tools: Add perf_exe() helper to find perf binary
  perf script: Handle missing fields with -F +..
  perf data: Add perf_data__open_dir_data function
  perf data: Add perf_data__(create_dir|close_dir) functions
  perf data: Fail check_backup in case of error
  perf data: Make check_backup work over directories
  perf tools: Add rm_rf_perf_data function
  perf tools: Add pattern name checking to rm_rf
  perf tools: Add depth checking to rm_rf
  perf data: Add global path holder
  ...
parents 3478588b c978b946

arch/alpha/kernel/perf_event.c

+1 −6
Original line number Diff line number Diff line
@@ -630,12 +630,6 @@ static int __hw_perf_event_init(struct perf_event *event) 
		return ev;

	}



	/* The EV67 does not support mode exclusion */

	if (attr->exclude_kernel || attr->exclude_user

			|| attr->exclude_hv || attr->exclude_idle) {

		return -EPERM;

	}



	/*

	 * We place the event type in event_base here and leave calculation

	 * of the codes to programme the PMU for alpha_pmu_enable() because
@@ -771,6 +765,7 @@ static struct pmu pmu = { 
	.start		= alpha_pmu_start,

	.stop		= alpha_pmu_stop,

	.read		= alpha_pmu_read,

	.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

};

arch/arm/mach-imx/mmdc.c

+2 −7
Original line number Diff line number Diff line
@@ -294,13 +294,7 @@ static int mmdc_pmu_event_init(struct perf_event *event) 
		return -EOPNOTSUPP;

	}



	if (event->attr.exclude_user		||

			event->attr.exclude_kernel	||

			event->attr.exclude_hv		||

			event->attr.exclude_idle	||

			event->attr.exclude_host	||

			event->attr.exclude_guest	||

			event->attr.sample_period)

	if (event->attr.sample_period)

		return -EINVAL;



	if (cfg < 0 || cfg >= MMDC_NUM_COUNTERS)
@@ -456,6 +450,7 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, 
			.start          = mmdc_pmu_event_start,

			.stop           = mmdc_pmu_event_stop,

			.read           = mmdc_pmu_event_update,

			.capabilities	= PERF_PMU_CAP_NO_EXCLUDE,

		},

		.mmdc_base = mmdc_base,

		.dev = dev,

arch/arm/mm/cache-l2x0-pmu.c

+1 −8
Original line number Diff line number Diff line
@@ -314,14 +314,6 @@ static int l2x0_pmu_event_init(struct perf_event *event) 
	    event->attach_state & PERF_ATTACH_TASK)

		return -EINVAL;



	if (event->attr.exclude_user   ||

	    event->attr.exclude_kernel ||

	    event->attr.exclude_hv     ||

	    event->attr.exclude_idle   ||

	    event->attr.exclude_host   ||

	    event->attr.exclude_guest)

		return -EINVAL;



	if (event->cpu < 0)

		return -EINVAL;
@@ -544,6 +536,7 @@ static __init int l2x0_pmu_init(void) 
		.del = l2x0_pmu_event_del,

		.event_init = l2x0_pmu_event_init,

		.attr_groups = l2x0_pmu_attr_groups,

		.capabilities = PERF_PMU_CAP_NO_EXCLUDE,

	};



	l2x0_pmu_reset();

arch/powerpc/perf/hv-24x7.c

+1 −9
Original line number Diff line number Diff line
@@ -1306,15 +1306,6 @@ static int h_24x7_event_init(struct perf_event *event) 
		return -EINVAL;

	}



	/* unsupported modes and filters */

	if (event->attr.exclude_user   ||

	    event->attr.exclude_kernel ||

	    event->attr.exclude_hv     ||

	    event->attr.exclude_idle   ||

	    event->attr.exclude_host   ||

	    event->attr.exclude_guest)

		return -EINVAL;



	/* no branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;
@@ -1577,6 +1568,7 @@ static struct pmu h_24x7_pmu = { 
	.start_txn   = h_24x7_event_start_txn,

	.commit_txn  = h_24x7_event_commit_txn,

	.cancel_txn  = h_24x7_event_cancel_txn,

	.capabilities = PERF_PMU_CAP_NO_EXCLUDE,

};



static int hv_24x7_init(void)

arch/powerpc/perf/hv-gpci.c

+1 −9
Original line number Diff line number Diff line
@@ -232,15 +232,6 @@ static int h_gpci_event_init(struct perf_event *event) 
		return -EINVAL;

	}



	/* unsupported modes and filters */

	if (event->attr.exclude_user   ||

	    event->attr.exclude_kernel ||

	    event->attr.exclude_hv     ||

	    event->attr.exclude_idle   ||

	    event->attr.exclude_host   ||

	    event->attr.exclude_guest)

		return -EINVAL;



	/* no branch sampling */

	if (has_branch_stack(event))

		return -EOPNOTSUPP;
@@ -285,6 +276,7 @@ static struct pmu h_gpci_pmu = { 
	.start       = h_gpci_event_start,

	.stop        = h_gpci_event_stop,

	.read        = h_gpci_event_update,

	.capabilities = PERF_PMU_CAP_NO_EXCLUDE,

};



static int hv_gpci_init(void)