From nobody Fri Nov 29 15:37:39 2024 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 687AD2FB6 for ; Thu, 19 Sep 2024 00:09:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726704587; cv=none; b=mVaAawRUjEmA49hOToNPjyv+EPdm3mj+2j1Y9k6bGGp9BU4MJk7S7FeRY9n4f5l3J8sDmg298ajjJXGaYaqw9MBCqKnl+Prc8YrTWo+R+0xx1X70mpMqhkUsMJma1ktep76X83vFPUGHvBIxrgxQK9w9lsTOijUhngETC6s0Fjg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726704587; c=relaxed/simple; bh=yfY4uCOqXOByHsxXKhi/PmHIwUKIYPB6qI5iUj0R1hc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=hr7T1s20PMSltQ7Tf5UxjesiQUTOQRW7p1QKTbRQ4mOt0TaB+BXQFhne+xOPjzxrGoKxz/fdwInfTKkhgwkQq5/g+B/ErI30kwnWNpBhbQgRHezSb7E7E+ALyL22VUQf151XGbjxdd1tEkpTp9+VYq4MIAjXIjlrg+iVDeOowZA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--davidai.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JEyGPG9B; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--davidai.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JEyGPG9B" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6d3e062dbeeso4849427b3.0 for ; Wed, 18 Sep 2024 17:09:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1726704584; x=1727309384; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=GyeWfaiZCQZsvQ2lfnNsmw4OSqkGRzb2PVV/qLrwcGY=; b=JEyGPG9BOCq9Uoa4fqbCFDnBkEb60umq0S/keXBGLQDFd5Rpjc3FcYC8pVwh/29EMN FAf28PfI881BJ7nlXboRHBnuuDBmqafJ881c7f233A+JK8KeMKiz9yHWjgBLekMvxpyN 1Sbz791P+cgPyZEtXrlSN6K3D9le5p6+jB6IGzYnaCaRp1QaTwTAWqnr0dVx+ri1yFF5 X6CnSfCL8uC2tP6A9yiv9rmWOnUKpqyyYRDkGZ8QkBPH9gLoeelcY5DiW+ju+d0cssuI +4BipcSkYtQxKTljkQ+SNiInd2pmr2LBq7XkiLA8muCXx97nBQr5Ez1ZkViYwrA9rCD6 siJg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726704584; x=1727309384; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=GyeWfaiZCQZsvQ2lfnNsmw4OSqkGRzb2PVV/qLrwcGY=; b=ptuFOTiwu2R005gaqJXEUPQyB3Sajt/y0+V3Xdu/w4ioUU0v4B5kCtHd1hZUcAuaCB U5dvro9fa5HTF4HvbE+XhTOx5C04m/Wi6864j2p+znWr15tGQn6c5T4aFwFrNpQ7I9xu UqzZS6aTAdhfdvlUMwYyKkWStgutshBhavaX5zCIpFRlp5HJKjm6XIftFRdquY/9m+jS U/tJevan7ccvabVHTMjGnZZBW2t1bLiR5iP2Wqdwno3NgZIWscGF0SoicNUaRnGuF6I2 HZbjwQl+fCq1lysIALUF1WACcMHBcddBxQ87uPLxdrhqHH2BK19w2OvpLzE8xP5r0E32 n8fA== X-Forwarded-Encrypted: i=1; AJvYcCUU5pgmpoLFOZpstsBc7x/NjGU34Flxf5fcgcU8pYWjzIAf3jFerXJRmNMYl+lgBlOuEPxzuJSiZTFQr5A=@vger.kernel.org X-Gm-Message-State: AOJu0YxzZ516XY2xcm/uUiZo4phP9LpH42JCrSl9OvskjEhUhQZv4kRa UjgHz8mQ5QxV2ZzkiphGSA6AY2wAa61Zz/h5y9mnO2IG6JQ4tyjVA6OcxNcJchW9POsDENp5BEC IFv94Lg== X-Google-Smtp-Source: AGHT+IEY/FNsRrRJTJ+HfHn8qvlFPkR9pW+FUYun3rukwsKXSFgqA5etJcQjY0zi7Cy+rUFBYaQUIAIs7Qtl X-Received: from davidai2.mtv.corp.google.com ([2620:15c:211:201:2985:f9c1:f5a3:ad7a]) (user=davidai job=sendgmr) by 2002:a81:b80f:0:b0:6be:523:af53 with SMTP id 00721157ae682-6de09880f96mr175377b3.3.1726704584345; Wed, 18 Sep 2024 17:09:44 -0700 (PDT) Date: Wed, 18 Sep 2024 17:08:33 -0700 In-Reply-To: <20240919000837.1004642-1-davidai@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240919000837.1004642-1-davidai@google.com> X-Mailer: git-send-email 2.46.0.792.g87dc391469-goog Message-ID: <20240919000837.1004642-3-davidai@google.com> Subject: [PATCH v7 2/2] cpufreq: add virtual-cpufreq driver From: David Dai To: "Rafael J. Wysocki" , Viresh Kumar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Sudeep Holla , David Dai , Saravana Kannan Cc: Quentin Perret , Masami Hiramatsu , Will Deacon , Peter Zijlstra , Vincent Guittot , Marc Zyngier , Oliver Upton , Dietmar Eggemann , Pavan Kondeti , Gupta Pankaj , Mel Gorman , kernel-team@android.com, linux-pm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Introduce a virtualized cpufreq driver for guest kernels to improve performance and power of workloads within VMs. This driver does two main things: 1. Sends the frequency of vCPUs as a hint to the host. The host uses the hint to schedule the vCPU threads and decide physical CPU frequency. 2. If a VM does not support a virtualized FIE(like AMUs), it queries the host CPU frequency by reading a MMIO region of a virtual cpufreq device to update the guest's frequency scaling factor periodically. This enables accurate Per-Entity Load Tracking for tasks running in the guest. Co-developed-by: Saravana Kannan Signed-off-by: Saravana Kannan Signed-off-by: David Dai Acked-by: Sudeep Holla --- drivers/cpufreq/Kconfig | 14 ++ drivers/cpufreq/Makefile | 1 + drivers/cpufreq/virtual-cpufreq.c | 333 ++++++++++++++++++++++++++++++ include/linux/arch_topology.h | 1 + 4 files changed, 349 insertions(+) create mode 100644 drivers/cpufreq/virtual-cpufreq.c diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig index 2561b215432a..92a83a9bb2e1 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -217,6 +217,20 @@ config CPUFREQ_DT =20 If in doubt, say N. =20 +config CPUFREQ_VIRT + tristate "Virtual cpufreq driver" + depends on GENERIC_ARCH_TOPOLOGY + help + This adds a virtualized cpufreq driver for guest kernels that + read/writes to a MMIO region for a virtualized cpufreq device to + communicate with the host. It sends performance requests to the host + which gets used as a hint to schedule vCPU threads and select CPU + frequency. If a VM does not support a virtualized FIE such as AMUs, + it updates the frequency scaling factor by polling host CPU frequency + to enable accurate Per-Entity Load Tracking for tasks running in the gu= est. + + If in doubt, say N. + config CPUFREQ_DT_PLATDEV tristate "Generic DT based cpufreq platdev driver" depends on OF diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 0f184031dd12..10d7d6e55da8 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_ATTR_SET) +=3D cpufreq_governor= _attr_set.o =20 obj-$(CONFIG_CPUFREQ_DT) +=3D cpufreq-dt.o obj-$(CONFIG_CPUFREQ_DT_PLATDEV) +=3D cpufreq-dt-platdev.o +obj-$(CONFIG_CPUFREQ_VIRT) +=3D virtual-cpufreq.o =20 # Traces CFLAGS_amd-pstate-trace.o :=3D -I$(src) diff --git a/drivers/cpufreq/virtual-cpufreq.c b/drivers/cpufreq/virtual-cp= ufreq.c new file mode 100644 index 000000000000..a050b3a6737f --- /dev/null +++ b/drivers/cpufreq/virtual-cpufreq.c @@ -0,0 +1,333 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2024 Google LLC + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * CPU0..CPUn + * +-------------+-------------------------------+--------+-------+ + * | Register | Description | Offset | Len | + * +-------------+-------------------------------+--------+-------+ + * | cur_perf | read this register to get | 0x0 | 0x4 | + * | | the current perf (integer val | | | + * | | representing perf relative to | | | + * | | max performance) | | | + * | | that vCPU is running at | | | + * +-------------+-------------------------------+--------+-------+ + * | set_perf | write to this register to set | 0x4 | 0x4 | + * | | perf value of the vCPU | | | + * +-------------+-------------------------------+--------+-------+ + * | perftbl_len | number of entries in perf | 0x8 | 0x4 | + * | | table. A single entry in the | | | + * | | perf table denotes no table | | | + * | | and the entry contains | | | + * | | the maximum perf value | | | + * | | that this vCPU supports. | | | + * | | The guest can request any | | | + * | | value between 1 and max perf | | | + * | | when perftbls are not used. | | | + * +---------------------------------------------+--------+-------+ + * | perftbl_sel | write to this register to | 0xc | 0x4 | + * | | select perf table entry to | | | + * | | read from | | | + * +---------------------------------------------+--------+-------+ + * | perftbl_rd | read this register to get | 0x10 | 0x4 | + * | | perf value of the selected | | | + * | | entry based on perftbl_sel | | | + * +---------------------------------------------+--------+-------+ + * | perf_domain | performance domain number | 0x14 | 0x4 | + * | | that this vCPU belongs to. | | | + * | | vCPUs sharing the same perf | | | + * | | domain number are part of the | | | + * | | same performance domain. | | | + * +-------------+-------------------------------+--------+-------+ + */ + +#define REG_CUR_PERF_STATE_OFFSET 0x0 +#define REG_SET_PERF_STATE_OFFSET 0x4 +#define REG_PERFTBL_LEN_OFFSET 0x8 +#define REG_PERFTBL_SEL_OFFSET 0xc +#define REG_PERFTBL_RD_OFFSET 0x10 +#define REG_PERF_DOMAIN_OFFSET 0x14 +#define PER_CPU_OFFSET 0x1000 + +#define PERFTBL_MAX_ENTRIES 64U + +static void __iomem *base; +static DEFINE_PER_CPU(u32, perftbl_num_entries); + +static void virt_scale_freq_tick(void) +{ + int cpu =3D smp_processor_id(); + u32 max_freq =3D (u32)cpufreq_get_hw_max_freq(cpu); + u64 cur_freq; + unsigned long scale; + + cur_freq =3D (u64)readl_relaxed(base + cpu * PER_CPU_OFFSET + + REG_CUR_PERF_STATE_OFFSET); + + cur_freq <<=3D SCHED_CAPACITY_SHIFT; + scale =3D (unsigned long)div_u64(cur_freq, max_freq); + scale =3D min(scale, SCHED_CAPACITY_SCALE); + + this_cpu_write(arch_freq_scale, scale); +} + +static struct scale_freq_data virt_sfd =3D { + .source =3D SCALE_FREQ_SOURCE_VIRT, + .set_freq_scale =3D virt_scale_freq_tick, +}; + +static unsigned int virt_cpufreq_set_perf(struct cpufreq_policy *policy, + unsigned int target_freq) +{ + writel_relaxed(target_freq, + base + policy->cpu * PER_CPU_OFFSET + REG_SET_PERF_STATE_OFFSET); + return 0; +} + +static unsigned int virt_cpufreq_fast_switch(struct cpufreq_policy *policy, + unsigned int target_freq) +{ + virt_cpufreq_set_perf(policy, target_freq); + return target_freq; +} + +static u32 virt_cpufreq_get_perftbl_entry(int cpu, u32 idx) +{ + writel_relaxed(idx, base + cpu * PER_CPU_OFFSET + + REG_PERFTBL_SEL_OFFSET); + return readl_relaxed(base + cpu * PER_CPU_OFFSET + + REG_PERFTBL_RD_OFFSET); +} + +static int virt_cpufreq_target(struct cpufreq_policy *policy, + unsigned int target_freq, + unsigned int relation) +{ + struct cpufreq_freqs freqs; + int ret =3D 0; + + freqs.old =3D policy->cur; + freqs.new =3D target_freq; + + cpufreq_freq_transition_begin(policy, &freqs); + ret =3D virt_cpufreq_set_perf(policy, target_freq); + cpufreq_freq_transition_end(policy, &freqs, ret !=3D 0); + + return ret; +} + +static int virt_cpufreq_get_sharing_cpus(struct cpufreq_policy *policy) +{ + u32 cur_perf_domain, perf_domain; + struct device *cpu_dev; + int cpu; + + cur_perf_domain =3D readl_relaxed(base + policy->cpu * + PER_CPU_OFFSET + REG_PERF_DOMAIN_OFFSET); + + for_each_possible_cpu(cpu) { + cpu_dev =3D get_cpu_device(cpu); + if (!cpu_dev) + continue; + + perf_domain =3D readl_relaxed(base + cpu * + PER_CPU_OFFSET + REG_PERF_DOMAIN_OFFSET); + + if (perf_domain =3D=3D cur_perf_domain) + cpumask_set_cpu(cpu, policy->cpus); + } + + return 0; +} + +static int virt_cpufreq_get_freq_info(struct cpufreq_policy *policy) +{ + struct cpufreq_frequency_table *table; + u32 num_perftbl_entries, idx; + + num_perftbl_entries =3D per_cpu(perftbl_num_entries, policy->cpu); + + if (num_perftbl_entries =3D=3D 1) { + policy->cpuinfo.min_freq =3D 1; + policy->cpuinfo.max_freq =3D virt_cpufreq_get_perftbl_entry(policy->cpu,= 0); + + policy->min =3D policy->cpuinfo.min_freq; + policy->max =3D policy->cpuinfo.max_freq; + + policy->cur =3D policy->max; + return 0; + } + + table =3D kcalloc(num_perftbl_entries + 1, sizeof(*table), GFP_KERNEL); + if (!table) + return -ENOMEM; + + for (idx =3D 0; idx < num_perftbl_entries; idx++) + table[idx].frequency =3D virt_cpufreq_get_perftbl_entry(policy->cpu, idx= ); + + table[idx].frequency =3D CPUFREQ_TABLE_END; + policy->freq_table =3D table; + + return 0; +} + +static int virt_cpufreq_cpu_init(struct cpufreq_policy *policy) +{ + struct device *cpu_dev; + int ret; + + cpu_dev =3D get_cpu_device(policy->cpu); + if (!cpu_dev) + return -ENODEV; + + ret =3D virt_cpufreq_get_freq_info(policy); + if (ret) { + dev_warn(cpu_dev, "failed to get cpufreq info\n"); + return ret; + } + + ret =3D virt_cpufreq_get_sharing_cpus(policy); + if (ret) { + dev_warn(cpu_dev, "failed to get sharing cpumask\n"); + return ret; + } + + /* + * To simplify and improve latency of handling frequency requests on + * the host side, this ensures that the vCPU thread triggering the MMIO + * abort is the same thread whose performance constraints (Ex. uclamp + * settings) need to be updated. This simplifies the VMM (Virtual + * Machine Manager) having to find the correct vCPU thread and/or + * facing permission issues when configuring other threads. + */ + policy->dvfs_possible_from_any_cpu =3D false; + policy->fast_switch_possible =3D true; + + /* + * Using the default SCALE_FREQ_SOURCE_CPUFREQ is insufficient since + * the actual physical CPU frequency may not match requested frequency + * from the vCPU thread due to frequency update latencies or other + * inputs to the physical CPU frequency selection. This additional FIE + * source allows for more accurate freq_scale updates and only takes + * effect if another FIE source such as AMUs have not been registered. + */ + topology_set_scale_freq_source(&virt_sfd, policy->cpus); + + return 0; +} + +static void virt_cpufreq_cpu_exit(struct cpufreq_policy *policy) +{ + topology_clear_scale_freq_source(SCALE_FREQ_SOURCE_VIRT, policy->related_= cpus); + kfree(policy->freq_table); +} + +static int virt_cpufreq_online(struct cpufreq_policy *policy) +{ + /* Nothing to restore. */ + return 0; +} + +static int virt_cpufreq_offline(struct cpufreq_policy *policy) +{ + /* Dummy offline() to avoid exit() being called and freeing resources. */ + return 0; +} + +static int virt_cpufreq_verify_policy(struct cpufreq_policy_data *policy) +{ + if (policy->freq_table) + return cpufreq_frequency_table_verify(policy, policy->freq_table); + + cpufreq_verify_within_cpu_limits(policy); + return 0; +} + +static struct cpufreq_driver cpufreq_virt_driver =3D { + .name =3D "virt-cpufreq", + .init =3D virt_cpufreq_cpu_init, + .exit =3D virt_cpufreq_cpu_exit, + .online =3D virt_cpufreq_online, + .offline =3D virt_cpufreq_offline, + .verify =3D virt_cpufreq_verify_policy, + .target =3D virt_cpufreq_target, + .fast_switch =3D virt_cpufreq_fast_switch, + .attr =3D cpufreq_generic_attr, +}; + +static int virt_cpufreq_driver_probe(struct platform_device *pdev) +{ + u32 num_perftbl_entries; + int ret, cpu; + + base =3D devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(base)) + return PTR_ERR(base); + + for_each_possible_cpu(cpu) { + num_perftbl_entries =3D readl_relaxed(base + cpu * PER_CPU_OFFSET + + REG_PERFTBL_LEN_OFFSET); + + if (!num_perftbl_entries || num_perftbl_entries > PERFTBL_MAX_ENTRIES) + return -ENODEV; + + per_cpu(perftbl_num_entries, cpu) =3D num_perftbl_entries; + } + + ret =3D cpufreq_register_driver(&cpufreq_virt_driver); + if (ret) { + dev_err(&pdev->dev, "Virtual CPUFreq driver failed to register: %d\n", r= et); + return ret; + } + + dev_dbg(&pdev->dev, "Virtual CPUFreq driver initialized\n"); + return 0; +} + +static void virt_cpufreq_driver_remove(struct platform_device *pdev) +{ + cpufreq_unregister_driver(&cpufreq_virt_driver); +} + +static const struct of_device_id virt_cpufreq_match[] =3D { + { .compatible =3D "qemu,virtual-cpufreq", .data =3D NULL}, + {} +}; +MODULE_DEVICE_TABLE(of, virt_cpufreq_match); + +static struct platform_driver virt_cpufreq_driver =3D { + .probe =3D virt_cpufreq_driver_probe, + .remove =3D virt_cpufreq_driver_remove, + .driver =3D { + .name =3D "virt-cpufreq", + .of_match_table =3D virt_cpufreq_match, + }, +}; + +static int __init virt_cpufreq_init(void) +{ + return platform_driver_register(&virt_cpufreq_driver); +} +postcore_initcall(virt_cpufreq_init); + +static void __exit virt_cpufreq_exit(void) +{ + platform_driver_unregister(&virt_cpufreq_driver); +} +module_exit(virt_cpufreq_exit); + +MODULE_DESCRIPTION("Virtual cpufreq driver"); +MODULE_LICENSE("GPL"); diff --git a/include/linux/arch_topology.h b/include/linux/arch_topology.h index b721f360d759..d5d848849408 100644 --- a/include/linux/arch_topology.h +++ b/include/linux/arch_topology.h @@ -49,6 +49,7 @@ enum scale_freq_source { SCALE_FREQ_SOURCE_CPUFREQ =3D 0, SCALE_FREQ_SOURCE_ARCH, SCALE_FREQ_SOURCE_CPPC, + SCALE_FREQ_SOURCE_VIRT, }; =20 struct scale_freq_data { --=20 2.46.0.792.g87dc391469-goog