Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 122AEC05027 for ; Mon, 6 Feb 2023 20:49:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230205AbjBFUt3 (ORCPT ); Mon, 6 Feb 2023 15:49:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229970AbjBFUt0 (ORCPT ); Mon, 6 Feb 2023 15:49:26 -0500 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id E26F71F495; Mon, 6 Feb 2023 12:49:25 -0800 (PST) Received: from skinsburskii-cloud-desktop.internal.cloudapp.net (unknown [20.120.152.163]) by linux.microsoft.com (Postfix) with ESMTPSA id 4EDD520C7E05; Mon, 6 Feb 2023 12:49:25 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4EDD520C7E05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1675716565; bh=15Rq8lOsvXwsJkBehio+rOsB7GHzPMEXRpn1D+2jO4g=; h=Subject:From:Cc:Date:From; b=oTKrH3wHfHKQBy4nsCl03gpGJuW8QuYIDT8TeRFvfrfQpD3pcWOvg+tsnjAH+k59Q 1APVHs2OgMybs3DjS0bb+SPnmW5IMvRUhVwhHkUZ3AzKzH0cjCX2ang22npUN+IF3T ieQV9ShedIX1jH6FEs5G5GOBPgeAAkqH2l3/POcU= Subject: [PATCH] x86/hyperv: Pass on the lpj value from host to guest From: Stanislav Kinsburskii Cc: Stanislav Kinsburskiy , "K. Y. Srinivasan" , Haiyang Zhang , Wei Liu , Dexuan Cui , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Date: Mon, 06 Feb 2023 20:49:25 +0000 Message-ID: <167571656510.2157946.174424531449774007.stgit@skinsburskii-cloud-desktop.internal.cloudapp.net> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stanislav Kinsburskiy And have it preset. This change allows to significantly reduce time to bring up guest SMP configuration as well as make sure the guest won't get inaccurate calibration results due to "noisy neighbour" situation. Below are the numbers for 16 VCPU guest before the patch (~1300 msec) [ 0.562938] x86: Booting SMP configuration: ... [ 1.859447] smp: Brought up 1 node, 16 CPUs and after the patch (~130 msec): [ 0.445079] x86: Booting SMP configuration: ... [ 0.575035] smp: Brought up 1 node, 16 CPUs This change is inspired by commit 0293615f3fb9 ("x86: KVM guest: use paravirt function to calculate cpu khz"). Signed-off-by: Stanislav Kinsburskiy CC: "K. Y. Srinivasan" CC: Haiyang Zhang CC: Wei Liu CC: Dexuan Cui CC: Thomas Gleixner CC: Ingo Molnar CC: Borislav Petkov CC: Dave Hansen CC: x86@kernel.org CC: "H. Peter Anvin" CC: linux-hyperv@vger.kernel.org CC: linux-kernel@vger.kernel.org --- arch/x86/kernel/cpu/mshyperv.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index dedec2f23ad1..0282b2e96cc2 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -320,6 +320,21 @@ static void __init hv_smp_prepare_cpus(unsigned int max_cpus) } #endif +static void __init __maybe_unused hv_preset_lpj(void) +{ + unsigned long khz; + u64 lpj; + + if (!x86_platform.calibrate_tsc) + return; + + khz = x86_platform.calibrate_tsc(); + + lpj = ((u64)khz * 1000); + do_div(lpj, HZ); + preset_lpj = lpj; +} + static void __init ms_hyperv_init_platform(void) { int hv_max_functions_eax; @@ -521,6 +536,12 @@ static void __init ms_hyperv_init_platform(void) /* Register Hyper-V specific clocksource */ hv_init_clocksource(); + + /* + * Preset lpj to make calibrate_delay a no-op, which is turn helps to + * speed up secondary cores initialization. + */ + hv_preset_lpj(); #endif /* * TSC should be marked as unstable only after Hyper-V