Re: [PATCH V2] arm64: psci: Reduce waiting time of cpu_psci_cpu_kill()

Yunfeng Ye
2019-10-16T03:22:43Z

On 2019/10/16 0:23, Will Deacon wrote:
> Hi,
>
> On Sat, Sep 21, 2019 at 07:21:17PM +0800, Yunfeng Ye wrote:
>> If psci_ops.affinity_info() fails, it will sleep 10ms, which will not
>> take so long in the right case. Use usleep_range() instead of msleep(),
>> reduce the waiting time, and give a chance to busy wait before sleep.
>
> Can you elaborate on "the right case" please? It's not clear to me
> exactly what problem you're solving here.
>
The situation is that when the power is off, we have a battery to save some
information, but the battery power is limited, so we reduce the power consumption
by turning off the cores, and need fastly to complete the core shutdown. However, the
time of cpu_psci_cpu_kill() will take 10ms. We have tested the time that it does not
need 10ms, and most case is about 50us-500us. if we reduce the time of cpu_psci_cpu_kill(),
we can reduce 10% - 30% of the total time.

So change msleep (10) to usleep_range() to reduce the waiting time. In addition,
we don't want to be scheduled during the sleeping time, some threads may take a
long time and don't give up the CPU, which affects the time of core shutdown,
Therefore, we add a chance to busy-wait max 1ms.

thanks.

> I've also added Sudeep to the thread, since I'd like his ack on the change.
>
> Will
>
>> arch/arm64/kernel/psci.c | 17 +++++++++++++----
>> 1 file changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
>> index c9f72b2..99b3122 100644
>> --- a/arch/arm64/kernel/psci.c
>> +++ b/arch/arm64/kernel/psci.c
>> @@ -82,6 +82,7 @@ static void cpu_psci_cpu_die(unsigned int cpu)
>> static int cpu_psci_cpu_kill(unsigned int cpu)
>> {
>> int err, i;
>> + unsigned long timeout;
>>
>> if (!psci_ops.affinity_info)
>> return 0;
>> @@ -91,16 +92,24 @@ static int cpu_psci_cpu_kill(unsigned int cpu)
>> * while it is dying. So, try again a few times.
>> */
>>
>> - for (i = 0; i < 10; i++) {
>> + i = 0;
>> + timeout = jiffies + msecs_to_jiffies(100);
>> + do {
>> err = psci_ops.affinity_info(cpu_logical_map(cpu), 0);
>> if (err == PSCI_0_2_AFFINITY_LEVEL_OFF) {
>> pr_info("CPU%d killed.\n", cpu);
>> return 0;
>> }
>>
>> - msleep(10);
>> - pr_info("Retrying again to check for CPU kill\n");
>> - }
>> + /* busy-wait max 1ms */
>> + if (i++ < 100) {
>> + cond_resched();
>> + udelay(10);
>> + continue;
>> + }
>> +
>> + usleep_range(100, 1000);
>> + } while (time_before(jiffies, timeout));
>>
>> pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",
>> cpu, err);
>> --
>> 2.7.4.huawei.3
>>
>
> .
>