Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <ee3999a2-7ae6-e72c-0a47-0890972bbd23@linux.ibm.com>
Date:   Thu, 24 Nov 2022 11:24:33 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.5.0
Subject: Re: [PATCH] KVM: s390: vsie: Fix the initialization of the epoch
 extension (epdx) field
To:     Christian Borntraeger <borntraeger@linux.ibm.com>,
        Thomas Huth <thuth@redhat.com>, kvm@vger.kernel.org,
        Claudio Imbrenda <imbrenda@linux.ibm.com>
Cc:     linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org,
        David Hildenbrand <david@redhat.com>,
        "Collin L. Walling" <walling@linux.ibm.com>,
        Jason J Herne <jjherne@linux.ibm.com>
References: <20221123090833.292938-1-thuth@redhat.com>
 <e7f84070-aeec-99d6-8ac0-cf90ad61ba88@linux.ibm.com>
Content-Language: en-US
From:   Janosch Frank <frankja@linux.ibm.com>
In-Reply-To: <e7f84070-aeec-99d6-8ac0-cf90ad61ba88@linux.ibm.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
Precedence: bulk

On 11/23/22 10:41, Christian Borntraeger wrote:
> 
> 
> Am 23.11.22 um 10:08 schrieb 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
>> 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.
>>
>> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2140899
>> 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:

Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Cc: stable@vger.kernel.org # 4.19+

> 
> Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
> 
> 
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>    arch/s390/kvm/vsie.c | 4 +++-
>>    1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c
>> index 94138f8f0c1c..ace2541ababd 100644
>> --- a/arch/s390/kvm/vsie.c
>> +++ b/arch/s390/kvm/vsie.c
>> @@ -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))