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

Commit 7ef6e973 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:
 "This tree includes various fixes"

Ingo really needs to improve on the whole "explain git pull" part.
"Various fixes" indeed.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/hwpb: Invoke __perf_event_disable() if interrupts are already disabled
  perf/x86: Enable Intel Cedarview Atom suppport
  perf_event: Switch to internal refcount, fix race with close()
  oprofile, s390: Fix uninitialized memory access when writing to oprofilefs
  perf/x86: Fix microcode revision check for SNB-PEBS
parents 7076cca9 e4390fa6

arch/s390/oprofile/init.c

+5 −5
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static ssize_t hw_interval_write(struct file *file, char const __user *buf, 
	if (*offset)

		return -EINVAL;

	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;

	if (val < oprofile_min_interval)

		oprofile_hw_interval = oprofile_min_interval;
@@ -212,7 +212,7 @@ static ssize_t hwsampler_zero_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;

	if (val != 0)

		return -EINVAL;
@@ -243,7 +243,7 @@ static ssize_t hwsampler_kernel_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)
@@ -278,7 +278,7 @@ static ssize_t hwsampler_user_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)
@@ -317,7 +317,7 @@ static ssize_t timer_enabled_write(struct file *file, char const __user *buf, 
		return -EINVAL;



	retval = oprofilefs_ulong_from_user(&val, buf, count);

	if (retval)

	if (retval <= 0)

		return retval;



	if (val != 0 && val != 1)

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2008,6 +2008,7 @@ __init int intel_pmu_init(void) 
		break;



	case 28: /* Atom */

	case 54: /* Cedariew */

		memcpy(hw_cache_event_ids, atom_hw_cache_event_ids,

		       sizeof(hw_cache_event_ids));

arch/x86/kernel/cpu/perf_event_intel_lbr.c

+2 −1
Original line number Diff line number Diff line
@@ -686,7 +686,8 @@ void intel_pmu_lbr_init_atom(void) 
	 * to have an operational LBR which can freeze

	 * on PMU interrupt

	 */

	if (boot_cpu_data.x86_mask < 10) {

	if (boot_cpu_data.x86_model == 28

	    && boot_cpu_data.x86_mask < 10) {

		pr_cont("LBR disabled due to erratum");

		return;

	}

arch/x86/kernel/microcode_core.c

+3 −0
Original line number Diff line number Diff line
@@ -225,6 +225,9 @@ static ssize_t microcode_write(struct file *file, const char __user *buf, 
	if (do_microcode_update(buf, len) == 0)

		ret = (ssize_t)len;



	if (ret > 0)

		perf_check_microcode();



	mutex_unlock(&microcode_mutex);

	put_online_cpus();

include/linux/perf_event.h

+3 −1
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ struct perf_event { 
	struct hw_perf_event		hw;



	struct perf_event_context	*ctx;

	struct file			*filp;

	atomic_long_t			refcount;



	/*

	 * These accumulate total time (in nanoseconds) that children
@@ -1296,6 +1296,7 @@ extern int perf_swevent_get_recursion_context(void); 
extern void perf_swevent_put_recursion_context(int rctx);

extern void perf_event_enable(struct perf_event *event);

extern void perf_event_disable(struct perf_event *event);

extern int __perf_event_disable(void *info);

extern void perf_event_task_tick(void);

#else

static inline void
@@ -1334,6 +1335,7 @@ static inline int perf_swevent_get_recursion_context(void) { return -1; } 
static inline void perf_swevent_put_recursion_context(int rctx)		{ }

static inline void perf_event_enable(struct perf_event *event)		{ }

static inline void perf_event_disable(struct perf_event *event)		{ }

static inline int __perf_event_disable(void *info)			{ return -1; }

static inline void perf_event_task_tick(void)				{ }

#endif