From: Marc Zyngier <marc.zyngier@arm.com>
To: Christoffer Dall <cdall@linaro.org>
Cc: kvm@vger.kernel.org,
Kristina Martsenko <kristina.martsenko@arm.com>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
kvmarm@lists.cs.columbia.edu,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/7] KVM: arm/arm64: vgic-v4: Only perform an unmap for valid vLPIs
Date: Thu, 16 Nov 2017 17:58:19 +0000 [thread overview]
Message-ID: <20171116175821.26544-6-marc.zyngier@arm.com> (raw)
In-Reply-To: <20171116175821.26544-1-marc.zyngier@arm.com>
Before performing an unmap, let's check that what we have was
really mapped the first place.
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---
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
next prev parent reply other threads:[~2017-11-16 17:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 17:58 [PATCH 0/7] KVM/ARM fixes for 4.15-rc1 Marc Zyngier
2017-11-16 17:58 ` [PATCH 1/7] KVM: arm/arm64: vgic-irqfd: Fix MSI entry allocation Marc Zyngier
2017-11-20 14:49 ` Christoffer Dall
2017-11-16 17:58 ` [PATCH 2/7] KVM: arm/arm64: vgic: Preserve the revious read from the pending table Marc Zyngier
2017-11-20 14:52 ` Christoffer Dall
2017-11-16 17:58 ` [PATCH 3/7] KVM: arm/arm64: vgic-its: " Marc Zyngier
2017-11-20 14:56 ` Christoffer Dall
2017-11-16 17:58 ` [PATCH 4/7] KVM: arm/arm64: vgic-its: Check result of allocation before use Marc Zyngier
2017-11-20 14:58 ` Christoffer Dall
2017-11-21 11:12 ` Marc Zyngier
2017-11-16 17:58 ` Marc Zyngier [this message]
2017-11-20 15:10 ` [PATCH 5/7] KVM: arm/arm64: vgic-v4: Only perform an unmap for valid vLPIs Christoffer Dall
2017-11-16 17:58 ` [PATCH 6/7] arm64: KVM: fix VTTBR_BADDR_MASK BUG_ON off-by-one Marc Zyngier
2017-11-16 17:58 ` [PATCH 7/7] arm: KVM: Fix " Marc Zyngier
2017-11-20 13:29 ` Christoffer Dall
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171116175821.26544-6-marc.zyngier@arm.com \
--to=marc.zyngier@arm.com \
--cc=cdall@linaro.org \
--cc=kristina.martsenko@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.cs.columbia.edu \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=takahiro.akashi@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox