On Wed, May 19, 2021, Stamatis, Ilias wrote:
> On Tue, 2021-05-18 at 23:04 +0000, Sean Christopherson wrote:
> > On Wed, May 12, 2021, Ilias Stamatis wrote:
> > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > > index 07cf5d7ece38..84af1af7a2cc 100644
> > > --- a/arch/x86/kvm/x86.c
> > > +++ b/arch/x86/kvm/x86.c
> > > @@ -2319,18 +2319,30 @@ u64 kvm_scale_tsc(struct kvm_vcpu *vcpu, u64 tsc)
> > > }
> > > EXPORT_SYMBOL_GPL(kvm_scale_tsc);
> > >
> > > -static u64 kvm_compute_tsc_offset(struct kvm_vcpu *vcpu, u64 target_tsc)
> > > +u64 kvm_scale_tsc_l1(struct kvm_vcpu *vcpu, u64 tsc)
> > > +{
> > > + u64 _tsc = tsc;
> > > + u64 ratio = vcpu->arch.l1_tsc_scaling_ratio;
> > > +
> > > + if (ratio != kvm_default_tsc_scaling_ratio)
> > > + _tsc = __scale_tsc(ratio, tsc);
> > > +
> > > + return _tsc;
> > > +}
> >
> > Just make the ratio a param. This is complete copy+paste of kvm_scale_tsc(),
> > with 3 characters added. And all of the callers are already in an L1-specific
> > function or have L1 vs. L2 awareness. IMO, that makes the code less magical, too,
> > as I don't have to dive into a helper to see that it reads l1_tsc_scaling_ratio
> > versus tsc_scaling_ratio.
> >
>
> That's how I did it initially but changed it into a separate function after
> receiving feedback on v1. I'm neutral, I don't mind changing it back.
Ah, I see the conundrum. The vendor code isn't straightforward because of all
the enabling checks against vmcs12 controls.
Given that, I don't terribly mind the callbacks, but I do think the connection
between the computation and the VMWRITE needs to be more explicit.
Poking around the code, the other thing that would help would be to get rid of
the awful decache_tsc_multiplier(). That helper was added to paper over the
completely broken logic of commit ff2c3a180377 ("KVM: VMX: Setup TSC scaling
ratio when a vcpu is loaded"). Its use in vmx_vcpu_load_vmcs() is basically
"write the VMCS if we forgot to earlier", which is all kinds of wrong.
If we get rid of that stupidity as prep work at the beginning of this series,
and have the "setters" return the computed value, the nested VMX code can
consume the value directly instead of having the subtle dependency on the helpers.
vmcs_write64(TSC_OFFSET, kvm_calc_l2_tsc_offset(vcpu));
if (kvm_has_tsc_control)
vmcs_write64(TSC_MULTIPLIER, kvm_calc_l2_tsc_multiplier(vcpu));
Side topic, the checks against the vmcs12 controls are wrong. Specifically,
when checking a secondary execution control, KVM needs to first check that the
secondary control is enabled in the primary control. But, we helpers for that.
The primary control should use its helper, too. And while you're at it, drop
the local variable in the getter. I.e.:
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index 3c4eb14a1e86..8735f2d71e17 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -1801,13 +1801,12 @@ static u64 vmx_get_l2_tsc_offset(struct kvm_vcpu *vcpu)
static u64 vmx_get_l2_tsc_multiplier(struct kvm_vcpu *vcpu)
{
struct vmcs12 *vmcs12 = get_vmcs12(vcpu);
- u64 multiplier = kvm_default_tsc_scaling_ratio;
- if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING &&
- vmcs12->secondary_vm_exec_control & SECONDARY_EXEC_TSC_SCALING)
- multiplier = vmcs12->tsc_multiplier;
+ if (nested_cpu_has(vmcs12, CPU_BASED_USE_TSC_OFFSETTING) &&
+ nested_cpu_has2(vmcs12, SECONDARY_EXEC_TSC_SCALING))
+ return vmcs12->tsc_multiplier;
- return multiplier;
+ return kvm_default_tsc_scaling_ratio;
}
Side topic #2: I now see why the x86.c helpers skip the math if the multiplier
is kvm_default_tsc_scaling_ratio.
