From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:14478 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728268AbgAaLYT (ORCPT ); Fri, 31 Jan 2020 06:24:19 -0500 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 00VBOCdc124410 for ; Fri, 31 Jan 2020 06:24:18 -0500 Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98]) by mx0a-001b2d01.pphosted.com with ESMTP id 2xu5qdcg1n-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 31 Jan 2020 06:24:17 -0500 Received: from localhost by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 31 Jan 2020 11:24:15 -0000 Subject: Re: [PATCH v10 1/6] KVM: s390: do not clobber registers during guest reset/store status References: <20200131100205.74720-1-frankja@linux.ibm.com> <20200131100205.74720-2-frankja@linux.ibm.com> From: Christian Borntraeger Date: Fri, 31 Jan 2020 12:24:11 +0100 MIME-Version: 1.0 In-Reply-To: <20200131100205.74720-2-frankja@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Message-Id: <854c6008-ef7a-3d02-b231-3328872eaee6@de.ibm.com> Sender: linux-s390-owner@vger.kernel.org List-ID: To: Janosch Frank , kvm@vger.kernel.org Cc: thuth@redhat.com, david@redhat.com, cohuck@redhat.com, linux-s390@vger.kernel.org On 31.01.20 11:02, Janosch Frank wrote: > From: Christian Borntraeger > > The initial CPU reset clobbers the userspace fpc and the store status > ioctl clobbers the guest acrs + fpr. As these calls are only done via > ioctl (and not via vcpu_run), no CPU context is loaded, so we can (and > must) act directly on the sync regs, not on the thread context. > > Cc: stable@kernel.org > Fixes: e1788bb995be ("KVM: s390: handle floating point registers in the run ioctl not in vcpu_put/load") > Fixes: 31d8b8d41a7e ("KVM: s390: handle access registers in the run ioctl not in vcpu_put/load") > Signed-off-by: Christian Borntraeger > Reviewed-by: David Hildenbrand > Reviewed-by: Cornelia Huck > Signed-off-by: Janosch Frank Thanks applied. > --- > arch/s390/kvm/kvm-s390.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c > index d9e6bf3d54f0..876802894b35 100644 > --- a/arch/s390/kvm/kvm-s390.c > +++ b/arch/s390/kvm/kvm-s390.c > @@ -2860,9 +2860,7 @@ static void kvm_s390_vcpu_initial_reset(struct kvm_vcpu *vcpu) > vcpu->arch.sie_block->gcr[14] = CR14_UNUSED_32 | > CR14_UNUSED_33 | > CR14_EXTERNAL_DAMAGE_SUBMASK; > - /* make sure the new fpc will be lazily loaded */ > - save_fpu_regs(); > - current->thread.fpu.fpc = 0; > + vcpu->run->s.regs.fpc = 0; > vcpu->arch.sie_block->gbea = 1; > vcpu->arch.sie_block->pp = 0; > vcpu->arch.sie_block->fpf &= ~FPF_BPBC; > @@ -4351,7 +4349,7 @@ long kvm_arch_vcpu_ioctl(struct file *filp, > switch (ioctl) { > case KVM_S390_STORE_STATUS: > idx = srcu_read_lock(&vcpu->kvm->srcu); > - r = kvm_s390_vcpu_store_status(vcpu, arg); > + r = kvm_s390_store_status_unloaded(vcpu, arg); > srcu_read_unlock(&vcpu->kvm->srcu, idx); > break; > case KVM_S390_SET_INITIAL_PSW: { >