arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill()

[ Upstream commit bfcef4ab1d7ee8921bc322109b1692036cc6cbe0 ]

In cases like suspend-to-disk and suspend-to-ram, a large number of CPU
cores need to be shut down. At present, the CPU hotplug operation is
serialised, and the CPU cores can only be shut down one by one. In this
process, if PSCI affinity_info() does not return LEVEL_OFF quickly,
cpu_psci_cpu_kill() needs to wait for 10ms. If hundreds of CPU cores
need to be shut down, it will take a long time.

Normally, there is no need to wait 10ms in cpu_psci_cpu_kill(). So
change the wait interval from 10 ms to max 1 ms and use usleep_range()
instead of msleep() for more accurate timer.

In addition, reducing the time interval will increase the messages
output, so remove the "Retry ..." message, instead, track time and
output to the the sucessful message.

Signed-off-by: Yunfeng Ye <yeyunfeng@huawei.com>
Reviewed-by: Sudeep Holla <sudeep.holla@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c
index 42816bebb1e0f732d788780fde431028f202c31a..e3713d6fb8e0028fbd4bf6bfba92518dea572f6c 100644 (file)
--- a/arch/arm64/kernel/psci.c
+++ b/arch/arm64/kernel/psci.c
@@ -83,7 +83,8 @@ static void cpu_psci_cpu_die(unsigned int cpu)
 
 static int cpu_psci_cpu_kill(unsigned int cpu)
 {
-       int err, i;
+       int err;
+       unsigned long start, end;
 
        if (!psci_ops.affinity_info)
                return 0;
@@ -93,16 +94,18 @@ 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++) {
+       start = jiffies;
+       end = start + 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);
+                       pr_info("CPU%d killed (polled %d ms)\n", cpu,
+                               jiffies_to_msecs(jiffies - start));
                        return 0;
                }
 
-               msleep(10);
-               pr_info("Retrying again to check for CPU kill\n");
-       }
+               usleep_range(100, 1000);
+       } while (time_before(jiffies, end));
 
        pr_warn("CPU%d may not have shut down cleanly (AFFINITY_INFO reports %d)\n",
                        cpu, err);