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

Commit cd823469 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:
 "A fair chunk of the linecount comes from a fix for a tracing bug that
  corrupts latency tracing buffers when the overwrite mode is changed on
  the fly - the rest is mostly assorted fewliner fixlets."

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Add SNB/SNB-EP scheduling constraints for cycle_activity event
  kprobes/x86: Check Interrupt Flag modifier when registering probe
  kprobes: Make hash_64() as always inlined
  perf: Generate EXIT event only once per task context
  perf: Reset hwc->last_period on sw clock events
  tracing: Prevent buffer overwrite disabled for latency tracers
  tracing: Keep overwrite in sync between regular and snapshot buffers
  tracing: Protect tracer flags with trace_types_lock
  perf tools: Fix LIBNUMA build with glibc 2.12 and older.
  tracing: Fix free of probe entry by calling call_rcu_sched()
  perf/POWER7: Create a sysfs format entry for Power7 events
  perf probe: Fix segfault
  libtraceevent: Remove hard coded include to /usr/local/include in Makefile
  perf record: Fix -C option
  perf tools: check if -DFORTIFY_SOURCE=2 is allowed
  perf report: Fix build with NO_NEWT=1
  perf annotate: Fix build with NO_NEWT=1
  tracing: Fix race in snapshot swapping
parents 172a271b fd4a5aef

arch/powerpc/perf/power7-pmu.c

+13 −0
Original line number Diff line number Diff line
@@ -420,7 +420,20 @@ static struct attribute_group power7_pmu_events_group = { 
	.attrs = power7_events_attr,

};



PMU_FORMAT_ATTR(event, "config:0-19");



static struct attribute *power7_pmu_format_attr[] = {

	&format_attr_event.attr,

	NULL,

};



struct attribute_group power7_pmu_format_group = {

	.name = "format",

	.attrs = power7_pmu_format_attr,

};



static const struct attribute_group *power7_pmu_attr_groups[] = {

	&power7_pmu_format_group,

	&power7_pmu_events_group,

	NULL,

};

arch/x86/include/asm/kprobes.h

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ struct arch_specific_insn { 
	 * a post_handler or break_handler).

	 */

	int boostable;

	bool if_modifier;

};



struct arch_optimized_insn {

arch/x86/kernel/cpu/perf_event_intel.c

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,10 @@ static struct event_constraint intel_snb_event_constraints[] __read_mostly = 
	FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */

	FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */

	FIXED_EVENT_CONSTRAINT(0x0300, 2), /* CPU_CLK_UNHALTED.REF */

	INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf), /* CYCLE_ACTIVITY.CYCLES_NO_DISPATCH */

	INTEL_UEVENT_CONSTRAINT(0x05a3, 0xf), /* CYCLE_ACTIVITY.STALLS_L2_PENDING */

	INTEL_UEVENT_CONSTRAINT(0x02a3, 0x4), /* CYCLE_ACTIVITY.CYCLES_L1D_PENDING */

	INTEL_UEVENT_CONSTRAINT(0x06a3, 0x4), /* CYCLE_ACTIVITY.STALLS_L1D_PENDING */

	INTEL_EVENT_CONSTRAINT(0x48, 0x4), /* L1D_PEND_MISS.PENDING */

	INTEL_UEVENT_CONSTRAINT(0x01c0, 0x2), /* INST_RETIRED.PREC_DIST */

	INTEL_EVENT_CONSTRAINT(0xcd, 0x8), /* MEM_TRANS_RETIRED.LOAD_LATENCY */

arch/x86/kernel/kprobes/core.c

+4 −1
Original line number Diff line number Diff line
@@ -375,6 +375,9 @@ static void __kprobes arch_copy_kprobe(struct kprobe *p) 
	else

		p->ainsn.boostable = -1;



	/* Check whether the instruction modifies Interrupt Flag or not */

	p->ainsn.if_modifier = is_IF_modifier(p->ainsn.insn);



	/* Also, displacement change doesn't affect the first byte */

	p->opcode = p->ainsn.insn[0];

}
@@ -434,7 +437,7 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, 
	__this_cpu_write(current_kprobe, p);

	kcb->kprobe_saved_flags = kcb->kprobe_old_flags

		= (regs->flags & (X86_EFLAGS_TF | X86_EFLAGS_IF));

	if (is_IF_modifier(p->ainsn.insn))

	if (p->ainsn.if_modifier)

		kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF;

}

include/linux/hash.h

+2 −1
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */



#include <asm/types.h>

#include <linux/compiler.h>



/* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 */

#define GOLDEN_RATIO_PRIME_32 0x9e370001UL
@@ -31,7 +32,7 @@ 
#error Wordsize not 32 or 64

#endif



static inline u64 hash_64(u64 val, unsigned int bits)

static __always_inline u64 hash_64(u64 val, unsigned int bits)

{

	u64 hash = val;