lkml.org 
[lkml]   [2013]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH V4 8/9] cpuidle/ppc: Nominate new broadcast cpu on hotplug of the old
    From
    Date
    On hotplug of the broadcast cpu, cancel the hrtimer queued to do
    broadcast and nominate a new broadcast cpu.

    We choose the new broadcast cpu as one of the cpus in deep idle and thus
    send an ipi to wake it up to continue the duty of broadcast. The new
    broadcast cpu needs to find out if it woke up to resume broadcast.
    If so it needs to restart the broadcast hrtimer on itself.

    Its possible that the old broadcast cpu was hotplugged out when the broadcast
    hrtimer was about to fire on it. Therefore the newly nominated broadcast cpu
    should set the broadcast hrtimer on itself to expire immediately so as to not
    miss wakeups under such scenarios.

    Signed-off-by: Preeti U Murthy <preeti@linux.vnet.ibm.com>
    ---

    arch/powerpc/include/asm/time.h | 1 +
    arch/powerpc/kernel/time.c | 1 +
    drivers/cpuidle/cpuidle-powerpc-book3s.c | 22 ++++++++++++++++++++++
    3 files changed, 24 insertions(+)

    diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h
    index a6604b7..e24ebb4 100644
    --- a/arch/powerpc/include/asm/time.h
    +++ b/arch/powerpc/include/asm/time.h
    @@ -31,6 +31,7 @@ struct rtc_time;
    extern void to_tm(int tim, struct rtc_time * tm);
    extern void GregorianDay(struct rtc_time *tm);
    extern void tick_broadcast_ipi_handler(void);
    +extern void broadcast_irq_entry(void);

    extern void generic_calibrate_decr(void);

    diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
    index f0603a0..021a5c5 100644
    --- a/arch/powerpc/kernel/time.c
    +++ b/arch/powerpc/kernel/time.c
    @@ -852,6 +852,7 @@ void tick_broadcast_ipi_handler(void)
    {
    u64 *next_tb = &__get_cpu_var(decrementers_next_tb);

    + broadcast_irq_entry();
    *next_tb = get_tb_or_rtc();
    __timer_interrupt();
    }
    diff --git a/drivers/cpuidle/cpuidle-powerpc-book3s.c b/drivers/cpuidle/cpuidle-powerpc-book3s.c
    index 649c330..59cd529 100644
    --- a/drivers/cpuidle/cpuidle-powerpc-book3s.c
    +++ b/drivers/cpuidle/cpuidle-powerpc-book3s.c
    @@ -288,6 +288,12 @@ static int fastsleep_loop(struct cpuidle_device *dev,
    return index;
    }

    +void broadcast_irq_entry(void)
    +{
    + if (smp_processor_id() == bc_cpu)
    + hrtimer_start(bc_hrtimer, ns_to_ktime(0), HRTIMER_MODE_REL_PINNED);
    +}
    +
    /*
    * States for dedicated partition case.
    */
    @@ -366,6 +372,7 @@ static int powerpc_book3s_cpuidle_add_cpu_notifier(struct notifier_block *n,
    unsigned long action, void *hcpu)
    {
    int hotcpu = (unsigned long)hcpu;
    + unsigned long flags;
    struct cpuidle_device *dev =
    per_cpu(cpuidle_devices, hotcpu);

    @@ -378,6 +385,21 @@ static int powerpc_book3s_cpuidle_add_cpu_notifier(struct notifier_block *n,
    cpuidle_resume_and_unlock();
    break;

    + case CPU_DYING:
    + case CPU_DYING_FROZEN:
    + spin_lock_irqsave(&fastsleep_idle_lock, flags);
    + if (hotcpu == bc_cpu) {
    + bc_cpu = -1;
    + hrtimer_cancel(bc_hrtimer);
    + if (!cpumask_empty(tick_get_broadcast_oneshot_mask())) {
    + bc_cpu = cpumask_first(
    + tick_get_broadcast_oneshot_mask());
    + tick_broadcast(cpumask_of(bc_cpu));
    + }
    + }
    + spin_unlock_irqrestore(&fastsleep_idle_lock, flags);
    + break;
    +
    case CPU_DEAD:
    case CPU_DEAD_FROZEN:
    cpuidle_pause_and_lock();


    \
     
     \ /
      Last update: 2013-11-29 12:01    [W:3.288 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site