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

Commit bb18b526 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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

Patch queue for 3.16 - 2014-07-08

A few bug fixes to make 3.16 work well with KVM on PowerPC:

  - Fix ppc32 module builds
  - Fix Little Endian hosts
  - Fix Book3S HV HPTE lookup with huge pages in guest
  - Fix BookE lock leak
parents 9242b5b6 19a44ecf

arch/powerpc/include/asm/kvm_book3s_64.h

+17 −2
Original line number Diff line number Diff line
@@ -198,8 +198,10 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r, 
	return rb;

}



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

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

					     bool is_base_size)

{



	int size, a_psize;

	/* Look at the 8 bit LP value */

	unsigned int lp = (l >> LP_SHIFT) & ((1 << LP_BITS) - 1);
@@ -214,14 +216,27 @@ static inline unsigned long hpte_page_size(unsigned long h, unsigned long l) 
				continue;



			a_psize = __hpte_actual_psize(lp, size);

			if (a_psize != -1)

			if (a_psize != -1) {

				if (is_base_size)

					return 1ul << mmu_psize_defs[size].shift;

				return 1ul << mmu_psize_defs[a_psize].shift;

			}

		}



	}

	return 0;

}



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);

}



static inline unsigned long hpte_rpn(unsigned long ptel, unsigned long psize)

{

	return ((ptel & HPTE_R_RPN) & ~(psize - 1)) >> PAGE_SHIFT;

arch/powerpc/include/asm/ppc_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -277,6 +277,8 @@ GLUE(.,name): 
	.globl n;	\

n:



#define _GLOBAL_TOC(name) _GLOBAL(name)



#define _KPROBE(n)	\

	.section ".kprobes.text","a";	\

	.globl	n;	\

arch/powerpc/kvm/book3s_64_mmu_hv.c

+1 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ static ssize_t kvm_htab_write(struct file *file, const char __user *buf, 
				goto out;

			}

			if (!rma_setup && is_vrma_hpte(v)) {

				unsigned long psize = hpte_page_size(v, r);

				unsigned long psize = hpte_base_page_size(v, r);

				unsigned long senc = slb_pgsize_encoding(psize);

				unsigned long lpcr;

arch/powerpc/kvm/book3s_hv_rm_mmu.c

+2 −5
Original line number Diff line number Diff line
@@ -814,13 +814,10 @@ long kvmppc_hv_find_lock_hpte(struct kvm *kvm, gva_t eaddr, unsigned long slb_v, 
			r = hpte[i+1];



			/*

			 * Check the HPTE again, including large page size

			 * Since we don't currently allow any MPSS (mixed

			 * page-size segment) page sizes, it is sufficient

			 * to check against the actual page size.

			 * Check the HPTE again, including base page size

			 */

			if ((v & valid) && (v & mask) == val &&

			    hpte_page_size(v, r) == (1ul << pshift))

			    hpte_base_page_size(v, r) == (1ul << pshift))

				/* Return with the HPTE still locked */

				return (hash << 3) + (i >> 1);

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 *

 * LR = return address to continue at after eventually re-enabling MMU

 */

_GLOBAL(kvmppc_hv_entry_trampoline)

_GLOBAL_TOC(kvmppc_hv_entry_trampoline)

	mflr	r0

	std	r0, PPC_LR_STKOFF(r1)

	stdu	r1, -112(r1)