perf fixes
Subsystems (2)
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Eric Dumazet (1):
perf: Fix alloc_callchain_buffers()
Marcin Slusarz (3):
watchdog: Fix broken nowatchdog logic
watchdog: Fix sysctl consistency
watchdog: Don't change watchdog state on read of sysctl
Peter Zijlstra (1):
perf: Fix reading in perf_event_read()
Stephane Eranian (1):
perf: Fix Pentium4 raw event validation
arch/x86/kernel/cpu/perf_event_p4.c | 12 ++++++++- kernel/perf_event.c | 10 ++++---- kernel/watchdog.c | 43 +++++++++++++++------------------- 3 files changed, 34 insertions(+), 31 deletions(-)
arch/x86/kernel/cpu/perf_event_p4.c +10 -2
@@ -682,7 +682,7 @@ static int p4_validate_raw_event(struct perf_event *event)* if an event is shared accross the logical threads * the user needs special permissions to be able to use it */ -if (p4_event_bind_map[v].shared) { +if (p4_ht_active () && p4_event_bind_map[v].shared) {if (perf_paranoid_cpu () && !capable (CAP_SYS_ADMIN ))return -EACCES ; }
@@ -727,7 +727,8 @@ static int p4_hw_config(struct perf_event *event) event->hw.config =p4_set_ht_bit (event->hw.config);if (event->attr.type ==PERF_TYPE_RAW ) { - +struct p4_event_bind *bind; +unsigned int esel;/* * Clear bits we reserve to be managed by kernel itself * and never allowed from a user space
@@ -743,6 +744,13 @@ static int p4_hw_config(struct perf_event *event)* bits since we keep additional info here (for cache events and etc) */ event->hw.config |= event->attr.config; + bind =p4_config_get_bind (event->attr.config); +if (!bind) { + rc = -EINVAL ; + goto out; + } + esel =P4_OPCODE_ESEL (bind->opcode); + event->hw.config |=p4_config_pack_cccr (P4_CCCR_ESEL (esel)); } rc =x86_setup_perfctr (event);
kernel/perf_event.c +5 -5
@@ -1901,11 +1901,12 @@ static void __perf_event_read(void *info)return ;raw_spin_lock (&ctx->lock); -update_context_time (ctx); +if (ctx->is_active) +update_context_time (ctx);update_event_times (event); +if (event->state ==PERF_EVENT_STATE_ACTIVE ) + event->pmu->read (event);raw_spin_unlock (&ctx->lock); - - event->pmu->read (event); }static inline u64 perf_event_count (struct perf_event *event)
@@ -1999,8 +2000,7 @@ static int alloc_callchain_buffers(void)* accessed from NMI. Use a temporary manual per cpu allocation * until that gets sorted out. */ - size =sizeof (*entries) +sizeof (struct perf_callchain_entry *) * -num_possible_cpus (); + size = offsetof(struct callchain_cpus_entries, cpu_entries[nr_cpu_ids]); entries =kzalloc (size,GFP_KERNEL );if (!entries)
kernel/watchdog.c +19 -24
112 lines not on this page · raw message