Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp338541pxu; Thu, 3 Dec 2020 01:18:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJx/GLK8MnBjjPZgTpCvx3Anq643116L4YQHrNVX99q/bV31FFks5VawBRYK+g0Sa+/cRxB9 X-Received: by 2002:aa7:d784:: with SMTP id s4mr1916225edq.215.1606987104334; Thu, 03 Dec 2020 01:18:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606987104; cv=none; d=google.com; s=arc-20160816; b=Ay3EmsmQh8AL05WMWfEJoO/4LRpDMnmeb/+MKXJJSxPpx3xpFTnwuF1Q6vV1BB16zr OpqjEo4xQ63SSc00OqiZlDJxTp8Uvx2I8rI6dxQBxFZxb9Z2HJGEGVrMFR+n/8FdPLh2 Ybq9TTsBjTdN2Ti08Ec6xXupc5Gu+GS+4gXejxOE4/dx4oWnbMc6ARcTwnQpxnbBOY4x 52f3P22qtNH+v+gqLBzwSeGpPuoAm4mZ/r9oUtlxTNOFrYman+k632pfcIvm90Zww/hJ r5jshS3jG02a1g1TUsm1O/lyWHkhfgwOJkknCc/U/PfGQ25hMVhlXNSgakPgNepEKxpa ExyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=z1Jqmtp3tY43MUG33PjQHmqEZxQbypHmXIYfgS4ZeCs=; b=fiOuQaLLwQhlRo/9eBZWRW8Qidcb8ycDKtaF6gZqjcLjtSRzRMadS9AsENv0+MFyOs n6zxU/8cYQ/OK08WmR+9wqx+F3vOAFx53qE8o8ffAg6uzhxQrnZfSlXvNNfrnpNyMBi8 5Y674qLXUTzWbmyB0W+nWZvYuPbV5sjiT6X+WVGh9czYgcJmPQgETz6QQht8EIJipkbL EOo7G+8sQmAcFKUgzDVisV8Sr89D0uGroxjSDzEzMj7JETFqiWWKbMKAdtC+7txOficG N8Y+NFWuAqEN8NGT503QLyxYkVk8XR/9P8lZsb3SuePxrB2ZkoBzQQngBJKgmtl7F2f9 x+Uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EZyX8QAL; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dd21si558122edb.261.2020.12.03.01.18.01; Thu, 03 Dec 2020 01:18:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EZyX8QAL; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387757AbgLCJOK (ORCPT + 99 others); Thu, 3 Dec 2020 04:14:10 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:39510 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730089AbgLCJOF (ORCPT ); Thu, 3 Dec 2020 04:14:05 -0500 Date: Thu, 03 Dec 2020 09:13:20 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1606986801; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z1Jqmtp3tY43MUG33PjQHmqEZxQbypHmXIYfgS4ZeCs=; b=EZyX8QALlbS4TJKR5TbvaOF7E/VJGIh+RK9ZzX7Y3fGmGLcLScf8PjINVrrykUMbgyfoEm IppFO9ze9Z5qIuCcvPCtR/FUrHcWlfMTpfBdUuuT6rFDenBsumS4eFrh1Khn+t6sWcnm3v P7znjoKh9JKKUysRXTNN3dzwGYQ1cQajrS5Ql/6IefS2XQvWYC1qMjwxZ6i9x9bVkPEzd1 u6hsq+tvOjHy1UeMdGXh89YOXR6U8KnFk2D90d0Nfd2Bo7lQxRCx4Fnv9JFCTqKFHgOP15 viS12jNirew2KQq/l0JtyVw/zbRoijQzMS1HQ0e04GMgfMQxwRPR9ADy0z1zrg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1606986801; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z1Jqmtp3tY43MUG33PjQHmqEZxQbypHmXIYfgS4ZeCs=; b=lvOnJg3ZhxsveF56RyzX0LJ4cS701eNlWTb7/E6ejZlBzXHdrrVQDGx8JWnR5b8GGBATvL lqIrquePPKun+xDg== From: "tip-bot2 for Nathan Fontenot" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] x86, sched: Calculate frequency invariance for AMD systems Cc: Giovanni Gherdovich , Nathan Fontenot , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20201112182614.10700-2-ggherdovich@suse.cz> References: <20201112182614.10700-2-ggherdovich@suse.cz> MIME-Version: 1.0 Message-ID: <160698680075.3364.11539086826689116966.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 0edb0fb35fa687e633322d23e5f44b7cfd21a5c5 Gitweb: https://git.kernel.org/tip/0edb0fb35fa687e633322d23e5f44b7cfd21a5c5 Author: Nathan Fontenot AuthorDate: Thu, 12 Nov 2020 19:26:12 +01:00 Committer: Peter Zijlstra CommitterDate: Thu, 03 Dec 2020 10:00:34 +01:00 x86, sched: Calculate frequency invariance for AMD systems This is the first pass in creating the ability to calculate the frequency invariance on AMD systems. This approach uses the CPPC highest performance and nominal performance values that range from 0 - 255 instead of a high and base frquency. This is because we do not have the ability on AMD to get a highest frequency value. On AMD systems the highest performance and nominal performance vaues do correspond to the highest and base frequencies for the system so using them should produce an appropriate ratio but some tweaking is likely necessary. Due to CPPC being initialized later in boot than when the frequency invariant calculation is currently made, I had to create a callback from the CPPC init code to do the calculation after we have CPPC data. Special thanks to "kernel test robot " for reporting that compilation of drivers/acpi/cppc_acpi.c is conditional to CONFIG_ACPI_CPPC_LIB, not just CONFIG_ACPI. [ ggherdovich@suse.cz: made safe under CPU hotplug, edited changelog ] Signed-off-by: Giovanni Gherdovich Signed-off-by: Nathan Fontenot Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20201112182614.10700-2-ggherdovich@suse.cz --- arch/x86/include/asm/topology.h | 5 ++- arch/x86/kernel/smpboot.c | 76 +++++++++++++++++++++++++++++--- drivers/acpi/cppc_acpi.c | 7 +++- 3 files changed, 83 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index f423457..488a8e8 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h @@ -218,4 +218,9 @@ static inline void arch_set_max_freq_ratio(bool turbo_disabled) } #endif +#ifdef CONFIG_ACPI_CPPC_LIB +void init_freq_invariance_cppc(void); +#define init_freq_invariance_cppc init_freq_invariance_cppc +#endif + #endif /* _ASM_X86_TOPOLOGY_H */ diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index de776b2..a4ab5cf 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -82,6 +82,10 @@ #include #include +#ifdef CONFIG_ACPI_CPPC_LIB +#include +#endif + /* representing HT siblings of each logical CPU */ DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map); EXPORT_PER_CPU_SYMBOL(cpu_sibling_map); @@ -148,7 +152,7 @@ static inline void smpboot_restore_warm_reset_vector(void) *((volatile u32 *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0; } -static void init_freq_invariance(bool secondary); +static void init_freq_invariance(bool secondary, bool cppc_ready); /* * Report back to the Boot Processor during boot time or to the caller processor @@ -186,7 +190,7 @@ static void smp_callin(void) */ set_cpu_sibling_map(raw_smp_processor_id()); - init_freq_invariance(true); + init_freq_invariance(true, false); /* * Get our bogomips. @@ -1340,7 +1344,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) set_sched_topology(x86_topology); set_cpu_sibling_map(0); - init_freq_invariance(false); + init_freq_invariance(false, false); smp_sanity_check(); switch (apic_intr_mode) { @@ -2027,6 +2031,46 @@ out: return true; } +#ifdef CONFIG_ACPI_CPPC_LIB +static bool amd_set_max_freq_ratio(void) +{ + struct cppc_perf_caps perf_caps; + u64 highest_perf, nominal_perf; + u64 perf_ratio; + int rc; + + rc = cppc_get_perf_caps(0, &perf_caps); + if (rc) { + pr_debug("Could not retrieve perf counters (%d)\n", rc); + return false; + } + + highest_perf = perf_caps.highest_perf; + nominal_perf = perf_caps.nominal_perf; + + if (!highest_perf || !nominal_perf) { + pr_debug("Could not retrieve highest or nominal performance\n"); + return false; + } + + perf_ratio = div_u64(highest_perf * SCHED_CAPACITY_SCALE, nominal_perf); + if (!perf_ratio) { + pr_debug("Non-zero highest/nominal perf values led to a 0 ratio\n"); + return false; + } + + arch_turbo_freq_ratio = perf_ratio; + arch_set_max_freq_ratio(false); + + return true; +} +#else +static bool amd_set_max_freq_ratio(void) +{ + return false; +} +#endif + static void init_counter_refs(void) { u64 aperf, mperf; @@ -2038,7 +2082,7 @@ static void init_counter_refs(void) this_cpu_write(arch_prev_mperf, mperf); } -static void init_freq_invariance(bool secondary) +static void init_freq_invariance(bool secondary, bool cppc_ready) { bool ret = false; @@ -2054,6 +2098,12 @@ static void init_freq_invariance(bool secondary) if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) ret = intel_set_max_freq_ratio(); + else if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) { + if (!cppc_ready) { + return; + } + ret = amd_set_max_freq_ratio(); + } if (ret) { init_counter_refs(); @@ -2063,6 +2113,22 @@ static void init_freq_invariance(bool secondary) } } +#ifdef CONFIG_ACPI_CPPC_LIB +static DEFINE_MUTEX(freq_invariance_lock); + +void init_freq_invariance_cppc(void) +{ + static bool secondary; + + mutex_lock(&freq_invariance_lock); + + init_freq_invariance(secondary, true); + secondary = true; + + mutex_unlock(&freq_invariance_lock); +} +#endif + static void disable_freq_invariance_workfn(struct work_struct *work) { static_branch_disable(&arch_scale_freq_key); @@ -2112,7 +2178,7 @@ error: schedule_work(&disable_freq_invariance_work); } #else -static inline void init_freq_invariance(bool secondary) +static inline void init_freq_invariance(bool secondary, bool cppc_ready) { } #endif /* CONFIG_X86_64 */ diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index 7a99b19..a852dc4 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c @@ -39,6 +39,7 @@ #include #include #include +#include #include @@ -688,6 +689,10 @@ static bool is_cppc_supported(int revision, int num_ent) * } */ +#ifndef init_freq_invariance_cppc +static inline void init_freq_invariance_cppc(void) { } +#endif + /** * acpi_cppc_processor_probe - Search for per CPU _CPC objects. * @pr: Ptr to acpi_processor containing this CPU's logical ID. @@ -850,6 +855,8 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) goto out_free; } + init_freq_invariance_cppc(); + kfree(output.pointer); return 0;