Commit 59b2858f 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 fixes from Ingo Molnar:
 "Mostly tooling fixes, but also two PMU driver fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools powerpc: Use dwfl_report_elf() instead of offline.
  perf tools: Fix segfault for symbol annotation on TUI
  perf test: Fix dwarf unwind using libunwind.
  perf tools: Avoid build splat for syscall numbers with uclibc
  perf tools: Elide strlcpy warning with uclibc
  perf tools: Fix statfs.f_type data type mismatch build error with uclibc
  tools: Remove bitops/hweight usage of bits in tools/perf
  perf machine: Fix __machine__findnew_thread() error path
  perf tools: Fix building error in x86_64 when dwarf unwind is on
  perf probe: Propagate error code when write(2) failed
  perf/x86/intel: Fix bug for "cycles:p" and "cycles:pp" on SLM
  perf/rapl: Fix sysfs_show() initialization for RAPL PMU
parents fc7f0dd3 d01de238

arch/x86/kernel/cpu/perf_event_intel_ds.c

+2 −2
Original line number Diff line number Diff line
@@ -568,8 +568,8 @@ struct event_constraint intel_atom_pebs_event_constraints[] = { 
};



struct event_constraint intel_slm_pebs_event_constraints[] = {

	/* UOPS_RETIRED.ALL, inv=1, cmask=16 (cycles:p). */

	INTEL_FLAGS_EVENT_CONSTRAINT(0x108001c2, 0xf),

	/* INST_RETIRED.ANY_P, inv=1, cmask=16 (cycles:p). */

	INTEL_FLAGS_EVENT_CONSTRAINT(0x108000c0, 0x1),

	/* Allow all events as PEBS with no flags */

	INTEL_ALL_EVENT_CONSTRAINT(0, 0x1),

	EVENT_CONSTRAINT_END

arch/x86/kernel/cpu/perf_event_intel_rapl.c

+32 −12
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ static struct kobj_attribute format_attr_##_var = \ 


#define RAPL_CNTR_WIDTH 32 /* 32-bit rapl counters */



#define RAPL_EVENT_ATTR_STR(_name, v, str)				\

static struct perf_pmu_events_attr event_attr_##v = {			\

	.attr		= __ATTR(_name, 0444, rapl_sysfs_show, NULL),	\

	.id		= 0,						\

	.event_str	= str,						\

};



struct rapl_pmu {

	spinlock_t	 lock;

	int		 hw_unit;  /* 1/2^hw_unit Joule */
@@ -379,23 +386,36 @@ static struct attribute_group rapl_pmu_attr_group = { 
	.attrs = rapl_pmu_attrs,

};



EVENT_ATTR_STR(energy-cores, rapl_cores, "event=0x01");

EVENT_ATTR_STR(energy-pkg  ,   rapl_pkg, "event=0x02");

EVENT_ATTR_STR(energy-ram  ,   rapl_ram, "event=0x03");

EVENT_ATTR_STR(energy-gpu  ,   rapl_gpu, "event=0x04");

static ssize_t rapl_sysfs_show(struct device *dev,

			       struct device_attribute *attr,

			       char *page)

{

	struct perf_pmu_events_attr *pmu_attr = \

		container_of(attr, struct perf_pmu_events_attr, attr);



	if (pmu_attr->event_str)

		return sprintf(page, "%s", pmu_attr->event_str);



	return 0;

}



RAPL_EVENT_ATTR_STR(energy-cores, rapl_cores, "event=0x01");

RAPL_EVENT_ATTR_STR(energy-pkg  ,   rapl_pkg, "event=0x02");

RAPL_EVENT_ATTR_STR(energy-ram  ,   rapl_ram, "event=0x03");

RAPL_EVENT_ATTR_STR(energy-gpu  ,   rapl_gpu, "event=0x04");



EVENT_ATTR_STR(energy-cores.unit, rapl_cores_unit, "Joules");

EVENT_ATTR_STR(energy-pkg.unit  ,   rapl_pkg_unit, "Joules");

EVENT_ATTR_STR(energy-ram.unit  ,   rapl_ram_unit, "Joules");

EVENT_ATTR_STR(energy-gpu.unit  ,   rapl_gpu_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-cores.unit, rapl_cores_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-pkg.unit  ,   rapl_pkg_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-ram.unit  ,   rapl_ram_unit, "Joules");

RAPL_EVENT_ATTR_STR(energy-gpu.unit  ,   rapl_gpu_unit, "Joules");



/*

 * we compute in 0.23 nJ increments regardless of MSR

 */

EVENT_ATTR_STR(energy-cores.scale, rapl_cores_scale, "2.3283064365386962890625e-10");

EVENT_ATTR_STR(energy-pkg.scale,     rapl_pkg_scale, "2.3283064365386962890625e-10");

EVENT_ATTR_STR(energy-ram.scale,     rapl_ram_scale, "2.3283064365386962890625e-10");

EVENT_ATTR_STR(energy-gpu.scale,     rapl_gpu_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-cores.scale, rapl_cores_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-pkg.scale,     rapl_pkg_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-ram.scale,     rapl_ram_scale, "2.3283064365386962890625e-10");

RAPL_EVENT_ATTR_STR(energy-gpu.scale,     rapl_gpu_scale, "2.3283064365386962890625e-10");



static struct attribute *rapl_events_srv_attr[] = {

	EVENT_PTR(rapl_cores),

tools/include/asm-generic/bitops.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#error only <linux/bitops.h> can be included directly

#endif



#include <asm-generic/bitops/hweight.h>



#include <asm-generic/bitops/atomic.h>



#endif /* __TOOLS_ASM_GENERIC_BITOPS_H */

tools/include/asm-generic/bitops/arch_hweight.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/arch_hweight.h"

tools/include/asm-generic/bitops/const_hweight.h

0 → 100644
+1 −0
Original line number Diff line number Diff line 
#include "../../../../include/asm-generic/bitops/const_hweight.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE