mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Eric Auger <eric.auger@linaro.org>
To: eric.auger@st.com, eric.auger@linaro.org,
	alex.williamson@redhat.com, b.reynal@virtualopensystems.com,
	christoffer.dall@linaro.org, marc.zyngier@arm.com,
	linux-arm-kernel@lists.infradead.org,
	kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org
Cc: andre.przywara@arm.com, linux-kernel@vger.kernel.org, patches@linaro.org
Subject: [PATCH v4 09/13] KVM: arm/arm64: vgic: support irqfd injection of a mapped IRQ
Date: Thu, 19 Nov 2015 14:53:59 +0000	[thread overview]
Message-ID: <1447944843-17731-10-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1447944843-17731-1-git-send-email-eric.auger@linaro.org>

Up to now irqfd injection was only possible for unmapped IRQ. This
patch adds support for injecting mapped interrupts.

Signed-off-by: Eric Auger <eric.auger@linaro.org>
---
 virt/kvm/arm/vgic.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index dba8eb6..e96f79e 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -2476,13 +2476,21 @@ int kvm_irq_map_chip_pin(struct kvm *kvm, unsigned irqchip, unsigned pin)
 int kvm_set_irq(struct kvm *kvm, int irq_source_id,
 		u32 irq, int level, bool line_status)
 {
+	struct vgic_dist *dist = &kvm->arch.vgic;
 	unsigned int spi = irq + VGIC_NR_PRIVATE_IRQS;
+	struct irq_phys_map *map;
+	int vcpu_id;
 
 	trace_kvm_set_irq(irq, level, irq_source_id);
 
 	BUG_ON(!vgic_initialized(kvm));
 
-	return kvm_vgic_inject_irq(kvm, 0, spi, level);
+	vcpu_id = dist->irq_spi_cpu[irq];
+	map = vgic_irq_map_search(kvm_get_vcpu(kvm, vcpu_id), spi);
+	if (!map)
+		return kvm_vgic_inject_irq(kvm, vcpu_id, spi, level);
+	else
+		return kvm_vgic_inject_mapped_irq(kvm, vcpu_id, map, level);
 }
 
 /* MSI not implemented yet */
-- 
1.9.1


  parent reply	other threads:[~2015-11-19 14:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-11-19 14:53 [PATCH v4 00/13] ARM IRQ forward control based on IRQ bypass manager Eric Auger
2015-11-19 14:53 ` [PATCH v4 01/13] KVM: arm/arm64: select IRQ_BYPASS_MANAGER Eric Auger
2015-11-19 14:53 ` [PATCH v4 02/13] VFIO: platform: registration of a dummy IRQ bypass producer Eric Auger
2015-11-19 14:53 ` [PATCH v4 03/13] VFIO: platform: test forwarded state when selecting the IRQ handler Eric Auger
2015-11-19 14:53 ` [PATCH v4 04/13] VFIO: platform: single handler using function pointer Eric Auger
2015-11-19 14:53 ` [PATCH v4 05/13] VFIO: platform: add vfio_platform_set_forwarded Eric Auger
2015-11-19 14:53 ` [PATCH v4 06/13] VFIO: platform: add vfio_platform_irq_is_active Eric Auger
2015-11-19 14:53 ` [PATCH v4 07/13] VFIO: platform: add irq bypass producer management Eric Auger
2015-11-19 14:53 ` [PATCH v4 08/13] KVM: arm/arm64: vgic: adapt state machine for non shared mapped interrupts Eric Auger
2015-11-19 14:53 ` Eric Auger [this message]
2015-11-19 14:54 ` [PATCH v4 10/13] KVM: arm/arm64: vgic: forwarding control Eric Auger
2015-11-19 14:54 ` [PATCH v4 11/13] KVM: arm/arm64: vgic: implement clear active for non shared mapped IRQ Eric Auger
2015-11-19 14:54 ` [PATCH v4 12/13] KVM: arm/arm64: vgic: implement clear pending " Eric Auger
2015-11-19 14:54 ` [PATCH v4 13/13] KVM: arm/arm64: implement IRQ bypass consumer functions 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=1447944843-17731-10-git-send-email-eric.auger@linaro.org \
    --to=eric.auger@linaro.org \
    --cc=alex.williamson@redhat.com \
    --cc=andre.przywara@arm.com \
    --cc=b.reynal@virtualopensystems.com \
    --cc=christoffer.dall@linaro.org \
    --cc=eric.auger@st.com \
    --cc=kvm@vger.kernel.org \
    --cc=kvmarm@lists.cs.columbia.edu \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marc.zyngier@arm.com \
    --cc=patches@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

all inboxes | Powered by JetHome®