| Message ID | 20230331014356.1033759-5-davidai@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Improve VM CPUfreq and task placement behavior | expand |
On Thu, Mar 30, 2023 at 06:43:48PM -0700, David Dai wrote: > diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst > index 38ce33564efc..8f905456e2b4 100644 > --- a/Documentation/virt/kvm/api.rst > +++ b/Documentation/virt/kvm/api.rst > @@ -8400,6 +8400,14 @@ after normalizing for architecture. This is useful when guests are tracking > workload on its vCPUs. Util hints allow the host to make more accurate > frequency selections and task placement for vCPU threads. > > +8.42 KVM_CAP_GET_CPUFREQ_TBL > +--------------------------- > + > +:Architectures: arm64 > + > +This capability indicates that the KVM supports getting the > +frequency table of the current CPU that the vCPU thread is running on. > + > 9. Known KVM API problems > ========================= > > diff --git a/Documentation/virt/kvm/arm/get_freqtbl.rst b/Documentation/virt/kvm/arm/get_freqtbl.rst > new file mode 100644 > index 000000000000..f6832d7566e7 > --- /dev/null > +++ b/Documentation/virt/kvm/arm/get_freqtbl.rst > @@ -0,0 +1,23 @@ > +.. SPDX-License-Identifier: GPL-2.0 > + > +get_freqtbl support for arm/arm64 > +============================= > + > +Allows guest to query the frequency(in KHz) table of the current CPU that > +the vCPU thread is running on. > + > +* ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID: 0x86000042 > + > +This hypercall uses the SMC32/HVC32 calling convention: > + > +ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID > + ============== ======== ===================================== > + Function ID: (uint32) 0x86000042 > + Arguments: (uint32) index of the current CPU's frequency table > + Return Values: (int32) NOT_SUPPORTED(-1) on error, or > + (uint32) Frequency table entry of requested index > + in KHz > + of current CPU(r1) > + Endianness: Must be the same endianness > + as the host. > + ============== ======== ===================================== Sphinx reports htmldocs warnings: /home/bagas/repo/linux-kernel/Documentation/virt/kvm/api.rst:8404: WARNING: Title underline too short. 8.42 KVM_CAP_GET_CPUFREQ_TBL --------------------------- /home/bagas/repo/linux-kernel/Documentation/virt/kvm/api.rst:8404: WARNING: Title underline too short. 8.42 KVM_CAP_GET_CPUFREQ_TBL --------------------------- /home/bagas/repo/linux-kernel/Documentation/virt/kvm/arm/get_freqtbl.rst:4: WARNING: Title underline too short. get_freqtbl support for arm/arm64 ============================= I have applied the fixup: ---- >8 ---- diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index baf8a4c43b5839..3579c470375938 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -8401,7 +8401,7 @@ workload on its vCPUs. Util hints allow the host to make more accurate frequency selections and task placement for vCPU threads. 8.42 KVM_CAP_GET_CPUFREQ_TBL ---------------------------- +---------------------------- :Architectures: arm64 diff --git a/Documentation/virt/kvm/arm/get_freqtbl.rst b/Documentation/virt/kvm/arm/get_freqtbl.rst index f6832d7566e7e5..215bf0f653e461 100644 --- a/Documentation/virt/kvm/arm/get_freqtbl.rst +++ b/Documentation/virt/kvm/arm/get_freqtbl.rst @@ -1,7 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0 get_freqtbl support for arm/arm64 -============================= +================================= Allows guest to query the frequency(in KHz) table of the current CPU that the vCPU thread is running on. Thanks.
diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 38ce33564efc..8f905456e2b4 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -8400,6 +8400,14 @@ after normalizing for architecture. This is useful when guests are tracking workload on its vCPUs. Util hints allow the host to make more accurate frequency selections and task placement for vCPU threads. +8.42 KVM_CAP_GET_CPUFREQ_TBL +--------------------------- + +:Architectures: arm64 + +This capability indicates that the KVM supports getting the +frequency table of the current CPU that the vCPU thread is running on. + 9. Known KVM API problems ========================= diff --git a/Documentation/virt/kvm/arm/get_freqtbl.rst b/Documentation/virt/kvm/arm/get_freqtbl.rst new file mode 100644 index 000000000000..f6832d7566e7 --- /dev/null +++ b/Documentation/virt/kvm/arm/get_freqtbl.rst @@ -0,0 +1,23 @@ +.. SPDX-License-Identifier: GPL-2.0 + +get_freqtbl support for arm/arm64 +============================= + +Allows guest to query the frequency(in KHz) table of the current CPU that +the vCPU thread is running on. + +* ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID: 0x86000042 + +This hypercall uses the SMC32/HVC32 calling convention: + +ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID + ============== ======== ===================================== + Function ID: (uint32) 0x86000042 + Arguments: (uint32) index of the current CPU's frequency table + Return Values: (int32) NOT_SUPPORTED(-1) on error, or + (uint32) Frequency table entry of requested index + in KHz + of current CPU(r1) + Endianness: Must be the same endianness + as the host. + ============== ======== ===================================== diff --git a/Documentation/virt/kvm/arm/index.rst b/Documentation/virt/kvm/arm/index.rst index f83877663813..e2e56bb41491 100644 --- a/Documentation/virt/kvm/arm/index.rst +++ b/Documentation/virt/kvm/arm/index.rst @@ -13,3 +13,4 @@ ARM ptp_kvm get_cur_cpufreq util_hint + get_freqtbl diff --git a/arch/arm64/include/uapi/asm/kvm.h b/arch/arm64/include/uapi/asm/kvm.h index 61309ecb7241..ed6f593264bd 100644 --- a/arch/arm64/include/uapi/asm/kvm.h +++ b/arch/arm64/include/uapi/asm/kvm.h @@ -369,6 +369,7 @@ enum { KVM_REG_ARM_VENDOR_HYP_BIT_PTP = 1, KVM_REG_ARM_VENDOR_HYP_BIT_GET_CUR_CPUFREQ = 2, KVM_REG_ARM_VENDOR_HYP_BIT_UTIL_HINT = 3, + KVM_REG_ARM_VENDOR_HYP_BIT_GET_CPUFREQ_TBL = 4, #ifdef __KERNEL__ KVM_REG_ARM_VENDOR_HYP_BMAP_BIT_COUNT, #endif diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index bf3c4d4b9b67..cd76128e4af4 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -222,6 +222,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_ARM_SYSTEM_SUSPEND: case KVM_CAP_GET_CUR_CPUFREQ: case KVM_CAP_UTIL_HINT: + case KVM_CAP_GET_CPUFREQ_TBL: r = 1; break; case KVM_CAP_SET_GUEST_DEBUG2: diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c index 01dba07b5183..6f96579dda80 100644 --- a/arch/arm64/kvm/hypercalls.c +++ b/arch/arm64/kvm/hypercalls.c @@ -42,6 +42,22 @@ static void kvm_sched_set_util(struct kvm_vcpu *vcpu, u64 *val) val[0] = (u64)ret; } +static void kvm_sched_get_cpufreq_table(struct kvm_vcpu *vcpu, u64 *val) +{ + struct cpufreq_policy *policy; + u32 idx = smccc_get_arg1(vcpu); + + policy = cpufreq_cpu_get(task_cpu(current)); + + if (!policy) + return; + + val[0] = SMCCC_RET_SUCCESS; + val[1] = policy->freq_table[idx].frequency; + + cpufreq_cpu_put(policy); +} + static void kvm_ptp_get_time(struct kvm_vcpu *vcpu, u64 *val) { struct system_time_snapshot systime_snapshot; @@ -148,6 +164,9 @@ static bool kvm_hvc_call_allowed(struct kvm_vcpu *vcpu, u32 func_id) case ARM_SMCCC_VENDOR_HYP_KVM_UTIL_HINT_FUNC_ID: return test_bit(KVM_REG_ARM_VENDOR_HYP_BIT_UTIL_HINT, &smccc_feat->vendor_hyp_bmap); + case ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID: + return test_bit(KVM_REG_ARM_VENDOR_HYP_BIT_GET_CPUFREQ_TBL, + &smccc_feat->vendor_hyp_bmap); default: return kvm_hvc_call_default_allowed(func_id); } @@ -251,6 +270,9 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) case ARM_SMCCC_VENDOR_HYP_KVM_UTIL_HINT_FUNC_ID: kvm_sched_set_util(vcpu, val); break; + case ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID: + kvm_sched_get_cpufreq_table(vcpu, val); + break; case ARM_SMCCC_TRNG_VERSION: case ARM_SMCCC_TRNG_FEATURES: case ARM_SMCCC_TRNG_GET_UUID: diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 9f747e5025b6..19fefb73a9bd 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -114,6 +114,7 @@ #define ARM_SMCCC_KVM_FUNC_PTP 1 #define ARM_SMCCC_KVM_FUNC_GET_CUR_CPUFREQ 64 #define ARM_SMCCC_KVM_FUNC_UTIL_HINT 65 +#define ARM_SMCCC_KVM_FUNC_GET_CPUFREQ_TBL 66 #define ARM_SMCCC_KVM_FUNC_FEATURES_2 127 #define ARM_SMCCC_KVM_NUM_FUNCS 128 @@ -152,6 +153,12 @@ ARM_SMCCC_OWNER_VENDOR_HYP, \ ARM_SMCCC_KVM_FUNC_UTIL_HINT) +#define ARM_SMCCC_VENDOR_HYP_KVM_GET_CPUFREQ_TBL_FUNC_ID \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_32, \ + ARM_SMCCC_OWNER_VENDOR_HYP, \ + ARM_SMCCC_KVM_FUNC_GET_CPUFREQ_TBL) + /* Paravirtualised time calls (defined by ARM DEN0057A) */ #define ARM_SMCCC_HV_PV_TIME_FEATURES \ ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 7f667ab344ae..90a7f37f046d 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1186,6 +1186,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226 #define KVM_CAP_GET_CUR_CPUFREQ 512 #define KVM_CAP_UTIL_HINT 513 +#define KVM_CAP_GET_CPUFREQ_TBL 514 #ifdef KVM_CAP_IRQ_ROUTING diff --git a/tools/arch/arm64/include/uapi/asm/kvm.h b/tools/arch/arm64/include/uapi/asm/kvm.h index 61309ecb7241..ebf9a3395c1b 100644 --- a/tools/arch/arm64/include/uapi/asm/kvm.h +++ b/tools/arch/arm64/include/uapi/asm/kvm.h @@ -369,6 +369,7 @@ enum { KVM_REG_ARM_VENDOR_HYP_BIT_PTP = 1, KVM_REG_ARM_VENDOR_HYP_BIT_GET_CUR_CPUFREQ = 2, KVM_REG_ARM_VENDOR_HYP_BIT_UTIL_HINT = 3, + KVM_REG_ARM_VENDOR_HYP_BIT_CPUFREQ_TBL = 4, #ifdef __KERNEL__ KVM_REG_ARM_VENDOR_HYP_BMAP_BIT_COUNT, #endif