* [PATCH] s390/kvm: remove diag318 reset code
@ 2020-11-04 18:10 Collin Walling
2020-11-04 18:29 ` Christian Borntraeger
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Collin Walling @ 2020-11-04 18:10 UTC (permalink / raw)
To: kvm; +Cc: gor, hca, imbrenda, cohuck, david, frankja, borntraeger
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)
Signed-off-by: Collin Walling <walling@linux.ibm.com>
---
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)
--
2.26.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-04 18:10 [PATCH] s390/kvm: remove diag318 reset code Collin Walling
@ 2020-11-04 18:29 ` Christian Borntraeger
2020-11-09 7:50 ` Janosch Frank
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Christian Borntraeger @ 2020-11-04 18:29 UTC (permalink / raw)
To: Collin Walling, kvm; +Cc: gor, hca, imbrenda, cohuck, david, frankja
On 04.11.20 19:10, Collin Walling 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)
> Signed-off-by: Collin Walling <walling@linux.ibm.com>
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
> ---
> 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)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-04 18:10 [PATCH] s390/kvm: remove diag318 reset code Collin Walling
2020-11-04 18:29 ` Christian Borntraeger
@ 2020-11-09 7:50 ` Janosch Frank
2020-11-10 10:43 ` Cornelia Huck
2020-11-10 13:09 ` Christian Borntraeger
3 siblings, 0 replies; 7+ messages in thread
From: Janosch Frank @ 2020-11-09 7:50 UTC (permalink / raw)
To: Collin Walling, kvm; +Cc: gor, hca, imbrenda, cohuck, david, borntraeger
On 11/4/20 7:10 PM, Collin Walling 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.
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
>
> Fixes: 23a60f834406 (s390/kvm: diagnose 0x318 sync and reset)
> Signed-off-by: Collin Walling <walling@linux.ibm.com>
> ---
> 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)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-04 18:10 [PATCH] s390/kvm: remove diag318 reset code Collin Walling
2020-11-04 18:29 ` Christian Borntraeger
2020-11-09 7:50 ` Janosch Frank
@ 2020-11-10 10:43 ` Cornelia Huck
2020-11-10 12:41 ` Christian Borntraeger
2020-11-10 13:09 ` Christian Borntraeger
3 siblings, 1 reply; 7+ messages in thread
From: Cornelia Huck @ 2020-11-10 10:43 UTC (permalink / raw)
To: Collin Walling; +Cc: kvm, gor, hca, imbrenda, david, frankja, borntraeger
On Wed, 4 Nov 2020 13:10:32 -0500
Collin Walling <walling@linux.ibm.com> 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")
> Signed-off-by: Collin Walling <walling@linux.ibm.com>
> ---
> 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?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-10 10:43 ` Cornelia Huck
@ 2020-11-10 12:41 ` Christian Borntraeger
2020-11-10 12:55 ` Cornelia Huck
0 siblings, 1 reply; 7+ messages in thread
From: Christian Borntraeger @ 2020-11-10 12:41 UTC (permalink / raw)
To: Cornelia Huck, Collin Walling; +Cc: kvm, gor, hca, imbrenda, david, frankja
On 10.11.20 11:43, Cornelia Huck wrote:
> On Wed, 4 Nov 2020 13:10:32 -0500
> Collin Walling <walling@linux.ibm.com> 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@linux.ibm.com>
>> ---
>> 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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-10 12:41 ` Christian Borntraeger
@ 2020-11-10 12:55 ` Cornelia Huck
0 siblings, 0 replies; 7+ messages in thread
From: Cornelia Huck @ 2020-11-10 12:55 UTC (permalink / raw)
To: Christian Borntraeger
Cc: Collin Walling, kvm, gor, hca, imbrenda, david, frankja
On Tue, 10 Nov 2020 13:41:17 +0100
Christian Borntraeger <borntraeger@de.ibm.com> wrote:
> On 10.11.20 11:43, Cornelia Huck wrote:
> > On Wed, 4 Nov 2020 13:10:32 -0500
> > Collin Walling <walling@linux.ibm.com> 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@linux.ibm.com>
> >> ---
> >> 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@redhat.com>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] s390/kvm: remove diag318 reset code
2020-11-04 18:10 [PATCH] s390/kvm: remove diag318 reset code Collin Walling
` (2 preceding siblings ...)
2020-11-10 10:43 ` Cornelia Huck
@ 2020-11-10 13:09 ` Christian Borntraeger
3 siblings, 0 replies; 7+ messages in thread
From: Christian Borntraeger @ 2020-11-10 13:09 UTC (permalink / raw)
To: Collin Walling, kvm; +Cc: gor, hca, imbrenda, cohuck, david, frankja
On 04.11.20 19:10, Collin Walling 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)
> Signed-off-by: Collin Walling <walling@linux.ibm.com>
thanks. Applied.
> ---
> 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)
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-11-10 13:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-04 18:10 [PATCH] s390/kvm: remove diag318 reset code Collin Walling
2020-11-04 18:29 ` Christian Borntraeger
2020-11-09 7:50 ` Janosch Frank
2020-11-10 10:43 ` Cornelia Huck
2020-11-10 12:41 ` Christian Borntraeger
2020-11-10 12:55 ` Cornelia Huck
2020-11-10 13:09 ` Christian Borntraeger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).