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

Commit ad53e35a 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

Paul Mackerras writes:

    The highlights are:

    * Reduced latency for interrupts from PCI pass-through devices, from
      Suresh Warrier and me.
    * Halt-polling implementation from Suraj Jitindar Singh.
    * 64-bit VCPU statistics, also from Suraj.
    * Various other minor fixes and improvements.
parents 6f90f1d1 aad9e5ba

arch/arm/include/asm/kvm_host.h

+6 −6
Original line number Diff line number Diff line
@@ -183,15 +183,15 @@ struct kvm_vcpu_arch { 
};



struct kvm_vm_stat {

	u32 remote_tlb_flush;

	ulong remote_tlb_flush;

};



struct kvm_vcpu_stat {

	u32 halt_successful_poll;

	u32 halt_attempted_poll;

	u32 halt_poll_invalid;

	u32 halt_wakeup;

	u32 hvc_exit_stat;

	u64 halt_successful_poll;

	u64 halt_attempted_poll;

	u64 halt_poll_invalid;

	u64 halt_wakeup;

	u64 hvc_exit_stat;

	u64 wfe_exit_stat;

	u64 wfi_exit_stat;

	u64 mmio_exit_user;

arch/arm64/include/asm/kvm_host.h

+6 −6
Original line number Diff line number Diff line
@@ -290,15 +290,15 @@ struct kvm_vcpu_arch { 
#endif



struct kvm_vm_stat {

	u32 remote_tlb_flush;

	ulong remote_tlb_flush;

};



struct kvm_vcpu_stat {

	u32 halt_successful_poll;

	u32 halt_attempted_poll;

	u32 halt_poll_invalid;

	u32 halt_wakeup;

	u32 hvc_exit_stat;

	u64 halt_successful_poll;

	u64 halt_attempted_poll;

	u64 halt_poll_invalid;

	u64 halt_wakeup;

	u64 hvc_exit_stat;

	u64 wfe_exit_stat;

	u64 wfi_exit_stat;

	u64 mmio_exit_user;

arch/mips/include/asm/kvm_host.h

+23 −23
Original line number Diff line number Diff line
@@ -110,32 +110,32 @@ 
extern atomic_t kvm_mips_instance;



struct kvm_vm_stat {

	u32 remote_tlb_flush;

	ulong remote_tlb_flush;

};



struct kvm_vcpu_stat {

	u32 wait_exits;

	u32 cache_exits;

	u32 signal_exits;

	u32 int_exits;

	u32 cop_unusable_exits;

	u32 tlbmod_exits;

	u32 tlbmiss_ld_exits;

	u32 tlbmiss_st_exits;

	u32 addrerr_st_exits;

	u32 addrerr_ld_exits;

	u32 syscall_exits;

	u32 resvd_inst_exits;

	u32 break_inst_exits;

	u32 trap_inst_exits;

	u32 msa_fpe_exits;

	u32 fpe_exits;

	u32 msa_disabled_exits;

	u32 flush_dcache_exits;

	u32 halt_successful_poll;

	u32 halt_attempted_poll;

	u32 halt_poll_invalid;

	u32 halt_wakeup;

	u64 wait_exits;

	u64 cache_exits;

	u64 signal_exits;

	u64 int_exits;

	u64 cop_unusable_exits;

	u64 tlbmod_exits;

	u64 tlbmiss_ld_exits;

	u64 tlbmiss_st_exits;

	u64 addrerr_st_exits;

	u64 addrerr_ld_exits;

	u64 syscall_exits;

	u64 resvd_inst_exits;

	u64 break_inst_exits;

	u64 trap_inst_exits;

	u64 msa_fpe_exits;

	u64 fpe_exits;

	u64 msa_disabled_exits;

	u64 flush_dcache_exits;

	u64 halt_successful_poll;

	u64 halt_attempted_poll;

	u64 halt_poll_invalid;

	u64 halt_wakeup;

};



struct kvm_arch_memory_slot {

arch/powerpc/include/asm/book3s/64/mmu-hash.h

+37 −0
Original line number Diff line number Diff line
@@ -244,6 +244,43 @@ static inline int segment_shift(int ssize) 
	return SID_SHIFT_1T;

}



/*

 * This array is indexed by the LP field of the HPTE second dword.

 * Since this field may contain some RPN bits, some entries are

 * replicated so that we get the same value irrespective of RPN.

 * The top 4 bits are the page size index (MMU_PAGE_*) for the

 * actual page size, the bottom 4 bits are the base page size.

 */

extern u8 hpte_page_sizes[1 << LP_BITS];



static inline unsigned long __hpte_page_size(unsigned long h, unsigned long l,

					     bool is_base_size)

{

	unsigned int i, lp;



	if (!(h & HPTE_V_LARGE))

		return 1ul << 12;



	/* Look at the 8 bit LP value */

	lp = (l >> LP_SHIFT) & ((1 << LP_BITS) - 1);

	i = hpte_page_sizes[lp];

	if (!i)

		return 0;

	if (!is_base_size)

		i >>= 4;

	return 1ul << mmu_psize_defs[i & 0xf].shift;

}



static inline unsigned long hpte_page_size(unsigned long h, unsigned long l)

{

	return __hpte_page_size(h, l, 0);

}



static inline unsigned long hpte_base_page_size(unsigned long h, unsigned long l)

{

	return __hpte_page_size(h, l, 1);

}



/*

 * The current system page and segment sizes

 */

arch/powerpc/include/asm/hmi.h

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifndef __ASM_PPC64_HMI_H__

#define __ASM_PPC64_HMI_H__



#ifdef CONFIG_PPC_BOOK3S_64

#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE



#define	CORE_TB_RESYNC_REQ_BIT		63

#define MAX_SUBCORE_PER_CORE		4