lkml.org 
[lkml]   [2010]   [Sep]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf, x86: Fix handle_irq return values
    Commit-ID:  de725dec9de7a7541996176d59cf8542365b8b0e
    Gitweb: http://git.kernel.org/tip/de725dec9de7a7541996176d59cf8542365b8b0e
    Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    AuthorDate: Thu, 2 Sep 2010 15:07:49 -0400
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 3 Sep 2010 08:05:18 +0200

    perf, x86: Fix handle_irq return values

    Now that we rely on the number of handled overflows, ensure all
    handle_irq implementations actually return the right number.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Signed-off-by: Don Zickus <dzickus@redhat.com>
    Cc: peterz@infradead.org
    Cc: robert.richter@amd.com
    Cc: gorcunov@gmail.com
    Cc: fweisbec@gmail.com
    Cc: ying.huang@intel.com
    Cc: ming.m.lin@intel.com
    Cc: eranian@google.com
    LKML-Reference: <1283454469-1909-4-git-send-email-dzickus@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/cpu/perf_event_intel.c | 9 +++++++--
    arch/x86/kernel/cpu/perf_event_p4.c | 2 +-
    2 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
    index 1297bf1..ee05c90 100644
    --- a/arch/x86/kernel/cpu/perf_event_intel.c
    +++ b/arch/x86/kernel/cpu/perf_event_intel.c
    @@ -713,6 +713,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs)
    struct cpu_hw_events *cpuc;
    int bit, loops;
    u64 status;
    + int handled = 0;

    perf_sample_data_init(&data, 0);

    @@ -743,12 +744,16 @@ again:
    /*
    * PEBS overflow sets bit 62 in the global status register
    */
    - if (__test_and_clear_bit(62, (unsigned long *)&status))
    + if (__test_and_clear_bit(62, (unsigned long *)&status)) {
    + handled++;
    x86_pmu.drain_pebs(regs);
    + }

    for_each_set_bit(bit, (unsigned long *)&status, X86_PMC_IDX_MAX) {
    struct perf_event *event = cpuc->events[bit];

    + handled++;
    +
    if (!test_bit(bit, cpuc->active_mask))
    continue;

    @@ -770,7 +775,7 @@ again:

    done:
    intel_pmu_enable_all(0);
    - return 1;
    + return handled;
    }

    static struct event_constraint *
    diff --git a/arch/x86/kernel/cpu/perf_event_p4.c b/arch/x86/kernel/cpu/perf_event_p4.c
    index 7e578e9..b560db3 100644
    --- a/arch/x86/kernel/cpu/perf_event_p4.c
    +++ b/arch/x86/kernel/cpu/perf_event_p4.c
    @@ -692,7 +692,7 @@ static int p4_pmu_handle_irq(struct pt_regs *regs)
    inc_irq_stat(apic_perf_irqs);
    }

    - return handled > 0;
    + return handled;
    }

    /*

    \
     
     \ /
      Last update: 2010-09-03 09:13    [W:0.025 / U:152.184 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site