From: Peter Zijlstra Date: Fri, 4 Jun 2010 13:18:01 +0000 (+0200) Subject: perf: Fix signed comparison in perf_adjust_period() X-Git-Tag: v2.6.34.1~37 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=22fc69f9e98416df62729635f702b5459c4d73a5;p=karo-tx-linux.git perf: Fix signed comparison in perf_adjust_period() commit f6ab91add6355e231e1c47897027b2a6ee4fa268 upstream. 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 Tested-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar Signed-off-by: Greg Kroah-Hartman --- diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 44b4c626907c..8fcebb4ac0f9 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -1456,6 +1456,9 @@ do { \ divisor = nsec * frequency; } + if (!divisor) + return dividend; + return div64_u64(dividend, divisor); } @@ -1478,7 +1481,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);