From: eric.auger@linaro.org (Eric Auger)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 2/4] KVM: introduce kvm_arch_intc_initialized and use it in irqfd
Date: Thu, 15 Jan 2015 15:47:45 +0100 [thread overview]
Message-ID: <1421333267-15287-3-git-send-email-eric.auger@linaro.org> (raw)
In-Reply-To: <1421333267-15287-1-git-send-email-eric.auger@linaro.org>
Introduce __KVM_HAVE_ARCH_INTC_INITIALIZED define and
associated kvm_arch_intc_initialized function. This latter
allows to test whether the virtual interrupt controller is initialized
and ready to accept virtual IRQ injection. On some architectures,
the virtual interrupt controller is dynamically instantiated, justifying
that kind of check.
The new function can now be used by irqfd to check whether the
virtual interrupt controller is ready on KVM_IRQFD request. If not,
KVM_IRQFD returns -EAGAIN.
Signed-off-by: Eric Auger <eric.auger@linaro.org>
Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
---
v6 -> v7:
- From now on, kvm_irqfd_assign calls kvm_arch_intc_initialized
(previously introduced in subsequent patch file).
- add Christoffer's ack
v5 -> v6:
- rename function name and macro
- add kvm_arch_intc_initialized declaration in case the archi defines
the macro
---
include/linux/kvm_host.h | 14 ++++++++++++++
virt/kvm/eventfd.c | 3 +++
2 files changed, 17 insertions(+)
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 26f1060..702036a 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -706,6 +706,20 @@ static inline wait_queue_head_t *kvm_arch_vcpu_wq(struct kvm_vcpu *vcpu)
#endif
}
+#ifdef __KVM_HAVE_ARCH_INTC_INITIALIZED
+/*
+ * returns trues if the virtual interrupt controller is initialized and
+ * ready to accept virtual IRQ. On some architectures the virtual interrupt
+ * controller is dynamically instantiated and this is not always true.
+ */
+bool kvm_arch_intc_initialized(struct kvm *kvm);
+#else
+static inline bool kvm_arch_intc_initialized(struct kvm *kvm)
+{
+ return true;
+}
+#endif
+
int kvm_arch_init_vm(struct kvm *kvm, unsigned long type);
void kvm_arch_destroy_vm(struct kvm *kvm);
void kvm_arch_sync_events(struct kvm *kvm);
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 148b239..fc5f43e 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -311,6 +311,9 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
unsigned int events;
int idx;
+ if (!kvm_arch_intc_initialized(kvm))
+ return -EAGAIN;
+
irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL);
if (!irqfd)
return -ENOMEM;
--
1.9.1
next prev parent reply other threads:[~2015-01-15 14:47 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 14:47 [PATCH v7 0/4] irqfd support for arm/arm64 Eric Auger
2015-01-15 14:47 ` [PATCH v7 1/4] KVM: arm/arm64: unset CONFIG_HAVE_KVM_IRQCHIP Eric Auger
2015-01-16 9:34 ` André Przywara
2015-01-15 14:47 ` Eric Auger [this message]
2015-01-16 9:35 ` [PATCH v7 2/4] KVM: introduce kvm_arch_intc_initialized and use it in irqfd André Przywara
2015-01-15 14:47 ` [PATCH v7 3/4] KVM: arm/arm64: implement kvm_arch_intc_initialized Eric Auger
2015-01-16 9:36 ` André Przywara
2015-01-15 14:47 ` [PATCH v7 4/4] KVM: arm/arm64: add irqfd support Eric Auger
2015-01-16 10:07 ` André Przywara
2015-01-19 15:01 ` Eric Auger
2015-01-19 15:08 ` 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=1421333267-15287-3-git-send-email-eric.auger@linaro.org \
--to=eric.auger@linaro.org \
--cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).