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

Commit 61ec84f1 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-ppc-next' of... 

Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

 into HEAD

The highlights are:

* Enable VFIO device on PowerPC, from David Gibson
* Optimizations to speed up IPIs between vcpus in HV KVM,
  from Suresh Warrier (who is also Suresh E. Warrier)
* In-kernel handling of IOMMU hypercalls, and support for dynamic DMA
  windows (DDW), from Alexey Kardashevskiy.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parents 433da860 58ded420

Documentation/virtual/kvm/api.txt

+57 −0
Original line number Diff line number Diff line
@@ -3035,6 +3035,63 @@ Returns: 0 on success, -1 on error 


Queues an SMI on the thread's vcpu.



4.97 KVM_CAP_PPC_MULTITCE



Capability: KVM_CAP_PPC_MULTITCE

Architectures: ppc

Type: vm



This capability means the kernel is capable of handling hypercalls

H_PUT_TCE_INDIRECT and H_STUFF_TCE without passing those into the user

space. This significantly accelerates DMA operations for PPC KVM guests.

User space should expect that its handlers for these hypercalls

are not going to be called if user space previously registered LIOBN

in KVM (via KVM_CREATE_SPAPR_TCE or similar calls).



In order to enable H_PUT_TCE_INDIRECT and H_STUFF_TCE use in the guest,

user space might have to advertise it for the guest. For example,

IBM pSeries (sPAPR) guest starts using them if "hcall-multi-tce" is

present in the "ibm,hypertas-functions" device-tree property.



The hypercalls mentioned above may or may not be processed successfully

in the kernel based fast path. If they can not be handled by the kernel,

they will get passed on to user space. So user space still has to have

an implementation for these despite the in kernel acceleration.



This capability is always enabled.



4.98 KVM_CREATE_SPAPR_TCE_64



Capability: KVM_CAP_SPAPR_TCE_64

Architectures: powerpc

Type: vm ioctl

Parameters: struct kvm_create_spapr_tce_64 (in)

Returns: file descriptor for manipulating the created TCE table



This is an extension for KVM_CAP_SPAPR_TCE which only supports 32bit

windows, described in 4.62 KVM_CREATE_SPAPR_TCE



This capability uses extended struct in ioctl interface:



/* for KVM_CAP_SPAPR_TCE_64 */

struct kvm_create_spapr_tce_64 {

	__u64 liobn;

	__u32 page_shift;

	__u32 flags;

	__u64 offset;	/* in pages */

	__u64 size; 	/* in pages */

};



The aim of extension is to support an additional bigger DMA window with

a variable page size.

KVM_CREATE_SPAPR_TCE_64 receives a 64bit window size, an IOMMU page shift and

a bus offset of the corresponding DMA window, @size and @offset are numbers

of IOMMU pages.



@flags are not used at the moment.



The rest of functionality is identical to KVM_CREATE_SPAPR_TCE.



5. The kvm_run structure

------------------------

arch/powerpc/include/asm/kvm_book3s_64.h

+0 −2
Original line number Diff line number Diff line
@@ -33,8 +33,6 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu) 
}

#endif



#define SPAPR_TCE_SHIFT		12



#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE

#define KVM_DEFAULT_HPT_ORDER	24	/* 16MB HPT by default */

#endif

arch/powerpc/include/asm/kvm_host.h

+4 −1
Original line number Diff line number Diff line
@@ -182,7 +182,10 @@ struct kvmppc_spapr_tce_table { 
	struct list_head list;

	struct kvm *kvm;

	u64 liobn;

	u32 window_size;

	struct rcu_head rcu;

	u32 page_shift;

	u64 offset;		/* in pages */

	u64 size;		/* window size in pages */

	struct page *pages[0];

};

arch/powerpc/include/asm/kvm_ppc.h

