From: Feng Wu <feng.wu@intel.com>
To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: pbonzini@redhat.com, alex.williamson@redhat.com, joro@8bytes.org,
eric.auger@linaro.org, feng.wu@intel.com
Subject: [v5 16/19] KVM: Add an arch specific hooks in 'struct kvm_kernel_irqfd'
Date: Mon, 13 Jul 2015 17:47:32 +0800 [thread overview]
Message-ID: <1436780855-3617-17-git-send-email-feng.wu@intel.com> (raw)
In-Reply-To: <1436780855-3617-1-git-send-email-feng.wu@intel.com>
This patch adds an arch specific hooks 'arch_update' in
'struct kvm_kernel_irqfd'. On Intel side, it is used to
update the IRTE when VT-d posted-interrupts is used.
Signed-off-by: Feng Wu <feng.wu@intel.com>
---
arch/x86/kvm/x86.c | 5 +++++
include/linux/kvm_host.h | 3 +++
include/linux/kvm_irqfd.h | 2 ++
virt/kvm/eventfd.c | 13 ++++++++++++-
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 62bbafe..a88e659 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -8063,6 +8063,11 @@ void kvm_arch_irq_consumer_init(struct irq_bypass_consumer *cons)
cons->del_producer = kvm_arch_irq_bypass_del_producer;
}
+void kvm_arch_irqfd_init(struct kvm_kernel_irqfd *irqfd)
+{
+ irqfd->arch_update = kvm_arch_update_pi_irte;
+}
+
EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_exit);
EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_inj_virq);
EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_page_fault);
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index e693b3a..b37ebca 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -33,6 +33,8 @@
#include <asm/kvm_host.h>
+struct kvm_kernel_irqfd;
+
/*
* The bit 16 ~ bit 31 of kvm_memory_region::flags are internally used
* in kvm, other bits are visible for userspace which are defined in
@@ -1074,6 +1076,7 @@ extern struct kvm_device_ops kvm_arm_vgic_v2_ops;
extern struct kvm_device_ops kvm_arm_vgic_v3_ops;
void kvm_arch_irq_consumer_init(struct irq_bypass_consumer *cons);
+void kvm_arch_irqfd_init(struct kvm_kernel_irqfd *irqfd);
#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
diff --git a/include/linux/kvm_irqfd.h b/include/linux/kvm_irqfd.h
index cf9aad4..47a2696 100644
--- a/include/linux/kvm_irqfd.h
+++ b/include/linux/kvm_irqfd.h
@@ -67,6 +67,8 @@ struct kvm_kernel_irqfd {
struct work_struct shutdown;
struct irq_bypass_consumer consumer;
struct irq_bypass_producer *producer;
+ int (*arch_update)(struct kvm *kvm, unsigned int host_irq,
+ uint32_t guest_irq, bool set);
};
#endif /* __LINUX_KVM_IRQFD_H */
diff --git a/virt/kvm/eventfd.c b/virt/kvm/eventfd.c
index 4225eea..762282c 100644
--- a/virt/kvm/eventfd.c
+++ b/virt/kvm/eventfd.c
@@ -276,6 +276,7 @@ kvm_irqfd_assign(struct kvm *kvm, struct kvm_irqfd *args)
INIT_LIST_HEAD(&irqfd->list);
INIT_WORK(&irqfd->inject, irqfd_inject);
INIT_WORK(&irqfd->shutdown, irqfd_shutdown);
+ kvm_arch_irqfd_init(irqfd);
seqcount_init(&irqfd->irq_entry_sc);
f = fdget(args->fd);
@@ -562,13 +563,23 @@ kvm_irqfd_release(struct kvm *kvm)
*/
void kvm_irq_routing_update(struct kvm *kvm)
{
+ int ret;
struct kvm_kernel_irqfd *irqfd;
spin_lock_irq(&kvm->irqfds.lock);
- list_for_each_entry(irqfd, &kvm->irqfds.items, list)
+ list_for_each_entry(irqfd, &kvm->irqfds.items, list) {
irqfd_update(kvm, irqfd);
+ if (irqfd->arch_update) {
+ BUG_ON(!irqfd->producer);
+ ret = irqfd->arch_update(
+ irqfd->kvm, irqfd->producer->irq,
+ irqfd->gsi, 1);
+ WARN_ON(ret);
+ }
+ }
+
spin_unlock_irq(&kvm->irqfds.lock);
}
--
2.1.0
next prev parent reply other threads:[~2015-07-13 9:59 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-13 9:47 [v5 00/19] Add VT-d Posted-Interrupts support Feng Wu
2015-07-13 9:47 ` [v5 01/19] KVM: Extend struct pi_desc for VT-d Posted-Interrupts Feng Wu
2015-07-13 9:47 ` [v5 02/19] KVM: Add some helper functions for Posted-Interrupts Feng Wu
2015-07-13 9:47 ` [v5 03/19] KVM: Define a new interface kvm_intr_is_single_vcpu() Feng Wu
2015-07-13 9:47 ` [v5 04/19] KVM: Get Posted-Interrupts descriptor address from struct kvm_vcpu Feng Wu
2015-07-13 9:47 ` [v5 05/19] KVM: Add interfaces to control PI outside vmx Feng Wu
2015-07-13 9:47 ` [v5 06/19] KVM: Make struct kvm_irq_routing_table accessible Feng Wu
2015-07-13 9:47 ` [v5 07/19] KVM: make kvm_set_msi_irq() public Feng Wu
2015-07-13 9:47 ` [v5 08/19] vfio: Select IRQ_BYPASS_MANAGER for vfio PCI devices Feng Wu
2015-07-13 9:47 ` [v5 09/19] vfio: Register/unregister irq_bypass_producer Feng Wu
2015-07-13 12:55 ` Eric Auger
2015-07-13 18:57 ` Alex Williamson
2015-07-13 9:47 ` [v5 10/19] KVM, x86: Select IRQ_BYPASS_MANAGER for KVM_INTEL Feng Wu
2015-07-13 9:47 ` [v5 11/19] KVM: create kvm_irqfd.h Feng Wu
2015-07-13 9:47 ` [v5 12/19] KVM: eventfd: add irq bypass information in irqfd Feng Wu
2015-07-13 9:47 ` [v5 13/19] KVM: x86: Update IRTE for posted-interrupts Feng Wu
2015-07-13 9:47 ` [v5 14/19] KVM: x86: Add arch specific routines for irqbypass manager Feng Wu
2015-07-13 13:17 ` Eric Auger
2015-07-13 9:47 ` [v5 15/19] KVM: eventfd: add irq bypass consumer management Feng Wu
2015-07-13 13:16 ` Eric Auger
2015-07-13 13:47 ` Paolo Bonzini
2015-07-28 5:06 ` Wu, Feng
2015-07-13 9:47 ` Feng Wu [this message]
2015-07-13 13:09 ` [v5 16/19] KVM: Add an arch specific hooks in 'struct kvm_kernel_irqfd' Eric Auger
2015-07-13 9:47 ` [v5 17/19] KVM: Update Posted-Interrupts Descriptor when vCPU is preempted Feng Wu
2015-07-13 9:47 ` [v5 18/19] KVM: Update Posted-Interrupts Descriptor when vCPU is blocked Feng Wu
2015-07-13 9:47 ` [v5 19/19] KVM: Warn if 'SN' is set during posting interrupts by software Feng Wu
2015-07-13 13:19 ` [v5 00/19] Add VT-d Posted-Interrupts support Eric Auger
2015-07-14 1:08 ` Wu, Feng
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=1436780855-3617-17-git-send-email-feng.wu@intel.com \
--to=feng.wu@intel.com \
--cc=alex.williamson@redhat.com \
--cc=eric.auger@linaro.org \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@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
all inboxes | Powered by JetHome®