lkml.org 
[lkml]   [2010]   [Oct]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[017/103] oprofile, ARM: Release resources on failure
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Robert Richter <robert.richter@amd.com>

    commit 98d943b02f6f1b57787ff1aa6f34d019a407e3ee upstream.

    This patch fixes a resource leak on failure, where the
    oprofilefs and some counters may not released properly.

    Signed-off-by: Robert Richter <robert.richter@amd.com>
    Acked-by: Will Deacon <will.deacon@arm.com>
    Cc: linux-arm-kernel@lists.infradead.org
    LKML-Reference: <20100929145225.GJ13563@erda.amd.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/arm/oprofile/common.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/arch/arm/oprofile/common.c
    +++ b/arch/arm/oprofile/common.c
    @@ -102,6 +102,7 @@ static int op_create_counter(int cpu, in
    if (IS_ERR(pevent)) {
    ret = PTR_ERR(pevent);
    } else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
    + perf_event_release_kernel(pevent);
    pr_warning("oprofile: failed to enable event %d "
    "on CPU %d\n", event, cpu);
    ret = -EBUSY;
    @@ -365,6 +366,7 @@ int __init oprofile_arch_init(struct opr
    ret = init_driverfs();
    if (ret) {
    kfree(counter_config);
    + counter_config = NULL;
    return ret;
    }

    @@ -402,7 +404,6 @@ void oprofile_arch_exit(void)
    struct perf_event *event;

    if (*perf_events) {
    - exit_driverfs();
    for_each_possible_cpu(cpu) {
    for (id = 0; id < perf_num_counters; ++id) {
    event = perf_events[cpu][id];
    @@ -413,8 +414,10 @@ void oprofile_arch_exit(void)
    }
    }

    - if (counter_config)
    + if (counter_config) {
    kfree(counter_config);
    + exit_driverfs();
    + }
    }
    #else
    int __init oprofile_arch_init(struct oprofile_operations *ops)



    \
     
     \ /
      Last update: 2010-10-22 21:25    [W:0.020 / U:30.016 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site