linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@redhat.com>
To: eric.auger.pro@gmail.com, eric.auger@redhat.com,
	linux-kernel@vger.kernel.org, kvm@vger.kernel.org,
	kvmarm@lists.cs.columbia.edu, alex.williamson@redhat.com,
	pbonzini@redhat.com, marc.zyngier@arm.com,
	christoffer.dall@linaro.org
Cc: drjones@redhat.com, wei@redhat.com
Subject: [PATCH 09/10] KVM: arm/arm64: vgic: Implement forwarding setting
Date: Wed, 24 May 2017 22:13:22 +0200	[thread overview]
Message-ID: <1495656803-28011-10-git-send-email-eric.auger@redhat.com> (raw)
In-Reply-To: <1495656803-28011-1-git-send-email-eric.auger@redhat.com>

Implements kvm_vgic_[set|unset]_forwarding.

Handle low-level VGIC programming and consistent irqchip
programming.

Signed-off-by: Eric Auger <eric.auger@redhat.com>

---
---
 include/kvm/arm_vgic.h   |   5 +++
 virt/kvm/arm/vgic/vgic.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/include/kvm/arm_vgic.h b/include/kvm/arm_vgic.h
index 695ebc7..7ddac8a 100644
--- a/include/kvm/arm_vgic.h
+++ b/include/kvm/arm_vgic.h
@@ -343,4 +343,9 @@ int kvm_send_userspace_msi(struct kvm *kvm, struct kvm_msi *msi);
  */
 int kvm_vgic_setup_default_irq_routing(struct kvm *kvm);
 
+int kvm_vgic_set_forwarding(struct kvm *kvm, unsigned int irq,
+			    unsigned int virt_irq);
+void kvm_vgic_unset_forwarding(struct kvm *kvm, unsigned int irq,
+			       unsigned int virt_irq);
+
 #endif /* __KVM_ARM_VGIC_H */
diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
index aa0618c..c2add8d 100644
--- a/virt/kvm/arm/vgic/vgic.c
+++ b/virt/kvm/arm/vgic/vgic.c
@@ -17,6 +17,8 @@
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
 #include <linux/list_sort.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
 
 #include "vgic.h"
 
@@ -771,3 +773,106 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq)
 	return map_is_active;
 }
 
