Skip to content

Commit

Permalink
perf: Fix signed comparison in perf_adjust_period()
Browse files Browse the repository at this point in the history
Frederic reported that frequency driven swevents didn't work properly
and even caused a division-by-zero error.

It turns out there are two bugs, the division-by-zero comes from a
failure to deal with that in perf_calculate_period().

The other was more interesting and turned out to be a wrong comparison
in perf_adjust_period(). The comparison was between an s64 and u64 and
got implicitly converted to an unsigned comparison. The problem is
that period_left is typically < 0, so it ended up being always true.

Cure this by making the local period variables s64.

Reported-by: Frederic Weisbecker <[email protected]>
Tested-by: Frederic Weisbecker <[email protected]>
Signed-off-by: Peter Zijlstra <[email protected]>
Cc: <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <[email protected]>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Jun 8, 2010
1 parent 58cc1a9 commit f6ab91a
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -1507,6 +1507,9 @@ do { \
divisor = nsec * frequency;
}

if (!divisor)
return dividend;

return div64_u64(dividend, divisor);
}

Expand All @@ -1529,7 +1532,7 @@ static int perf_event_start(struct perf_event *event)
static void perf_adjust_period(struct perf_event *event, u64 nsec, u64 count)
{
struct hw_perf_event *hwc = &event->hw;
u64 period, sample_period;
s64 period, sample_period;
s64 delta;

period = perf_calculate_period(event, nsec, count);
Expand Down

0 comments on commit f6ab91a

Please sign in to comment.