KVM: s390: remove diag318 reset code

collinwalling · borntraeger · commit 6cbf1e960fa5 · 2020-11-11T09:31:52.000+01:00
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: 23a60f8 ("s390/kvm: diagnose 0x318 sync and reset") Signed-off-by: Collin Walling <walling@linux.ibm.com> Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Reviewed-by: Janosch Frank <frankja@linux.ibm.com> Acked-by: Cornelia Huck <cohuck@redhat.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> Link: https://lore.kernel.org/r/20201104181032.109800-1-walling@linux.ibm.com
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -3564,7 +3564,6 @@ static void kvm_arch_vcpu_ioctl_initial_reset(struct kvm_vcpu *vcpu)`
`3564`	`3564`	`vcpu->arch.sie_block->pp = 0;`
`3565`	`3565`	`vcpu->arch.sie_block->fpf &= ~FPF_BPBC;`
`3566`	`3566`	`vcpu->arch.sie_block->todpr = 0;`
`3567`		`- vcpu->arch.sie_block->cpnc = 0;`
`3568`	`3567`	`}`
`3569`	`3568`	`}`
`3570`	`3569`
`@@ -3582,7 +3581,6 @@ static void kvm_arch_vcpu_ioctl_clear_reset(struct kvm_vcpu *vcpu)`
`3582`	`3581`
`3583`	`3582`	`regs->etoken = 0;`
`3584`	`3583`	`regs->etoken_extension = 0;`
`3585`		`- regs->diag318 = 0;`
`3586`	`3584`	`}`
`3587`	`3585`
`3588`	`3586`	`int kvm_arch_vcpu_ioctl_set_regs(struct kvm_vcpu vcpu, struct kvm_regs regs)`