+/**
+ * kvm_vgic_set_forwarding - Set IRQ forwarding
+ *
+ * @kvm: kvm handle
+ * @host_irq: the host linux IRQ
+ * @vintid: the virtual INTID
+ *
+ * This function must be called when the IRQ is not active:
+ * ie. not active at GIC level and not currently under injection
+ * into the guest using the unforwarded mode. The physical IRQ must
+ * be disabled and all vCPUs must have been exited and prevented
+ * from being re-entered.
+ */
+int kvm_vgic_set_forwarding(struct kvm *kvm, unsigned int host_irq,
+			    unsigned int vintid)
+{
+	struct kvm_vcpu *vcpu;
+	struct vgic_irq *irq;
+	struct irq_desc *desc;
+	struct irq_data *data;
+	unsigned int pintid;
+	int ret = 0;
+
+
+	kvm_debug("%s host linux irq=%d vintid=%d\n",
+		  __func__, host_irq, vintid);
+
+	if (!vgic_valid_spi(kvm, vintid))
+		return 0;
+
+	/* find the INTID corresponding to @host_irq */
+	desc = irq_to_desc(host_irq);
+	if (!desc) {
+		kvm_err("%s: no interrupt descriptor\n", __func__);
+		return -EINVAL;
+	}
+
+	data = irq_desc_get_irq_data(desc);
+	while (data->parent_data)
+		data = data->parent_data;
+
+	pintid = data->hwirq;
+
+	irq = vgic_get_irq(kvm, NULL, vintid);
+
+	spin_lock(&irq->irq_lock);
+
+	vcpu = irq->target_vcpu;
+
+	if (!vcpu) {
+		ret = -EAGAIN;
+		goto unlock;
+	}
+
+	irq_set_vcpu_affinity(host_irq, vcpu);
+
+	irq->hw = true;
+	irq->hwintid = pintid;
+	irq->host_irq = host_irq;
+
+unlock:
+	spin_unlock(&irq->irq_lock);
+	vgic_put_irq(kvm, irq);
+	return ret;
+}
+
+/**
+ * kvm_vgic_unset_forwarding - Unset IRQ forwarding
+ *
+ * @kvm: KVM handle
+ * @host_irq: the host Linux IRQ number
+ * @vintid: virtual INTID
+ *
+ * This function must be called when the host irq is disabled and
+ * all vCPUs have been exited and prevented from being re-entered.
+ */
+void kvm_vgic_unset_forwarding(struct kvm *kvm,
+			       unsigned int host_irq,
+			       unsigned int vintid)
+{
+	struct vgic_irq *irq;
+	bool active;
+
+	kvm_debug("%s host_irq=%d virt_irq=%d\n", __func__, host_irq, vintid);
+
+	irq_get_irqchip_state(host_irq, IRQCHIP_STATE_ACTIVE, &active);
+
+	irq = vgic_get_irq(kvm, NULL, vintid);
+	spin_lock(&irq->irq_lock);
+
+	if (!is_unshared_mapped(irq))
+		goto unlock;
+
+	if (active)
+		irq_set_irqchip_state(host_irq, IRQCHIP_STATE_ACTIVE, false);
+
+	irq->hw = false;
+	irq_set_vcpu_affinity(host_irq, NULL);
+
+unlock:
+	spin_unlock(&irq->irq_lock);
+}
+
-- 
2.5.5

  parent reply	other threads:[~2017-05-24 20:14 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-24 20:13 [PATCH 00/10] ARM/ARM64 Direct EOI setup for VFIO wired interrupts Eric Auger
2017-05-24 20:13 ` [PATCH 01/10] vfio: platform: Add automasked field to vfio_platform_irq Eric Auger
2017-05-25 18:05   ` Marc Zyngier
2017-05-30 12:45     ` Auger Eric
2017-05-31 17:41       ` Alex Williamson
2017-05-24 20:13 ` [PATCH 02/10] VFIO: platform: Introduce direct EOI interrupt handler Eric Auger
2017-05-31 18:20   ` Alex Williamson
2017-05-24 20:13 ` [PATCH 03/10] VFIO: platform: Direct EOI irq bypass for ARM/ARM64 Eric Auger
2017-05-31 18:20   ` Alex Williamson
2017-05-31 19:31     ` Auger Eric
2017-06-01 10:49       ` Marc Zyngier
2017-05-24 20:13 ` [PATCH 04/10] VFIO: pci: Add automasked field to vfio_pci_irq_ctx Eric Auger
2017-05-31 18:21   ` Alex Williamson
2017-05-24 20:13 ` [PATCH 05/10] VFIO: pci: Introduce direct EOI INTx interrupt handler Eric Auger
2017-05-31 18:24   ` Alex Williamson
2017-06-01 20:40     ` Auger Eric
2017-06-02  8:41       ` Marc Zyngier
2017-06-14  8:07     ` Auger Eric
2017-06-14  8:41       ` Marc Zyngier
2017-05-24 20:13 ` [PATCH 06/10] irqbypass: Add a private field in the producer Eric Auger
2017-05-24 20:13 ` [PATCH 07/10] VFIO: pci: Direct EOI irq bypass for ARM/ARM64 Eric Auger
2017-05-24 20:13 ` [PATCH 08/10] KVM: arm/arm64: vgic: Handle unshared mapped interrupts Eric Auger
2017-05-25 19:14   ` Marc Zyngier
2017-05-30 12:50     ` Auger Eric
2017-06-02 13:33   ` Christoffer Dall
2017-06-02 14:10     ` Marc Zyngier
2017-06-02 16:29       ` Christoffer Dall
2017-06-08  8:23         ` Marc Zyngier
2017-06-08  8:34           ` Christoffer Dall
2017-06-08  8:55             ` Auger Eric
2017-06-08 10:14               ` Christoffer Dall
2017-06-08  8:49     ` Auger Eric
2017-06-08 10:11       ` Christoffer Dall
2017-05-24 20:13 ` Eric Auger [this message]
2017-05-25 19:19   ` [PATCH 09/10] KVM: arm/arm64: vgic: Implement forwarding setting Marc Zyngier
2017-05-30 12:54     ` Auger Eric
2017-05-30 13:17       ` Marc Zyngier
2017-05-30 14:03         ` Auger Eric
2017-05-24 20:13 ` [PATCH 10/10] KVM: arm/arm64: register DEOI irq bypass consumer on ARM/ARM64 Eric Auger

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=1495656803-28011-10-git-send-email-eric.auger@redhat.com \
    --to=eric.auger@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=christoffer.dall@linaro.org \
    --cc=drjones@redhat.com \
    --cc=eric.auger.pro@gmail.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=pbonzini@redhat.com \
    --cc=wei@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).