All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christoffer Dall <christoffer.dall@linaro.org>
To: "Paolo Bonzini" <pbonzini@redhat.com>,
	"Radim Krčmář" <rkrcmar@redhat.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>,
	linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org,
	Christoffer Dall <christoffer.dall@linaro.org>
Subject: [PULL 14/27] KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE
Date: Mon, 13 Nov 2017 10:17:39 +0100	[thread overview]
Message-ID: <20171113091752.10663-15-christoffer.dall@linaro.org> (raw)
In-Reply-To: <20171113091752.10663-1-christoffer.dall@linaro.org>

From: Marc Zyngier <marc.zyngier@arm.com>

The current implementation of MOVALL doesn't allow us to call
into the core ITS code as we hold a number of spinlocks.

Let's try a method used in other parts of the code, were we copy
the intids of the candicate interrupts, and then do whatever
we need to do with them outside of the critical section.

This allows us to move the interrupts one by one, at the expense
of a bit of CPU time. Who cares? MOVALL is such a stupid command
anyway...

Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 virt/kvm/arm/vgic/vgic-its.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 15e79285380d..78d11aed1e17 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1169,11 +1169,12 @@ static int vgic_its_cmd_handle_invall(struct kvm *kvm, struct vgic_its *its,
 static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
 				      u64 *its_cmd)
 {
-	struct vgic_dist *dist = &kvm->arch.vgic;
 	u32 target1_addr = its_cmd_get_target_addr(its_cmd);
 	u32 target2_addr = its_cmd_mask_field(its_cmd, 3, 16, 32);
 	struct kvm_vcpu *vcpu1, *vcpu2;
 	struct vgic_irq *irq;
+	u32 *intids;
+	int irq_count, i;
 
 	if (target1_addr >= atomic_read(&kvm->online_vcpus) ||
 	    target2_addr >= atomic_read(&kvm->online_vcpus))
@@ -1185,19 +1186,19 @@ static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
 	vcpu1 = kvm_get_vcpu(kvm, target1_addr);
 	vcpu2 = kvm_get_vcpu(kvm, target2_addr);
 
-	spin_lock(&dist->lpi_list_lock);
+	irq_count = vgic_copy_lpi_list(vcpu1, &intids);
+	if (irq_count < 0)
+		return irq_count;
 
-	list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) {
-		spin_lock(&irq->irq_lock);
+	for (i = 0; i < irq_count; i++) {
+		irq = vgic_get_irq(kvm, NULL, intids[i]);
 
-		if (irq->target_vcpu == vcpu1)
-			irq->target_vcpu = vcpu2;
+		update_affinity(irq, vcpu2);
 
-		spin_unlock(&irq->irq_lock);
+		vgic_put_irq(kvm, irq);
 	}
 
-	spin_unlock(&dist->lpi_list_lock);
-
+	kfree(intids);
 	return 0;
 }
 
-- 
2.14.2

WARNING: multiple messages have this Message-ID (diff)
From: christoffer.dall@linaro.org (Christoffer Dall)
To: linux-arm-kernel@lists.infradead.org
Subject: [PULL 14/27] KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE
Date: Mon, 13 Nov 2017 10:17:39 +0100	[thread overview]
Message-ID: <20171113091752.10663-15-christoffer.dall@linaro.org> (raw)
In-Reply-To: <20171113091752.10663-1-christoffer.dall@linaro.org>

From: Marc Zyngier <marc.zyngier@arm.com>

The current implementation of MOVALL doesn't allow us to call
into the core ITS code as we hold a number of spinlocks.

Let's try a method used in other parts of the code, were we copy
the intids of the candicate interrupts, and then do whatever
we need to do with them outside of the critical section.

This allows us to move the interrupts one by one, at the expense
of a bit of CPU time. Who cares? MOVALL is such a stupid command
anyway...

Reviewed-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
---
 virt/kvm/arm/vgic/vgic-its.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c
