On 07/13/2015 11:47 AM, Feng Wu wrote:
> Add the following x86 specific routines for irqbypass manger:
>
> - kvm_arch_irq_bypass_add_producer
> - kvm_arch_irq_bypass_del_producer
>
> Signed-off-by: Feng Wu <feng.wu@xxxxxxxxx>
> ---
> arch/x86/include/asm/kvm_host.h | 1 +
> arch/x86/kvm/x86.c | 40 ++++++++++++++++++++++++++++++++++++++++
> include/linux/kvm_host.h | 2 ++
> 3 files changed, 43 insertions(+)
>
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index 1b0278e..6db761b 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -24,6 +24,7 @@
> #include <linux/perf_event.h>
> #include <linux/pvclock_gtod.h>
> #include <linux/clocksource.h>
> +#include <linux/irqbypass.h>
>
> #include <asm/pvclock-abi.h>
> #include <asm/desc.h>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index d81ac02..62bbafe 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -49,6 +49,8 @@
> #include <linux/pci.h>
> #include <linux/timekeeper_internal.h>
> #include <linux/pvclock_gtod.h>
> +#include <linux/kvm_irqfd.h>
> +#include <linux/irqbypass.h>
> #include <trace/events/kvm.h>
>
> #define CREATE_TRACE_POINTS
> @@ -8023,6 +8025,44 @@ out:
> return ret;
> }
>
> +void kvm_arch_irq_bypass_add_producer(struct irq_bypass_consumer *cons,
> + struct irq_bypass_producer *prod)
static?
> +{
> + int ret;
> + struct kvm_kernel_irqfd *irqfd =
> + container_of(cons, struct kvm_kernel_irqfd, consumer);
> +
> + irqfd->producer = prod;
> +
> + ret = kvm_arch_update_pi_irte(irqfd->kvm, prod->irq, irqfd->gsi, 1);
> + WARN_ON(ret);
> +}
> +
> +void kvm_arch_irq_bypass_del_producer(struct irq_bypass_consumer *cons,
> + struct irq_bypass_producer *prod)
> +{
static?
Since those 2 functions are not exposed to generic code anymore, why
this kvm_arch naming?
Eric
> + int ret;
> + struct kvm_kernel_irqfd *irqfd =
> + container_of(cons, struct kvm_kernel_irqfd, consumer);
> +
> + irqfd->producer = NULL;
> +
> + /*
> + * When producer of consumer is unregistered, we change back to
> + * remapped mode, so we can re-use the current implementation
> + * when the irq is masked/disabed or the consumer side (KVM
> + * int this case doesn't want to receive the interrupts.
> + */
> + ret = kvm_arch_update_pi_irte(irqfd->kvm, prod->irq, irqfd->gsi, 0);
> + WARN_ON(ret);
> +}
> +
> +void kvm_arch_irq_consumer_init(struct irq_bypass_consumer *cons)
> +{
> + cons->add_producer = kvm_arch_irq_bypass_add_producer;
> + cons->del_producer = kvm_arch_irq_bypass_del_producer;
> +}
> +
> 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 f591f7c..e693b3a 100644
> --- a/include/linux/kvm_host.h
> +++ b/include/linux/kvm_host.h
> @@ -1073,6 +1073,8 @@ extern struct kvm_device_ops kvm_xics_ops;
> 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);
> +
> #ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT
>
> static inline void kvm_vcpu_set_in_spin_loop(struct kvm_vcpu *vcpu, bool val)
>
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
