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

Commit ade0899b 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 Ingo Molnar:
 "This tree includes some late late perf items that missed the first
  round:

  tools:

   - Bash auto completion improvements, now we can auto complete the
     tools long options, tracepoint event names, etc, from Namhyung Kim.

   - Look up thread using tid instead of pid in 'perf sched'.

   - Move global variables into a perf_kvm struct, from David Ahern.

   - Hists refactorings, preparatory for improved 'diff' command, from
     Jiri Olsa.

   - Hists refactorings, preparatory for event group viewieng work, from
     Namhyung Kim.

   - Remove double negation on optional feature macro definitions, from
     Namhyung Kim.

   - Remove several cases of needless global variables, on most
     builtins.

   - misc fixes

  kernel:

   - sysfs support for IBS on AMD CPUs, from Robert Richter.

   - Support for an upcoming Intel CPU, the Xeon-Phi / Knights Corner
     HPC blade PMU, from Vince Weaver.

   - misc fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (46 commits)
  perf: Fix perf_cgroup_switch for sw-events
  perf: Clarify perf_cpu_context::active_pmu usage by renaming it to ::unique_pmu
  perf/AMD/IBS: Add sysfs support
  perf hists: Add more helpers for hist entry stat
  perf hists: Move he->stat.nr_events initialization to a template
  perf hists: Introduce struct he_stat
  perf diff: Removing the total_period argument from output code
  perf tool: Add hpp interface to enable/disable hpp column
  perf tools: Removing hists pair argument from output path
  perf hists: Separate overhead and baseline columns
  perf diff: Refactor diff displacement possition info
  perf hists: Add struct hists pointer to struct hist_entry
  perf tools: Complete tracepoint event names
  perf/x86: Add support for Intel Xeon-Phi Knights Corner PMU
  perf evlist: Remove some unused methods
  perf evlist: Introduce add_newtp method
  perf kvm: Move global variables into a perf_kvm struct
  perf tools: Convert to BACKTRACE_SUPPORT
  perf tools: Long option completion support for each subcommands
  perf tools: Complete long option names of perf command
  ...
parents 871a0596 95cf59ea

arch/x86/include/asm/msr-index.h

+5 −0
Original line number Diff line number Diff line
@@ -121,6 +121,11 @@ 
#define MSR_P6_EVNTSEL0			0x00000186

#define MSR_P6_EVNTSEL1			0x00000187



#define MSR_KNC_PERFCTR0               0x00000020

#define MSR_KNC_PERFCTR1               0x00000021

#define MSR_KNC_EVNTSEL0               0x00000028

#define MSR_KNC_EVNTSEL1               0x00000029



/* AMD64 MSRs. Not complete. See the architecture manual for a more

   complete list. */

arch/x86/kernel/cpu/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ obj-$(CONFIG_PERF_EVENTS) += perf_event.o 


ifdef CONFIG_PERF_EVENTS

obj-$(CONFIG_CPU_SUP_AMD)		+= perf_event_amd.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_p4.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_p6.o perf_event_knc.o perf_event_p4.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_lbr.o perf_event_intel_ds.o perf_event_intel.o

obj-$(CONFIG_CPU_SUP_INTEL)		+= perf_event_intel_uncore.o

endif

arch/x86/kernel/cpu/perf_event.h

+2 −0
Original line number Diff line number Diff line
@@ -626,6 +626,8 @@ int p4_pmu_init(void); 


int p6_pmu_init(void);



int knc_pmu_init(void);



#else /* CONFIG_CPU_SUP_INTEL */



static inline void reserve_ds_buffers(void)

arch/x86/kernel/cpu/perf_event_amd_ibs.c

+49 −12
Original line number Diff line number Diff line
@@ -51,6 +51,11 @@ struct perf_ibs { 
	unsigned long			offset_mask[1];

	int				offset_max;

	struct cpu_perf_ibs __percpu	*pcpu;



	struct attribute		**format_attrs;

	struct attribute_group		format_group;

	const struct attribute_group	*attr_groups[2];



	u64				(*get_count)(u64 config);

};
@@ -446,6 +451,19 @@ static void perf_ibs_del(struct perf_event *event, int flags) 


