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

Commit 42776163 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
  perf session: Fix infinite loop in __perf_session__process_events
  perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)
  perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail
  perf tools: Emit clearer message for sys_perf_event_open ENOENT return
  perf stat: better error message for unsupported events
  perf sched: Fix allocation result check
  perf, x86: P4 PMU - Fix unflagged overflows handling
  dynamic debug: Fix build issue with older gcc
  tracing: Fix TRACE_EVENT power tracepoint creation
  tracing: Fix preempt count leak
  tracepoint: Add __rcu annotation
  tracing: remove duplicate null-pointer check in skb tracepoint
  tracing/trivial: Add missing comma in TRACE_EVENT comment
  tracing: Include module.h in define_trace.h
  x86: Save rbp in pt_regs on irq entry
  x86, dumpstack: Fix unused variable warning
  x86, NMI: Clean-up default_do_nmi()
  x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU
  x86, NMI: Remove DIE_NMI_IPI
  x86, NMI: Add priorities to handlers
  ...
parents edb2877f 3d03e2ea

arch/x86/include/asm/kdebug.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ enum die_val { 
	DIE_TRAP,

	DIE_GPF,

	DIE_CALL,

	DIE_NMI_IPI,

	DIE_PAGE_FAULT,

	DIE_NMIUNKNOWN,

};

arch/x86/include/asm/mach_traps.h

+11 −1
Original line number Diff line number Diff line
@@ -7,9 +7,19 @@ 


#include <asm/mc146818rtc.h>



#define NMI_REASON_PORT		0x61



#define NMI_REASON_SERR		0x80

#define NMI_REASON_IOCHK	0x40

#define NMI_REASON_MASK		(NMI_REASON_SERR | NMI_REASON_IOCHK)



#define NMI_REASON_CLEAR_SERR	0x04

#define NMI_REASON_CLEAR_IOCHK	0x08

#define NMI_REASON_CLEAR_MASK	0x0f



static inline unsigned char get_nmi_reason(void)

{

	return inb(0x61);

	return inb(NMI_REASON_PORT);

}



static inline void reassert_nmi(void)

arch/x86/include/asm/nmi.h

+20 −0
Original line number Diff line number Diff line
@@ -23,6 +23,26 @@ void arch_trigger_all_cpu_backtrace(void); 
#define arch_trigger_all_cpu_backtrace arch_trigger_all_cpu_backtrace

#endif



/*

 * Define some priorities for the nmi notifier call chain.

 *

 * Create a local nmi bit that has a higher priority than

 * external nmis, because the local ones are more frequent.

 *

 * Also setup some default high/normal/low settings for

 * subsystems to registers with.  Using 4 bits to seperate

 * the priorities.  This can go alot higher if needed be.

 */



#define NMI_LOCAL_SHIFT		16	/* randomly picked */

#define NMI_LOCAL_BIT		(1ULL << NMI_LOCAL_SHIFT)

#define NMI_HIGH_PRIOR		(1ULL << 8)

#define NMI_NORMAL_PRIOR	(1ULL << 4)

#define NMI_LOW_PRIOR		(1ULL << 0)

#define NMI_LOCAL_HIGH_PRIOR	(NMI_LOCAL_BIT | NMI_HIGH_PRIOR)

#define NMI_LOCAL_NORMAL_PRIOR	(NMI_LOCAL_BIT | NMI_NORMAL_PRIOR)

#define NMI_LOCAL_LOW_PRIOR	(NMI_LOCAL_BIT | NMI_LOW_PRIOR)



void stop_nmi(void);

void restart_nmi(void);

arch/x86/include/asm/perf_event_p4.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#define ARCH_P4_MAX_ESCR	(ARCH_P4_TOTAL_ESCR - ARCH_P4_RESERVED_ESCR)

#define ARCH_P4_MAX_CCCR	(18)



#define ARCH_P4_CNTRVAL_BITS	(40)

#define ARCH_P4_CNTRVAL_MASK	((1ULL << ARCH_P4_CNTRVAL_BITS) - 1)



#define P4_ESCR_EVENT_MASK	0x7e000000U

#define P4_ESCR_EVENT_SHIFT	25

#define P4_ESCR_EVENTMASK_MASK	0x01fffe00U

arch/x86/kernel/apic/hw_nmi.c

+1 −2
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, 


	switch (cmd) {

	case DIE_NMI:

	case DIE_NMI_IPI:

		break;



	default:
@@ -96,7 +95,7 @@ arch_trigger_all_cpu_backtrace_handler(struct notifier_block *self, 
static __read_mostly struct notifier_block backtrace_notifier = {

	.notifier_call          = arch_trigger_all_cpu_backtrace_handler,

	.next                   = NULL,

	.priority               = 1

	.priority               = NMI_LOCAL_LOW_PRIOR,

};



static int __init register_trigger_all_cpu_backtrace(void)