On 08/29/2017 02:24 PM, David Hildenbrand wrote:
> On 28.08.2017 10:07, Christian Borntraeger wrote:
>> From: "Collin L. Walling" <walling@xxxxxxxxxxxxxxxxxx>
>>
>> Allow for the enablement of MEF and the support for the extended
>> epoch in SIE and VSIE for the extended guest TOD-Clock.
>>
>> A new interface is used for getting/setting a guest's extended
>> TOD-Clock that uses a single ioctl invocation, KVM_S390_VM_TOD_EXT.
>> The old method of getting and setting the guest TOD-Clock is
>> retained and is used when the old ioctls are called.
>
> After talking to Christian, I understand that we have to set it in "one
> shot" as we can otherwise run into problems when getting/setting the TOD
> as we are looking at a moving target. This should go into the cover letter.
You mean in the patch description or in the git tag description?
>
> I need some more info regarding the architecture change.
>
> For now, epoch was an unsigned value that is interpreted as an signed value.
It is always considered a signed value, (so the guest can be before or after the host)
we just used u64 to make the wraparound defined (doing all the math in the unsigned realm
as signed overflow is undefined)
>
> a) Is that still true with multiple epoch?
> b) What is the format of the epoch index? Can it also be "negative"?
The concatenation of both is considered a 72bit signed value.
>
> Why I am asking: I can see comparison made with the epoch:
>
>> + if (test_kvm_facility(vcpu->kvm, 139)) {
>> + scb_s->epdx += vcpu->kvm->arch.epdx;
>> + if (scb_s->epoch < vcpu->kvm->arch.epoch)
This checks for an overflow after the addition and
>> + scb_s->epdx += 1;
corrects this. Since this is all unsigned math this is
defined to wrap around and should work unless I missed
something
>> + }
>
> or
>
>> + if (kvm->arch.epoch > gtod->tod)
>> + kvm->arch.epdx -= 1;
>
>
> If I remember correctly, such comparisons won't work correctly when
> having this signed/unsigned duality. But I might be wrong.
As far as I can see we have unsigned data types everywhere.
>
>
>>
>> Signed-off-by: Collin L. Walling <walling@xxxxxxxxxxxxxxxxxx>
>> Reviewed-by: Janosch Frank <frankja@xxxxxxxxxxxxxxxxxx>
>> Reviewed-by: Claudio Imbrenda <imbrenda@xxxxxxxxxxxxxxxxxx>
>> Reviewed-by: Jason J. Herne <jjherne@xxxxxxxxxxxxxxxxxx>
>> Signed-off-by: Christian Borntraeger <borntraeger@xxxxxxxxxx>
>> ---
>
> [...]
>>
>> /* implemented in kvm-s390.c */
>> +void kvm_s390_set_tod_clock_ext(struct kvm *kvm,
>> + const struct kvm_s390_vm_tod_clock *gtod);
>> void kvm_s390_set_tod_clock(struct kvm *kvm, u64 tod);
>> long kvm_arch_fault_in_page(struct kvm_vcpu *vcpu, gpa_t gpa, int writable);
>> int kvm_s390_store_status_unloaded(struct kvm_vcpu *vcpu, unsigned long addr);
>> diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
>> index 715c19c..681d06e 100644
>> --- a/arch/s390/kvm/vsie.c
>> +++ b/arch/s390/kvm/vsie.c
>> @@ -349,6 +349,9 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)
>> scb_s->eca |= scb_o->eca & ECA_IB;
>> if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_CEI))
>> scb_s->eca |= scb_o->eca & ECA_CEI;
>> + /* Epoch Extension */
>> + if (test_kvm_facility(vcpu->kvm, 139))
>> + scb_s->ecd |= scb_o->ecd & ECD_MEF;
>>
>> prepare_ibc(vcpu, vsie_page);
>> rc = shadow_crycb(vcpu, vsie_page);
>> @@ -919,6 +922,13 @@ static void register_shadow_scb(struct kvm_vcpu *vcpu,
>> */
>> preempt_disable();
>> scb_s->epoch += vcpu->kvm->arch.epoch;
>> +
>> + if (test_kvm_facility(vcpu->kvm, 139)) {
>
> Although scb_s->epdx won't be interpreted without ECD_MEF, this should
> be (so data is only copied if really enabled).
>
> if (scb_s->ecd | ECD_MEF)
As you said, it does not matter but it certainly is clearer. I can fix.
>
>> + scb_s->epdx += vcpu->kvm->arch.epdx;
>> + if (scb_s->epoch < vcpu->kvm->arch.epoch)
>> + scb_s->epdx += 1;
>> + }
>> +
>> preempt_enable();
>> }
>>
>> diff --git a/arch/s390/tools/gen_facilities.c b/arch/s390/tools/gen_facilities.c
>> index 181db5b..601bfcf 100644
>> --- a/arch/s390/tools/gen_facilities.c
>> +++ b/arch/s390/tools/gen_facilities.c
>> @@ -81,6 +81,7 @@ static struct facility_def facility_defs[] = {
>> 130, /* instruction-execution-protection */
>> 131, /* enhanced-SOP 2 and side-effect */
>> 138, /* configuration z/architecture mode (czam) */
>> + 139, /* multiple epoch facility */
>> 146, /* msa extension 8 */
>> -1 /* END */
>> }
>>
>
>