static void perf_ibs_read(struct perf_event *event) { }



PMU_FORMAT_ATTR(rand_en,	"config:57");

PMU_FORMAT_ATTR(cnt_ctl,	"config:19");



static struct attribute *ibs_fetch_format_attrs[] = {

	&format_attr_rand_en.attr,

	NULL,

};



static struct attribute *ibs_op_format_attrs[] = {

	NULL,	/* &format_attr_cnt_ctl.attr if IBS_CAPS_OPCNT */

	NULL,

};



static struct perf_ibs perf_ibs_fetch = {

	.pmu = {

		.task_ctx_nr	= perf_invalid_context,
@@ -465,6 +483,7 @@ static struct perf_ibs perf_ibs_fetch = { 
	.max_period		= IBS_FETCH_MAX_CNT << 4,

	.offset_mask		= { MSR_AMD64_IBSFETCH_REG_MASK },

	.offset_max		= MSR_AMD64_IBSFETCH_REG_COUNT,

	.format_attrs		= ibs_fetch_format_attrs,



	.get_count		= get_ibs_fetch_count,

};
@@ -488,6 +507,7 @@ static struct perf_ibs perf_ibs_op = { 
	.max_period		= IBS_OP_MAX_CNT << 4,

	.offset_mask		= { MSR_AMD64_IBSOP_REG_MASK },

	.offset_max		= MSR_AMD64_IBSOP_REG_COUNT,

	.format_attrs		= ibs_op_format_attrs,



	.get_count		= get_ibs_op_count,

};
@@ -597,6 +617,17 @@ static __init int perf_ibs_pmu_init(struct perf_ibs *perf_ibs, char *name) 


	perf_ibs->pcpu = pcpu;



	/* register attributes */

	if (perf_ibs->format_attrs[0]) {

		memset(&perf_ibs->format_group, 0, sizeof(perf_ibs->format_group));

		perf_ibs->format_group.name	= "format";

		perf_ibs->format_group.attrs	= perf_ibs->format_attrs;



		memset(&perf_ibs->attr_groups, 0, sizeof(perf_ibs->attr_groups));

		perf_ibs->attr_groups[0]	= &perf_ibs->format_group;

		perf_ibs->pmu.attr_groups	= perf_ibs->attr_groups;

	}



	ret = perf_pmu_register(&perf_ibs->pmu, name, -1);

	if (ret) {

		perf_ibs->pcpu = NULL;
@@ -608,13 +639,19 @@ static __init int perf_ibs_pmu_init(struct perf_ibs *perf_ibs, char *name) 


static __init int perf_event_ibs_init(void)

{

	struct attribute **attr = ibs_op_format_attrs;



	if (!ibs_caps)

		return -ENODEV;	/* ibs not supported by the cpu */



	perf_ibs_pmu_init(&perf_ibs_fetch, "ibs_fetch");

	if (ibs_caps & IBS_CAPS_OPCNT)



	if (ibs_caps & IBS_CAPS_OPCNT) {

		perf_ibs_op.config_mask |= IBS_OP_CNT_CTL;

		*attr++ = &format_attr_cnt_ctl.attr;

	}

	perf_ibs_pmu_init(&perf_ibs_op, "ibs_op");



	register_nmi_handler(NMI_LOCAL, perf_ibs_nmi_handler, 0, "perf_ibs");

	printk(KERN_INFO "perf: AMD IBS detected (0x%08x)\n", ibs_caps);

arch/x86/kernel/cpu/perf_event_intel.c

+2 −0
Original line number Diff line number Diff line
@@ -1906,6 +1906,8 @@ __init int intel_pmu_init(void) 
		switch (boot_cpu_data.x86) {

		case 0x6:

			return p6_pmu_init();

		case 0xb:

			return knc_pmu_init();

		case 0xf:

			return p4_pmu_init();

		}