On Tue, 10 Nov 2020 13:41:17 +0100
Christian Borntraeger <borntraeger@xxxxxxxxxx> wrote:
> On 10.11.20 11:43, Cornelia Huck wrote:
> > On Wed, 4 Nov 2020 13:10:32 -0500
> > Collin Walling <walling@xxxxxxxxxxxxx> wrote:
> >
> >> The diag318 data must be set to 0 by VM-wide reset events
> >> triggered by diag308. As such, KVM should not handle
> >> resetting this data via the VCPU ioctls.
> >>
> >> Fixes: 23a60f834406 (s390/kvm: diagnose 0x318 sync and reset)
> >
> > Should be
> >
> > Fixes: 23a60f834406 ("s390/kvm: diagnose 0x318 sync and reset")
>
> yes.
>
> >
> >> Signed-off-by: Collin Walling <walling@xxxxxxxxxxxxx>
> >> ---
> >> arch/s390/kvm/kvm-s390.c | 2 --
> >> 1 file changed, 2 deletions(-)
> >>
> >> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
> >> index 6b74b92c1a58..f9e118a0e113 100644
> >> --- a/arch/s390/kvm/kvm-s390.c
> >> +++ b/arch/s390/kvm/kvm-s390.c
> >> @@ -3564,7 +3564,6 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)
> >> vcpu->arch.sie_block->pp = 0;
> >> vcpu->arch.sie_block->fpf &= ~FPF_BPBC;
> >> vcpu->arch.sie_block->todpr = 0;
> >> - vcpu->arch.sie_block->cpnc = 0;
> >> }
> >> }
> >>
> >> @@ -3582,7 +3581,6 @@ static void kvm_arch_vcpu_ioctl_clear_reset(struct kvm_vcpu *vcpu)
> >>
> >> regs->etoken = 0;
> >> regs->etoken_extension = 0;
> >> - regs->diag318 = 0;
> >> }
> >>
> >> int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu *vcpu, struct kvm_regs *regs)
> >
> > I assume that we rely on the QEMU patch to get a completely working
> > setup?
>
> Yes, but this fix is correct in itself and needed anyway.
>
Oh, apparently forgot
Acked-by: Cornelia Huck <cohuck@xxxxxxxxxx>