+50 −1
Original line number Diff line number Diff line
@@ -165,9 +165,25 @@ extern void kvmppc_map_vrma(struct kvm_vcpu *vcpu, 
extern int kvmppc_pseries_do_hcall(struct kvm_vcpu *vcpu);



extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,

				struct kvm_create_spapr_tce *args);

				struct kvm_create_spapr_tce_64 *args);

extern struct kvmppc_spapr_tce_table *kvmppc_find_table(

		struct kvm_vcpu *vcpu, unsigned long liobn);

extern long kvmppc_ioba_validate(struct kvmppc_spapr_tce_table *stt,

		unsigned long ioba, unsigned long npages);

extern long kvmppc_tce_validate(struct kvmppc_spapr_tce_table *tt,

		unsigned long tce);

extern long kvmppc_gpa_to_ua(struct kvm *kvm, unsigned long gpa,

		unsigned long *ua, unsigned long **prmap);

extern void kvmppc_tce_put(struct kvmppc_spapr_tce_table *tt,

		unsigned long idx, unsigned long tce);

extern long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

			     unsigned long ioba, unsigned long tce);

extern long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu,

		unsigned long liobn, unsigned long ioba,

		unsigned long tce_list, unsigned long npages);

extern long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu,

		unsigned long liobn, unsigned long ioba,

		unsigned long tce_value, unsigned long npages);

extern long kvmppc_h_get_tce(struct kvm_vcpu *vcpu, unsigned long liobn,

			     unsigned long ioba);

extern struct page *kvm_alloc_hpt(unsigned long nr_pages);
@@ -437,6 +453,8 @@ static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu) 
{

	return vcpu->arch.irq_type == KVMPPC_IRQ_XICS;

}

extern void kvmppc_alloc_host_rm_ops(void);

extern void kvmppc_free_host_rm_ops(void);

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);
@@ -445,7 +463,11 @@ extern u64 kvmppc_xics_get_icp(struct kvm_vcpu *vcpu); 
extern int kvmppc_xics_set_icp(struct kvm_vcpu *vcpu, u64 icpval);

extern int kvmppc_xics_connect_vcpu(struct kvm_device *dev,

			struct kvm_vcpu *vcpu, u32 cpu);

extern void kvmppc_xics_ipi_action(void);

extern int h_ipi_redirect;

#else

static inline void kvmppc_alloc_host_rm_ops(void) {};

static inline void kvmppc_free_host_rm_ops(void) {};

static inline int kvmppc_xics_enabled(struct kvm_vcpu *vcpu)

	{ return 0; }

static inline void kvmppc_xics_free_icp(struct kvm_vcpu *vcpu) { }
@@ -459,6 +481,33 @@ static inline int kvmppc_xics_hcall(struct kvm_vcpu *vcpu, u32 cmd) 
	{ return 0; }

#endif



/*

 * Host-side operations we want to set up while running in real

 * mode in the guest operating on the xics.

 * Currently only VCPU wakeup is supported.

 */



union kvmppc_rm_state {

	unsigned long raw;

	struct {

		u32 in_host;

		u32 rm_action;

	};

};



struct kvmppc_host_rm_core {

	union kvmppc_rm_state rm_state;

	void *rm_data;

	char pad[112];

};



struct kvmppc_host_rm_ops {

	struct kvmppc_host_rm_core	*rm_core;

	void		(*vcpu_kick)(struct kvm_vcpu *vcpu);

};



extern struct kvmppc_host_rm_ops *kvmppc_host_rm_ops_hv;



static inline unsigned long kvmppc_get_epr(struct kvm_vcpu *vcpu)

{

#ifdef CONFIG_KVM_BOOKE_HV

arch/powerpc/include/asm/pgtable.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ static inline pte_t *find_linux_pte_or_hugepte(pgd_t *pgdir, unsigned long ea, 
	}

	return __find_linux_pte_or_hugepte(pgdir, ea, is_thp, shift);

}



unsigned long vmalloc_to_phys(void *vmalloc_addr);



#endif /* __ASSEMBLY__ */



#endif /* _ASM_POWERPC_PGTABLE_H */