lkml.org 
[lkml]   [2016]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 06/13] intel_idle: Fix dangling registration on error path.
    Date
    From: Richard Cochran <rcochran@linutronix.de>

    In the module_init() method, if the per-CPU allocation fails, then the
    active cpuidle registration is not cleaned up. This patch fixes the
    issue by attempting the allocation before registration, and then
    cleaning it up again on registration failure.

    Signed-off-by: Richard Cochran <rcochran@linutronix.de>
    Signed-off-by: Len Brown <len.brown@intel.com>
    ---
    drivers/idle/intel_idle.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
    index 5b309e5..085538a 100644
    --- a/drivers/idle/intel_idle.c
    +++ b/drivers/idle/intel_idle.c
    @@ -1347,19 +1347,20 @@ static int __init intel_idle_init(void)
    if (retval)
    return retval;

    + intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
    + if (intel_idle_cpuidle_devices == NULL)
    + return -ENOMEM;
    +
    intel_idle_cpuidle_driver_init();
    retval = cpuidle_register_driver(&intel_idle_driver);
    if (retval) {
    struct cpuidle_driver *drv = cpuidle_get_driver();
    printk(KERN_DEBUG PREFIX "intel_idle yielding to %s",
    drv ? drv->name : "none");
    + free_percpu(intel_idle_cpuidle_devices);
    return retval;
    }

    - intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
    - if (intel_idle_cpuidle_devices == NULL)
    - return -ENOMEM;
    -
    cpu_notifier_register_begin();

    for_each_online_cpu(i) {
    --
    2.8.0.rc4.16.g56331f8
    \
     
     \ /
      Last update: 2016-04-06 23:21    [W:2.660 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site