From: Paul Durrant Date: Wed, 4 Oct 2023 17:46:28 +0000 (+0000) Subject: KVM: x86/xen: ignore the VCPU_SSHOTTMR_future flag X-Git-Tag: v6.7-rc1~92^2~3^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=409f2e92a27a210fc768c5569851b4a419e6a232;p=thirdparty%2Flinux.git KVM: x86/xen: ignore the VCPU_SSHOTTMR_future flag Upstream Xen now ignores _VCPU_SSHOTTMR_future[1], since the only guest kernel ever to use it was buggy. By ignoring the flag the guest will always get a callback if it sets a negative timeout which upstream Xen has determined not to cause problems for any guest setting the flag. [1] https://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=19c6cbd909 Signed-off-by: Paul Durrant Reviewed-by: David Woodhouse Link: https://lore.kernel.org/r/20231004174628.2073263-1-paul@xen.org Signed-off-by: Sean Christopherson --- diff --git a/arch/x86/kvm/xen.c b/arch/x86/kvm/xen.c index 75586da134b38..c539f18e0b608 100644 --- a/arch/x86/kvm/xen.c +++ b/arch/x86/kvm/xen.c @@ -1423,12 +1423,8 @@ static bool kvm_xen_hcall_vcpu_op(struct kvm_vcpu *vcpu, bool longmode, int cmd, return true; } + /* A delta <= 0 results in an immediate callback, which is what we want */ delta = oneshot.timeout_abs_ns - get_kvmclock_ns(vcpu->kvm); - if ((oneshot.flags & VCPU_SSHOTTMR_future) && delta < 0) { - *r = -ETIME; - return true; - } - kvm_xen_start_timer(vcpu, oneshot.timeout_abs_ns, delta); *r = 0; return true;