Skip to content

Commit

Permalink
perf: Fix PERF_EVENT_IOC_PERIOD migration race
Browse files Browse the repository at this point in the history
I ran the perf fuzzer, which triggered some WARN()s which are due to
trying to stop/restart an event on the wrong CPU.

Use the normal IPI pattern to ensure we run the code on the correct CPU.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Vince Weaver <vincent.weaver@maine.edu>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Fixes: bad7192 ("perf: Fix PERF_EVENT_IOC_PERIOD to force-reset the period")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Aug 12, 2015
1 parent ee9397a commit c7999c6
Showing 1 changed file with 55 additions and 20 deletions.
75 changes: 55 additions & 20 deletions kernel/events/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3958,28 +3958,21 @@ static void perf_event_for_each(struct perf_event *event,
perf_event_for_each_child(sibling, func);
}

static int perf_event_period(struct perf_event *event, u64 __user *arg)
{
struct perf_event_context *ctx = event->ctx;
int ret = 0, active;
struct period_event {
struct perf_event *event;
u64 value;
};

if (!is_sampling_event(event))
return -EINVAL;

if (copy_from_user(&value, arg, sizeof(value)))
return -EFAULT;

if (!value)
return -EINVAL;
static int __perf_event_period(void *info)
{
struct period_event *pe = info;
struct perf_event *event = pe->event;
struct perf_event_context *ctx = event->ctx;
u64 value = pe->value;
bool active;

raw_spin_lock_irq(&ctx->lock);
raw_spin_lock(&ctx->lock);
if (event->attr.freq) {
if (value > sysctl_perf_event_sample_rate) {
ret = -EINVAL;
goto unlock;
}

event->attr.sample_freq = value;
} else {
event->attr.sample_period = value;
Expand All @@ -3998,11 +3991,53 @@ static int perf_event_period(struct perf_event *event, u64 __user *arg)
event->pmu->start(event, PERF_EF_RELOAD);
perf_pmu_enable(ctx->pmu);
}
raw_spin_unlock(&ctx->lock);

unlock:
return 0;
}

static int perf_event_period(struct perf_event *event, u64 __user *arg)
{
struct period_event pe = { .event = event, };
struct perf_event_context *ctx = event->ctx;
struct task_struct *task;
u64 value;

if (!is_sampling_event(event))
return -EINVAL;

if (copy_from_user(&value, arg, sizeof(value)))
return -EFAULT;

if (!value)
return -EINVAL;

if (event->attr.freq && value > sysctl_perf_event_sample_rate)
return -EINVAL;

task = ctx->task;
pe.value = value;

if (!task) {
cpu_function_call(event->cpu, __perf_event_period, &pe);
return 0;
}

retry:
if (!task_function_call(task, __perf_event_period, &pe))
return 0;

raw_spin_lock_irq(&ctx->lock);
if (ctx->is_active) {
raw_spin_unlock_irq(&ctx->lock);
task = ctx->task;
goto retry;
}

__perf_event_period(&pe);
raw_spin_unlock_irq(&ctx->lock);

return ret;
return 0;
}

static const struct file_operations perf_fops;
Expand Down

0 comments on commit c7999c6

Please sign in to comment.