Re: [PATCH v2] KVM: s390: vsie: Avoid injecting machine check on signal

[Heiko Carstens <hca@linux.ibm.com>]

On Mon, Mar 16, 2026 at 01:35:59PM +0100, Christian Borntraeger wrote:
> Am 16.03.26 um 13:25 schrieb Christian Borntraeger:
> I guess we should still add something like
> 
> --- a/arch/s390/kvm/vsie.c
> +++ b/arch/s390/kvm/vsie.c
> @@ -1123,6 +1123,7 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, struc
>         struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s;
>         struct kvm_s390_sie_block *scb_o = vsie_page->scb_o;
>         int guest_bp_isolation;
> +       int sie_return = SIE64_RETURN_OK;
>         int rc = 0;
>         handle_last_fault(vcpu, vsie_page, sg);
> @@ -1163,7 +1164,7 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, struc
>                         goto xfer_to_guest_mode_check;
>                 }
>                 guest_timing_enter_irqoff();
> -               rc = kvm_s390_enter_exit_sie(scb_s, vcpu->run->s.regs.gprs, sg->asce.val);
> +               sie_return = kvm_s390_enter_exit_sie(scb_s, vcpu->run->s.regs.gprs, sg->asce.val);
>                 guest_timing_exit_irqoff();
>                 local_irq_enable();
>         }
> @@ -1178,7 +1179,7 @@ static int do_vsie_run(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, struc
>         kvm_vcpu_srcu_read_lock(vcpu);
> -       if (rc == SIE64_RETURN_MCCK) {
> +       if (sie_return == SIE64_RETURN_MCCK) {
>                 kvm_s390_reinject_machine_check(vcpu, &vsie_page->mcck_info);
>                 return 0;

Yes, this looks better and makes the code more understandable.