From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cornelia Huck Subject: Re: [PATCH v1 2/4] KVM: s390: use WARN_ON_ONCE only for checking Date: Thu, 31 Aug 2017 12:16:37 +0200 Message-ID: <20170831121637.2e96817f.cohuck@redhat.com> References: <20170830160603.5452-1-david@redhat.com> <20170830160603.5452-3-david@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org, Christian Borntraeger , Paolo Bonzini , Radim =?UTF-8?B?S3LEjW3DocWZ?= To: David Hildenbrand Return-path: Received: from mx1.redhat.com ([209.132.183.28]:57382 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750915AbdHaKQm (ORCPT ); Thu, 31 Aug 2017 06:16:42 -0400 In-Reply-To: <20170830160603.5452-3-david@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On Wed, 30 Aug 2017 18:06:01 +0200 David Hildenbrand wrote: > Move the real logic that always has to be executed out of the > WARN_ON_ONCE. > > Signed-off-by: David Hildenbrand > --- > arch/s390/kvm/interrupt.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c > index a619ddae610d..a832ad031cee 100644 > --- a/arch/s390/kvm/interrupt.c > +++ b/arch/s390/kvm/interrupt.c > @@ -2479,6 +2479,7 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu, > struct kvm_s390_mchk_info *mchk; > union mci mci; > __u64 cr14 = 0; /* upper bits are not used */ > + int rc; > > mci.val = mcck_info->mcic; > if (mci.sr) > @@ -2496,12 +2497,13 @@ void kvm_s390_reinject_machine_check(struct kvm_vcpu *vcpu, > if (mci.ck) { > /* Inject the floating machine check */ > inti.type = KVM_S390_MCHK; > - WARN_ON_ONCE(__inject_vm(vcpu->kvm, &inti)); > + rc = __inject_vm(vcpu->kvm, &inti); > } else { > /* Inject the machine check to specified vcpu */ > irq.type = KVM_S390_MCHK; > - WARN_ON_ONCE(kvm_s390_inject_vcpu(vcpu, &irq)); > + rc = kvm_s390_inject_vcpu(vcpu, &irq); > } > + WARN_ON_ONCE(rc); > } > > int kvm_set_routing_entry(struct kvm *kvm, Reviewed-by: Cornelia Huck