Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp13336224ybl; Sun, 29 Dec 2019 09:34:11 -0800 (PST) X-Google-Smtp-Source: APXvYqwsemcsVJZdtntfCCHnGziVF/tSt/MIm/VUgLaUPlAgTT467M+IYJmPu7GaLNb/Mxh4f0lR X-Received: by 2002:a05:6830:1755:: with SMTP id 21mr69645055otz.323.1577640851436; Sun, 29 Dec 2019 09:34:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1577640851; cv=none; d=google.com; s=arc-20160816; b=0Y8XhRdUWSIvUXXpeE+qn/Fce7lscXyTl2240Pc3h+pgj+xIu72SdUmtuYB/o0NNfY BG5Ug5aGs1dpgjus9ER9MXD20z19TVNgC8G+3hbbeFLu8VMrxYW/e49O/CIGFXaXeIhe bb0olz7Yi4aaYx83ald9yHdkiUNAaJONofYArFFrFQfvRiOhz40f8Ijo4YiE2xkuvsRH xTRZb3W9CnxZssaGqApbTVO9RNAO6oSe8GEgZZ68ldr30Um8zcA8xff5tuPbwYNp+T5+ +CbDJEcQZlJ1tX0D+KMx3d1vwnvP4sE0S76CdFBkkOynbCcBCPJtRMx9MmXsWMvY26su dMqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WqGgZmF2wESfipGS+p1yIyYLE3th7LKbwD9O/BdlBiQ=; b=vZtsoO56N33eKqymJ4EBt3+7erfYIR8pCYccD0rMwuQTueHUvws9gwuMABfKo8G6Xo +EHIvEe4uud0V9I34UWMdb7td6XeTQ+ts5zqGcSMtOOagNtB6hA1i/tlywaLe+1BxUZi XqvAE6JpiiOdM524LL14ONVLCcKjl7d/tUOA/9P0zcdphBs19+4Jv8oy2DAX3E8RlWlq 3aImvR+9jCt/oEfml3GUqQzr3RaDhedimmRAI1Ig/kVSlOu0ZnAZdCGpfhqLfqf5bZEI jVK04kjUG67TrGVO7htvk1XISt4NxzfDTOUxJh5M6OoJJOhd/lDSzxejrKAybumvz7SU +2hg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cYA52psD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x11si4017808oic.185.2019.12.29.09.34.00; Sun, 29 Dec 2019 09:34:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cYA52psD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728174AbfL2Rc4 (ORCPT + 99 others); Sun, 29 Dec 2019 12:32:56 -0500 Received: from mail.kernel.org ([198.145.29.99]:33836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729368AbfL2Rcx (ORCPT ); Sun, 29 Dec 2019 12:32:53 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C396220409; Sun, 29 Dec 2019 17:32:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577640772; bh=9RACWVCjpjTDOoaoIHWooaa+6h52XFm/sW+01Hb6ZPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cYA52psD0BweDFJQ+4SfhzS1eDd7jreeeFNqCIzaVojIPnpbsFTJ34QGabGDUw5Mp 0u7c5JNs6X9DmvoSK6P3CPsoE1klVVe+OhdmU17VSRwG1sayp97sOdPx28wNSNluq5 mZntUkmxpvk7dga5O+CL7ukhLyRykugOQLL5FTiU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yunfeng Ye , Sudeep Holla , Catalin Marinas , Sasha Levin Subject: [PATCH 4.19 093/219] arm64: psci: Reduce the waiting time for cpu_psci_cpu_kill() Date: Sun, 29 Dec 2019 18:18:15 +0100 Message-Id: <20191229162521.505979378@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191229162508.458551679@linuxfoundation.org> References: <20191229162508.458551679@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yunfeng Ye [ 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 Reviewed-by: Sudeep Holla Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/psci.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/psci.c b/arch/arm64/kernel/psci.c index e8edbf13302a..3856d51c645b 100644 --- a/arch/arm64/kernel/psci.c +++ b/arch/arm64/kernel/psci.c @@ -84,7 +84,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; @@ -94,16 +95,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); -- 2.20.1