From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoffer Dall Subject: Re: [PATCH 5/7] KVM: arm/arm64: vgic-v4: Only perform an unmap for valid vLPIs Date: Mon, 20 Nov 2017 16:10:00 +0100 Message-ID: <20171120151000.GN28855@cbox> References: <20171116175821.26544-1-marc.zyngier@arm.com> <20171116175821.26544-6-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: AKASHI Takahiro , Kristina Martsenko , Suzuki K Poulose , kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org To: Marc Zyngier Return-path: Received: from mail-wm0-f67.google.com ([74.125.82.67]:41940 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751356AbdKTPJw (ORCPT ); Mon, 20 Nov 2017 10:09:52 -0500 Received: by mail-wm0-f67.google.com with SMTP id b189so19504391wmd.0 for ; Mon, 20 Nov 2017 07:09:52 -0800 (PST) Content-Disposition: inline In-Reply-To: <20171116175821.26544-6-marc.zyngier@arm.com> Sender: kvm-owner@vger.kernel.org List-ID: On Thu, Nov 16, 2017 at 05:58:19PM +0000, Marc Zyngier wrote: > Before performing an unmap, let's check that what we have was > really mapped the first place. > > Signed-off-by: Marc Zyngier Reviewed-by: Christoffer Dall > --- > virt/kvm/arm/vgic/vgic-v4.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/virt/kvm/arm/vgic/vgic-v4.c b/virt/kvm/arm/vgic/vgic-v4.c > index 53c324aa44ef..4a37292855bc 100644 > --- a/virt/kvm/arm/vgic/vgic-v4.c > +++ b/virt/kvm/arm/vgic/vgic-v4.c > @@ -337,8 +337,10 @@ int kvm_vgic_v4_unset_forwarding(struct kvm *kvm, int virq, > goto out; > > WARN_ON(!(irq->hw && irq->host_irq == virq)); > - irq->hw = false; > - ret = its_unmap_vlpi(virq); > + if (irq->hw) { > + irq->hw = false; > + ret = its_unmap_vlpi(virq); > + } > > out: > mutex_unlock(&its->its_lock); > -- > 2.14.2 >