index 15e79285380d..78d11aed1e17 100644
--- a/virt/kvm/arm/vgic/vgic-its.c
+++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -1169,11 +1169,12 @@ static int vgic_its_cmd_handle_invall(struct kvm *kvm, struct vgic_its *its,
 static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
 				      u64 *its_cmd)
 {
-	struct vgic_dist *dist = &kvm->arch.vgic;
 	u32 target1_addr = its_cmd_get_target_addr(its_cmd);
 	u32 target2_addr = its_cmd_mask_field(its_cmd, 3, 16, 32);
 	struct kvm_vcpu *vcpu1, *vcpu2;
 	struct vgic_irq *irq;
+	u32 *intids;
+	int irq_count, i;
 
 	if (target1_addr >= atomic_read(&kvm->online_vcpus) ||
 	    target2_addr >= atomic_read(&kvm->online_vcpus))
@@ -1185,19 +1186,19 @@ static int vgic_its_cmd_handle_movall(struct kvm *kvm, struct vgic_its *its,
 	vcpu1 = kvm_get_vcpu(kvm, target1_addr);
 	vcpu2 = kvm_get_vcpu(kvm, target2_addr);
 
-	spin_lock(&dist->lpi_list_lock);
+	irq_count = vgic_copy_lpi_list(vcpu1, &intids);
+	if (irq_count < 0)
+		return irq_count;
 
-	list_for_each_entry(irq, &dist->lpi_list_head, lpi_list) {
-		spin_lock(&irq->irq_lock);
+	for (i = 0; i < irq_count; i++) {
+		irq = vgic_get_irq(kvm, NULL, intids[i]);
 
-		if (irq->target_vcpu == vcpu1)
-			irq->target_vcpu = vcpu2;
+		update_affinity(irq, vcpu2);
 
-		spin_unlock(&irq->irq_lock);
+		vgic_put_irq(kvm, irq);
 	}
 
-	spin_unlock(&dist->lpi_list_lock);
-
+	kfree(intids);
 	return 0;
 }
 
-- 
2.14.2

  parent reply	other threads:[~2017-11-13  9:18 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-13  9:17 [PULL 00/27] KVM/ARM GICv4 Support for v4.15 Christoffer Dall
2017-11-13  9:17 ` Christoffer Dall
2017-11-13  9:17 ` [PULL 01/27] KVM: arm/arm64: register irq bypass consumer on ARM/ARM64 Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 02/27] KVM: arm/arm64: vgic: restructure kvm_vgic_(un)map_phys_irq Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 03/27] KVM: arm: Select ARM_GIC_V3 and ARM_GIC_V3_ITS Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 04/27] KVM: arm/arm64: vgic: Move kvm_vgic_destroy call around Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 05/27] KVM: arm/arm64: vITS: Add MSI translation helpers Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 06/27] KVM: arm/arm64: vITS: Add a helper to update the affinity of an LPI Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 07/27] KVM: arm/arm64: GICv4: Add property field and per-VM predicate Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 08/27] KVM: arm/arm64: GICv4: Add init/teardown of the per-VM vPE irq domain Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 09/27] KVM: arm/arm64: GICv4: Wire mapping/unmapping of VLPIs in VFIO irq bypass Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 10/27] KVM: arm/arm64: GICv4: Handle INT command applied to a VLPI Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 11/27] KVM: arm/arm64: GICv4: Unmap VLPI when freeing an LPI Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 12/27] KVM: arm/arm64: GICv4: Propagate affinity changes to the physical ITS Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 13/27] KVM: arm/arm64: GICv4: Handle CLEAR applied to a VLPI Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` Christoffer Dall [this message]
2017-11-13  9:17   ` [PULL 14/27] KVM: arm/arm64: GICv4: Handle MOVALL applied to a vPE Christoffer Dall
2017-11-13  9:17 ` [PULL 15/27] KVM: arm/arm64: GICv4: Propagate property updates to VLPIs Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 16/27] KVM: arm/arm64: GICv4: Handle INVALL applied to a vPE Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 17/27] KVM: arm/arm64: GICv4: Use pending_last as a scheduling hint Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 18/27] KVM: arm/arm64: GICv4: Add doorbell interrupt handling Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 19/27] KVM: arm/arm64: GICv4: Use the doorbell interrupt as an unblocking source Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 20/27] KVM: arm/arm64: GICv4: Hook vPE scheduling into vgic flush/sync Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 21/27] KVM: arm/arm64: GICv4: Enable virtual cpuif if VLPIs can be delivered Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 22/27] KVM: arm/arm64: GICv4: Prevent a VM using GICv4 from being saved Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 23/27] KVM: arm/arm64: GICv4: Prevent userspace from changing doorbell affinity Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 24/27] KVM: arm/arm64: GICv4: Enable VLPI support Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 25/27] KVM: arm/arm64: GICv4: Theory of operations Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 26/27] KVM: arm/arm64: Fix GICv4 ITS initialization issues Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-13  9:17 ` [PULL 27/27] KVM: arm/arm64: Don't queue VLPIs on INV/INVALL Christoffer Dall
2017-11-13  9:17   ` Christoffer Dall
2017-11-17 12:23 ` [PULL 00/27] KVM/ARM GICv4 Support for v4.15 Paolo Bonzini
2017-11-17 12:23   ` Paolo Bonzini

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=20171113091752.10663-15-christoffer.dall@linaro.org \
    --to=christoffer.dall@linaro.org \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=marc.zyngier@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=rkrcmar@redhat.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.