KVM: arm64: pvtime: Ensure task delay accounting is enabled
PATCH 1/1 KVM: arm64: pvtime: Ensure task delay accounting is enabled
Ensure we're actually accounting run_delay before we claim that we'll expose it to the guest. If we're not, then we just pretend like steal time isn't supported in order to avoid any confusion.
Signed-off-by Andrew Jones <[email protected]>
--- arch/arm64/kvm/pvtime.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
arch/arm64/kvm/pvtime.c +12 -3
@@ -3,6 +3,7 @@#include <linux/arm-smccc.h> #include <linux/kvm_host.h> +#include <linux/sched/stat.h> #include <asm/kvm_mmu.h> #include <asm/pvclock-abi.h>
@@ -73,6 +74,11 @@ gpa_t kvm_init_stolen_time(struct kvm_vcpu *vcpu)return base; } +static bool kvm_arm_pvtime_supported (void ) +{ +return !!sched_info_on (); +} +int kvm_arm_pvtime_set_attr (struct kvm_vcpu *vcpu,struct kvm_device_attr *attr) {
@@ -82,7 +88,8 @@ int kvm_arm_pvtime_set_attr(struct kvm_vcpu *vcpu,int ret =0 ;int idx; -if (attr->attr !=KVM_ARM_VCPU_PVTIME_IPA ) +if (!kvm_arm_pvtime_supported () || + attr->attr !=KVM_ARM_VCPU_PVTIME_IPA )return -ENXIO ;if (get_user (ipa, user))
@@ -110,7 +117,8 @@ int kvm_arm_pvtime_get_attr(struct kvm_vcpu *vcpu,u64 __user *user = (u64 __user *)attr->addr;u64 ipa; -if (attr->attr !=KVM_ARM_VCPU_PVTIME_IPA ) +if (!kvm_arm_pvtime_supported () || + attr->attr !=KVM_ARM_VCPU_PVTIME_IPA )return -ENXIO ; ipa = vcpu->arch.steal.base;
@@ -125,7 +133,8 @@ int kvm_arm_pvtime_has_attr(struct kvm_vcpu *vcpu, {switch (attr->attr) {case KVM_ARM_VCPU_PVTIME_IPA : -return 0 ; +if (kvm_arm_pvtime_supported ()) +return 0 ; }return -ENXIO ; }
Signature · 6 lines
2.25.4 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 3 lines · Andrew Jones
Ensure we're actually accounting
run_delaybefore we claim that we'll expose it to the guest. If we're not, then we just pretend like steal time isn't supported in order to avoid any confusion.
Applied to next, thanks!
[1/1] KVM: arm64: pvtime: Ensure task delay accounting is enabled
commit: a25e91028ac2f544e0140aff2c9360a0e995dd86
Cheers,
M.
Signature · 7 lines
Without deviation from the norm, progress is not possible. _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm