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

Commit 123857a7 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'signed-kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into kvm-master 

Patch queue for ppc - 2015-04-21

This is the latest queue for KVM on PowerPC changes. Highlights this
time around:

  - Book3S HV: Debugging aids
  - Book3S HV: Minor performance improvements
  - Book3S HV: Cleanups
parents 085e68ee 66feed61

Documentation/virtual/kvm/api.txt

+17 −0
Original line number Diff line number Diff line
@@ -3573,3 +3573,20 @@ struct { 
@ar   - access register number



KVM handlers should exit to userspace with rc = -EREMOTE.





8. Other capabilities.

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



This section lists capabilities that give information about other

features of the KVM implementation.



8.1 KVM_CAP_PPC_HWRNG



Architectures: ppc



This capability, if KVM_CHECK_EXTENSION indicates that it is

available, means that that the kernel has an implementation of the

H_RANDOM hypercall backed by a hardware random-number generator.

If present, the kernel H_RANDOM handler can be enabled for guest use

with the KVM_CAP_PPC_ENABLE_HCALL capability.

arch/powerpc/include/asm/archrandom.h

+9 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ static inline int arch_has_random(void) 
	return !!ppc_md.get_random_long;

}



int powernv_get_random_long(unsigned long *v);



static inline int arch_get_random_seed_long(unsigned long *v)

{

	return 0;
@@ -47,4 +45,13 @@ static inline int arch_has_random_seed(void) 


#endif /* CONFIG_ARCH_RANDOM */



#ifdef CONFIG_PPC_POWERNV

int powernv_hwrng_present(void);

int powernv_get_random_long(unsigned long *v);

int powernv_get_random_real_mode(unsigned long *v);

#else

static inline int powernv_hwrng_present(void) { return 0; }

static inline int powernv_get_random_real_mode(unsigned long *v) { return 0; }

#endif



#endif /* _ASM_POWERPC_ARCHRANDOM_H */

arch/powerpc/include/asm/kvm_book3s.h

+3 −0
Original line number Diff line number Diff line
@@ -292,6 +292,9 @@ static inline bool kvmppc_supports_magic_page(struct kvm_vcpu *vcpu) 
	return !is_kvmppc_hv_enabled(vcpu->kvm);

}



extern int kvmppc_h_logical_ci_load(struct kvm_vcpu *vcpu);

extern int kvmppc_h_logical_ci_store(struct kvm_vcpu *vcpu);



/* Magic register values loaded into r3 and r4 before the 'sc' assembly

 * instruction for the OSI hypercalls */

#define OSI_SC_MAGIC_R3			0x113724FA

arch/powerpc/include/asm/kvm_book3s_64.h

+18 −0
Original line number Diff line number Diff line
@@ -85,6 +85,20 @@ static inline long try_lock_hpte(__be64 *hpte, unsigned long bits) 
	return old == 0;

}



static inline void unlock_hpte(__be64 *hpte, unsigned long hpte_v)

{

	hpte_v &= ~HPTE_V_HVLOCK;

	asm volatile(PPC_RELEASE_BARRIER "" : : : "memory");

	hpte[0] = cpu_to_be64(hpte_v);

}



/* Without barrier */

static inline void __unlock_hpte(__be64 *hpte, unsigned long hpte_v)

{

	hpte_v &= ~HPTE_V_HVLOCK;

	hpte[0] = cpu_to_be64(hpte_v);

}



static inline int __hpte_actual_psize(unsigned int lp, int psize)

{

	int i, shift;
@@ -422,6 +436,10 @@ static inline struct kvm_memslots *kvm_memslots_raw(struct kvm *kvm) 
	return rcu_dereference_raw_notrace(kvm->memslots);

}



extern void kvmppc_mmu_debugfs_init(struct kvm *kvm);



extern void kvmhv_rm_send_ipi(int cpu);



#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */



#endif /* __ASM_KVM_BOOK3S_64_H__ */

arch/powerpc/include/asm/kvm_host.h

