Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8daaafc8 authored by Suresh Warrier's avatar Suresh Warrier Committed by Paul Mackerras
Browse files

KVM: PPC: Book3S HV: Introduce kvmppc_passthru_irqmap 



This patch introduces an IRQ mapping structure, the
kvmppc_passthru_irqmap structure that is to be used
to map the real hardware IRQ in the host with the virtual
hardware IRQ (gsi) that is injected into a guest by KVM for
passthrough adapters.

Currently, we assume a separate IRQ mapping structure for
each guest. Each kvmppc_passthru_irqmap has a mapping arrays,
containing all defined real<->virtual IRQs.

[paulus@ozlabs.org - removed irq_chip field from struct
 kvmppc_passthru_irqmap; changed parameter for
 kvmppc_get_passthru_irqmap from struct kvm_vcpu * to struct
 kvm *, removed small cached array.]

Signed-off-by: default avatarSuresh Warrier <warrier@linux.vnet.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@ozlabs.org>
parent 9576730d

arch/powerpc/include/asm/kvm_host.h

+17 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ struct kvmppc_spapr_tce_table { 
struct kvmppc_xics;

struct kvmppc_icp;



struct kvmppc_passthru_irqmap;



/*

 * The reverse mapping array has one entry for each HPTE,

 * which stores the guest's view of the second word of the HPTE
@@ -273,6 +275,7 @@ struct kvm_arch { 
#endif

#ifdef CONFIG_KVM_XICS

	struct kvmppc_xics *xics;

	struct kvmppc_passthru_irqmap *pimap;

#endif

	struct kvmppc_ops *kvm_ops;

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE
@@ -369,6 +372,20 @@ struct kvmhv_tb_accumulator { 
	u64	tb_max;		/* max time */

};



#ifdef CONFIG_PPC_BOOK3S_64

struct kvmppc_irq_map {

	u32	r_hwirq;

	u32	v_hwirq;

	struct irq_desc *desc;

};



#define	KVMPPC_PIRQ_MAPPED	1024

struct kvmppc_passthru_irqmap {

	int n_mapped;

	struct kvmppc_irq_map mapped[KVMPPC_PIRQ_MAPPED];

};

#endif



# ifdef CONFIG_PPC_FSL_BOOK3E

#define KVMPPC_BOOKE_IAC_NUM	2

#define KVMPPC_BOOKE_DAC_NUM	2

arch/powerpc/include/asm/kvm_ppc.h

+14 −0
Original line number Diff line number Diff line
@@ -457,8 +457,18 @@ static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu) 
{

	return vcpu->arch.irq_type == KVMPPC_IRQ_XICS;

}



static inline struct kvmppc_passthru_irqmap *kvmppc_get_passthru_irqmap(

				struct kvm *kvm)

{

	if (kvm)

		return kvm->arch.pimap;

	return NULL;

}



extern void kvmppc_alloc_host_rm_ops(void);

extern void kvmppc_free_host_rm_ops(void);

extern void kvmppc_free_pimap(struct kvm *kvm);

extern void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu);

extern int kvmppc_xics_create_icp(struct kvm_vcpu *vcpu, unsigned long server);

extern int kvm_vm_ioctl_xics_irq(struct kvm *kvm, struct kvm_irq_level *args);
@@ -470,8 +480,12 @@ extern int kvmppc_xics_connect_vcpu(struct kvm_device *dev, 
extern void kvmppc_xics_ipi_action(void);

extern int h_ipi_redirect;

#else

static inline struct kvmppc_passthru_irqmap *kvmppc_get_passthru_irqmap(

				struct kvm *kvm)

	{ return NULL; }

static inline void kvmppc_alloc_host_rm_ops(void) {};

static inline void kvmppc_free_host_rm_ops(void) {};

static inline void kvmppc_free_pimap(struct kvm *kvm) {};

static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu)

	{ return 0; }

static inline void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu) { }

arch/powerpc/kvm/book3s_hv.c

+13 −0
Original line number Diff line number Diff line
@@ -3412,6 +3412,19 @@ static int kvmppc_core_check_processor_compat_hv(void) 
	return 0;

}



#ifdef CONFIG_KVM_XICS



void kvmppc_free_pimap(struct kvm *kvm)

{

	kfree(kvm->arch.pimap);

}



struct kvmppc_passthru_irqmap *kvmppc_alloc_pimap(void)

{

	return kzalloc(sizeof(struct kvmppc_passthru_irqmap), GFP_KERNEL);

}

#endif



static long kvm_arch_vm_ioctl_hv(struct file *filp,

				 unsigned int ioctl, unsigned long arg)

{