| Message ID | 1443418691-24050-7-git-send-email-haozhong.zhang@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 28/09/2015 07:38, Haozhong Zhang wrote: > + > +static inline void adjust_tsc_offset_guest(struct kvm_vcpu *vcpu, > + s64 adjustment) > +{ > + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, false); > +} > + > +static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment) > +{ > + if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio) > + WARN_ON(adjustment < 0); > + adjustment = kvm_scale_tsc(vcpu, (u64) adjustment); > + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, true); > +} You can remove the final argument to the callback (and possibly change the callback's name to adjust_tsc_offset_guest), because it is now unused. Paolo -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Sep 28, 2015 at 10:14:19PM +0200, Paolo Bonzini wrote: > > > On 28/09/2015 07:38, Haozhong Zhang wrote: > > + > > +static inline void adjust_tsc_offset_guest(struct kvm_vcpu *vcpu, > > + s64 adjustment) > > +{ > > + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, false); > > +} > > + > > +static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment) > > +{ > > + if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio) > > + WARN_ON(adjustment < 0); > > + adjustment = kvm_scale_tsc(vcpu, (u64) adjustment); > > + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, true); > > +} > > You can remove the final argument to the callback (and possibly change > the callback's name to adjust_tsc_offset_guest), because it is now unused. > > Paolo Thanks! will do it. - Haozhong -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 0bbb2a7..67b4a96 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -895,19 +895,6 @@ struct kvm_arch_async_pf { bool direct_map; }; -extern struct kvm_x86_ops *kvm_x86_ops; - -static inline void adjust_tsc_offset_guest(struct kvm_vcpu *vcpu, - s64 adjustment) -{ - kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, false); -} - -static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment) -{ - kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, true); -} - int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index c49cd28..239263f3 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1045,12 +1045,6 @@ static void svm_adjust_tsc_offset(struct kvm_vcpu *vcpu, s64 adjustment, bool ho { struct vcpu_svm *svm = to_svm(vcpu); - if (host) { - if (vcpu->arch.tsc_scaling_ratio != TSC_RATIO_DEFAULT) - WARN_ON(adjustment < 0); - adjustment = kvm_scale_tsc(vcpu, (u64)adjustment); - } - svm->vmcb->control.tsc_offset += adjustment; if (is_guest_mode(vcpu)) svm->nested.hsave->control.tsc_offset += adjustment; diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 3c43e3e..2a21845 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -1146,5 +1146,20 @@ static inline void kvm_vcpu_set_dy_eligible(struct kvm_vcpu *vcpu, bool val) #endif /* CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT */ u64 kvm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc); +extern struct kvm_x86_ops *kvm_x86_ops; + +static inline void adjust_tsc_offset_guest(struct kvm_vcpu *vcpu, + s64 adjustment) +{ + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, false); +} + +static inline void adjust_tsc_offset_host(struct kvm_vcpu *vcpu, s64 adjustment) +{ + if (vcpu->arch.tsc_scaling_ratio != kvm_default_tsc_scaling_ratio) + WARN_ON(adjustment < 0); + adjustment = kvm_scale_tsc(vcpu, (u64) adjustment); + kvm_x86_ops->adjust_tsc_offset(vcpu, adjustment, true); +} #endif
For both VMX and SVM, if the 2nd argument of call-back adjust_tsc_offset() is the host TSC, then adjust_tsc_offset() will scale it first. This patch moves this common TSC scaling logic to its caller adjust_tsc_offset_host(). Signed-off-by: Haozhong Zhang <haozhong.zhang@intel.com> --- arch/x86/include/asm/kvm_host.h | 13 ------------- arch/x86/kvm/svm.c | 6 ------ include/linux/kvm_host.h | 15 +++++++++++++++ 3 files changed, 15 insertions(+), 19 deletions(-)