+33 −14
Original line number Diff line number Diff line
@@ -227,10 +227,8 @@ struct kvm_arch { 
	unsigned long host_sdr1;

	int tlbie_lock;

	unsigned long lpcr;

	unsigned long rmor;

	struct kvm_rma_info *rma;

	unsigned long vrma_slb_v;

	int rma_setup_done;

	int hpte_setup_done;

	u32 hpt_order;

	atomic_t vcpus_running;

	u32 online_vcores;
@@ -239,6 +237,8 @@ struct kvm_arch { 
	atomic_t hpte_mod_interest;

	cpumask_t need_tlb_flush;

	int hpt_cma_alloc;

	struct dentry *debugfs_dir;

	struct dentry *htab_dentry;

#endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */

#ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE

	struct mutex hpt_mutex;
@@ -263,18 +263,15 @@ struct kvm_arch { 


/*

 * Struct for a virtual core.

 * Note: entry_exit_count combines an entry count in the bottom 8 bits

 * and an exit count in the next 8 bits.  This is so that we can

 * atomically increment the entry count iff the exit count is 0

 * without taking the lock.

 * Note: entry_exit_map combines a bitmap of threads that have entered

 * in the bottom 8 bits and a bitmap of threads that have exited in the

 * next 8 bits.  This is so that we can atomically set the entry bit

 * iff the exit map is 0 without taking a lock.

 */

struct kvmppc_vcore {

	int n_runnable;

	int n_busy;

	int num_threads;

	int entry_exit_count;

	int n_woken;

	int nap_count;

	int entry_exit_map;

	int napping_threads;

	int first_vcpuid;

	u16 pcpu;
@@ -299,13 +296,14 @@ struct kvmppc_vcore { 
	ulong conferring_threads;

};



#define VCORE_ENTRY_COUNT(vc)	((vc)->entry_exit_count & 0xff)

#define VCORE_EXIT_COUNT(vc)	((vc)->entry_exit_count >> 8)

#define VCORE_ENTRY_MAP(vc)	((vc)->entry_exit_map & 0xff)

#define VCORE_EXIT_MAP(vc)	((vc)->entry_exit_map >> 8)

#define VCORE_IS_EXITING(vc)	(VCORE_EXIT_MAP(vc) != 0)



/* Values for vcore_state */

#define VCORE_INACTIVE	0

#define VCORE_SLEEPING	1

#define VCORE_STARTING	2

#define VCORE_PREEMPT	2

#define VCORE_RUNNING	3

#define VCORE_EXITING	4
@@ -368,6 +366,14 @@ struct kvmppc_slb { 
	u8 base_page_size;	/* MMU_PAGE_xxx */

};



/* Struct used to accumulate timing information in HV real mode code */

struct kvmhv_tb_accumulator {

	u64	seqcount;	/* used to synchronize access, also count * 2 */

	u64	tb_total;	/* total time in timebase ticks */

	u64	tb_min;		/* min time */

	u64	tb_max;		/* max time */

};



# ifdef CONFIG_PPC_FSL_BOOK3E

#define KVMPPC_BOOKE_IAC_NUM	2

#define KVMPPC_BOOKE_DAC_NUM	2
@@ -656,6 +662,19 @@ struct kvm_vcpu_arch { 


	u32 emul_inst;

#endif



#ifdef CONFIG_KVM_BOOK3S_HV_EXIT_TIMING

	struct kvmhv_tb_accumulator *cur_activity;	/* What we're timing */

	u64	cur_tb_start;			/* when it started */

	struct kvmhv_tb_accumulator rm_entry;	/* real-mode entry code */

	struct kvmhv_tb_accumulator rm_intr;	/* real-mode intr handling */

	struct kvmhv_tb_accumulator rm_exit;	/* real-mode exit code */

	struct kvmhv_tb_accumulator guest_time;	/* guest execution */

	struct kvmhv_tb_accumulator cede_time;	/* time napping inside guest */



	struct dentry *debugfs_dir;

	struct dentry *debugfs_timings;

#endif /* CONFIG_KVM_BOOK3S_HV_EXIT_TIMING */

};



#define VCPU_FPR(vcpu, i)	(vcpu)->arch.fp.fpr[i][TS_FPROFFSET]