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

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

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

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

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Fix sample size bit operations
  perf tools: Fix ommitted mmap data update on remap
  watchdog: Change the default timeout and configure nmi watchdog period based on watchdog_thresh
  watchdog: Disable watchdog when thresh is zero
  watchdog: Only disable/enable watchdog if neccessary
  watchdog: Fix rounding bug in get_sample_period()
  perf tools: Propagate event parse error handling
  perf tools: Robustify dynamic sample content fetch
  perf tools: Pre-check sample size before parsing
  perf tools: Move evlist sample helpers to evlist area
  perf tools: Remove junk code in mmap size handling
  perf tools: Check we are able to read the event size on mmap
parents 57d19e80 3cb6d154

arch/x86/kernel/apic/hw_nmi.c

+2 −2
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <linux/delay.h>



#ifdef CONFIG_HARDLOCKUP_DETECTOR

u64 hw_nmi_get_sample_period(void)

u64 hw_nmi_get_sample_period(int watchdog_thresh)

{

	return (u64)(cpu_khz) * 1000 * 60;

	return (u64)(cpu_khz) * 1000 * watchdog_thresh;

}

#endif

include/linux/nmi.h

+4 −3
Original line number Diff line number Diff line
@@ -45,10 +45,11 @@ static inline bool trigger_all_cpu_backtrace(void) 


#ifdef CONFIG_LOCKUP_DETECTOR

int hw_nmi_is_cpu_stuck(struct pt_regs *);

u64 hw_nmi_get_sample_period(void);

u64 hw_nmi_get_sample_period(int watchdog_thresh);

extern int watchdog_enabled;

extern int watchdog_thresh;

struct ctl_table;

extern int proc_dowatchdog_enabled(struct ctl_table *, int ,

extern int proc_dowatchdog(struct ctl_table *, int ,

			   void __user *, size_t *, loff_t *);

#endif

include/linux/sched.h

+0 −1
Original line number Diff line number Diff line
@@ -315,7 +315,6 @@ extern int proc_dowatchdog_thresh(struct ctl_table *table, int write, 
				  void __user *buffer,

				  size_t *lenp, loff_t *ppos);

extern unsigned int  softlockup_panic;

extern int softlockup_thresh;

void lockup_detector_init(void);

#else

static inline void touch_softlockup_watchdog(void)

kernel/sysctl.c

+8 −4
Original line number Diff line number Diff line
@@ -730,14 +730,16 @@ static struct ctl_table kern_table[] = { 
		.data           = &watchdog_enabled,

		.maxlen         = sizeof (int),

		.mode           = 0644,

		.proc_handler   = proc_dowatchdog_enabled,

		.proc_handler   = proc_dowatchdog,

		.extra1		= &zero,

		.extra2		= &one,

	},

	{

		.procname	= "watchdog_thresh",

		.data		= &softlockup_thresh,

		.data		= &watchdog_thresh,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dowatchdog_thresh,

		.proc_handler	= proc_dowatchdog,

		.extra1		= &neg_one,

		.extra2		= &sixty,

	},
@@ -755,7 +757,9 @@ static struct ctl_table kern_table[] = { 
		.data           = &watchdog_enabled,

		.maxlen         = sizeof (int),

		.mode           = 0644,

		.proc_handler   = proc_dowatchdog_enabled,

		.proc_handler   = proc_dowatchdog,

		.extra1		= &zero,

		.extra2		= &one,

	},

#endif

#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86)

kernel/watchdog.c

+30 −22
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/perf_event.h>



int watchdog_enabled = 1;

int __read_mostly softlockup_thresh = 60;

int __read_mostly watchdog_thresh = 10;



static DEFINE_PER_CPU(unsigned long, watchdog_touch_ts);

static DEFINE_PER_CPU(struct task_struct *, softlockup_watchdog);
@@ -91,6 +91,17 @@ static int __init nosoftlockup_setup(char *str) 
__setup("nosoftlockup", nosoftlockup_setup);

/*  */



/*

 * Hard-lockup warnings should be triggered after just a few seconds. Soft-

 * lockups can have false positives under extreme conditions. So we generally

 * want a higher threshold for soft lockups than for hard lockups. So we couple

 * the thresholds with a factor: we make the soft threshold twice the amount of

 * time the hard threshold is.

 */

static int get_softlockup_thresh()

{

	return watchdog_thresh * 2;

}



/*

 * Returns seconds, approximately.  We don't need nanosecond
@@ -105,12 +116,12 @@ static unsigned long get_timestamp(int this_cpu) 
static unsigned long get_sample_period(void)

{

	/*

	 * convert softlockup_thresh from seconds to ns

	 * convert watchdog_thresh from seconds to ns

	 * the divide by 5 is to give hrtimer 5 chances to

	 * increment before the hardlockup detector generates

	 * a warning

	 */

	return softlockup_thresh / 5 * NSEC_PER_SEC;

	return get_softlockup_thresh() * (NSEC_PER_SEC / 5);

}



/* Commands for resetting the watchdog */
@@ -182,7 +193,7 @@ static int is_softlockup(unsigned long touch_ts) 
	unsigned long now = get_timestamp(smp_processor_id());



	/* Warn about unreasonable delays: */

	if (time_after(now, touch_ts + softlockup_thresh))

	if (time_after(now, touch_ts + get_softlockup_thresh()))

		return now - touch_ts;



	return 0;
@@ -359,7 +370,7 @@ static int watchdog_nmi_enable(int cpu) 


	/* Try to register using hardware perf events */

	wd_attr = &wd_hw_attr;

	wd_attr->sample_period = hw_nmi_get_sample_period();

	wd_attr->sample_period = hw_nmi_get_sample_period(watchdog_thresh);

	event = perf_event_create_kernel_counter(wd_attr, cpu, NULL, watchdog_overflow_callback);

	if (!IS_ERR(event)) {

		printk(KERN_INFO "NMI watchdog enabled, takes one hw-pmu counter.\n");
@@ -501,28 +512,25 @@ static void watchdog_disable_all_cpus(void) 
/* sysctl functions */

#ifdef CONFIG_SYSCTL

/*

 * proc handler for /proc/sys/kernel/nmi_watchdog

 * proc handler for /proc/sys/kernel/nmi_watchdog,watchdog_thresh

 */



int proc_dowatchdog_enabled(struct ctl_table *table, int write,

		     void __user *buffer, size_t *length, loff_t *ppos)

int proc_dowatchdog(struct ctl_table *table, int write,

		    void __user *buffer, size_t *lenp, loff_t *ppos)

{

	proc_dointvec(table, write, buffer, length, ppos);

	int ret;



	if (write) {

		if (watchdog_enabled)

	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);

	if (ret || !write)

		goto out;



	if (watchdog_enabled && watchdog_thresh)

		watchdog_enable_all_cpus();

	else

		watchdog_disable_all_cpus();

	}

	return 0;

}



int proc_dowatchdog_thresh(struct ctl_table *table, int write,

			     void __user *buffer,

			     size_t *lenp, loff_t *ppos)

{

	return proc_dointvec_minmax(table, write, buffer, lenp, ppos);

out:

	return ret;

}

#endif /* CONFIG_SYSCTL */