KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field
PATCH 1/1 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in vsie.c (thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to 0xff in case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.
--- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/s390/kvm/vsie.c +3 -1
@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)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 )) +if (test_kvm_facility (vcpu->kvm,139 )) { scb_s->ecd |= scb_o->ecd &ECD_MEF ; + scb_s->epdx = scb_o->epdx; + }/* etoken */ if (test_kvm_facility (vcpu->kvm,156 ))
Signature · 1 line
2.31.1
Quoted 22 lines · Thomas Huth
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")Signed-off-by Thomas Huth <[email protected]>--- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/s390/kvm/vsie.c +0
-0@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)if (test_kvm_cpu_feat (vcpu->kvm,KVM_S390_VM_CPU_FEAT_CEI ))
arch/s390/kvm/vsie.c static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) · line 555
Quoted 10 lines
arch/s390/kvm/vsie.c +3
-1scb_s->eca |= scb_o->eca &ECA_CEI ;/* Epoch Extension */ -if (test_kvm_facility (vcpu->kvm,139 )) +if (test_kvm_facility (vcpu->kvm,139 )) { scb_s->ecd |= scb_o->ecd &ECD_MEF ; + scb_s->epdx = scb_o->epdx; + }/* etoken */ if (test_kvm_facility (vcpu->kvm,156 ))
Nice,
Signature · 3 lines
Thanks, David / dhildenb
Quoted 9 lines · On Wed, 23 Nov 2022 10:08:33 +0100 Thomas Huth <[email protected]> wrote:
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.
Quoted 3 lines
Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")Signed-off-by Thomas Huth <[email protected]>
Quoted 9 lines
--- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/s390/kvm/vsie.c +0
-0
arch/s390/kvm/vsie.c static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) · line 551
Quoted 7 lines
arch/s390/kvm/vsie.c +2
-1@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)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 )) +if (test_kvm_facility (vcpu->kvm,139 )) { scb_s->ecd |= scb_o->ecd &ECD_MEF ; + scb_s->epdx = scb_o->epdx;
looks quite straightforward
Quoted 4 lines
arch/s390/kvm/vsie.c +1
-0+ }/* etoken */ if (test_kvm_facility (vcpu->kvm,156 ))
Am 23.11.22 um 10:08 schrieb Thomas Huth:
Quoted 11 lines
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")
We might want to add cc stable, just in case.
Quoted 21 lines
Signed-off-by Thomas Huth <[email protected]>--- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/s390/kvm/vsie.c +3
-1@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)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 )) +if (test_kvm_facility (vcpu->kvm,139 )) { scb_s->ecd |= scb_o->ecd &ECD_MEF ; + scb_s->epdx = scb_o->epdx; + }/* etoken */ if (test_kvm_facility (vcpu->kvm,156 ))
Quoted 12 lines · Christian Borntraeger
Am 23.11.22 um 10:08 schrieb Thomas Huth:
Quoted 9 lines
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.
Quoted 4 lines
Quoted 2 lines
Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")We might want to add cc stable, just in case.
I'm pushing this to devel for the CI with the following additions:
Quoted 25 lines
Reviewed-by Christian Borntraeger <[email protected]>Quoted 21 lines
Signed-off-by Thomas Huth <[email protected]>--- arch/s390/kvm/vsie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)arch/s390/kvm/vsie.c +3
-1@@ -546,8 +546,10 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page)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 )) +if (test_kvm_facility (vcpu->kvm,139 )) { scb_s->ecd |= scb_o->ecd &ECD_MEF ; + scb_s->epdx = scb_o->epdx; + }/* etoken */ if (test_kvm_facility (vcpu->kvm,156 ))
Janosch Frank
maintainerQuoted 9 lines · Thomas Huth
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.
Quoted 3 lines
Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")Signed-off-by Thomas Huth <[email protected]>
Could you please add a test for this to the KVM unit tests?
I'd guess you might already have some code for it from your debugging sessions.
Quoted 10 lines · Janosch Frank
Quoted 9 lines · Thomas Huth
We recently experienced some weird huge time jumps in nested guests when rebooting them in certain cases. After adding some debug code to the epoch handling in
vsie.c(thanks to David Hildenbrand for the idea!), it was obvious that the "epdx" field (the multi-epoch extension) did not get set to0xffin case the "epoch" field was negative.
Seems like the code misses to copy the value from the epdx field from the guest to the shadow control block. By doing so, the weird time jumps are gone in our scenarios.
Quoted 6 lines
Quoted 3 lines
Fixes 8fa1696ea781 ("KVM: s390: Multiple Epoch Facility support")Signed-off-by Thomas Huth <[email protected]>Could you please add a test for this to the KVM unit tests?
I'd guess you might already have some code for it from your debugging sessions.
I don't have some test code for this yet - I was only testing with the scenario that is described in the bugzilla ticket. But sure, I can have a try to come up with a k-u-t test.
Thomas