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

Commit d2ff4fc5 authored by Marcelo Tosatti's avatar Marcelo Tosatti
Browse files

Merge branch 'for-upstream' of https://github.com/agraf/linux-2.6 into queue 

* 'for-upstream' of https://github.com/agraf/linux-2.6: (28 commits)
  KVM: PPC: booke: Get/set guest EPCR register using ONE_REG interface
  KVM: PPC: bookehv: Add EPCR support in mtspr/mfspr emulation
  KVM: PPC: bookehv: Add guest computation mode for irq delivery
  KVM: PPC: Make EPCR a valid field for booke64 and bookehv
  KVM: PPC: booke: Extend MAS2 EPN mask for 64-bit
  KVM: PPC: e500: Mask MAS2 EPN high 32-bits in 32/64 tlbwe emulation
  KVM: PPC: Mask ea's high 32-bits in 32/64 instr emulation
  KVM: PPC: e500: Add emulation helper for getting instruction ea
  KVM: PPC: bookehv64: Add support for interrupt handling
  KVM: PPC: bookehv: Remove GET_VCPU macro from exception handler
  KVM: PPC: booke: Fix get_tb() compile error on 64-bit
  KVM: PPC: e500: Silence bogus GCC warning in tlb code
  KVM: PPC: Book3S HV: Handle guest-caused machine checks on POWER7 without panicking
  KVM: PPC: Book3S HV: Improve handling of local vs. global TLB invalidations
  MAINTAINERS: Add git tree link for PPC KVM
  KVM: PPC: Book3S PR: MSR_DE doesn't exist on Book 3S
  KVM: PPC: Book3S PR: Fix VSX handling
  KVM: PPC: Book3S PR: Emulate PURR, SPURR and DSCR registers
  KVM: PPC: Book3S HV: Don't give the guest RW access to RO pages
  KVM: PPC: Book3S HV: Report correct HPT entry index when reading HPT
  ...
parents 8f536b76 352df1de

Documentation/virtual/kvm/api.txt

+55 −0
Original line number Diff line number Diff line
@@ -1773,6 +1773,7 @@ registers, find a list below: 
  PPC   | KVM_REG_PPC_VPA_ADDR  | 64

  PPC   | KVM_REG_PPC_VPA_SLB   | 128

  PPC   | KVM_REG_PPC_VPA_DTL   | 128

  PPC   | KVM_REG_PPC_EPCR	| 32



4.69 KVM_GET_ONE_REG
@@ -2071,6 +2072,60 @@ KVM_S390_INT_EXTERNAL_CALL (vcpu) - sigp external call; source cpu in parm 


Note that the vcpu ioctl is asynchronous to vcpu execution.



4.78 KVM_PPC_GET_HTAB_FD



Capability: KVM_CAP_PPC_HTAB_FD

Architectures: powerpc

Type: vm ioctl

Parameters: Pointer to struct kvm_get_htab_fd (in)

Returns: file descriptor number (>= 0) on success, -1 on error



This returns a file descriptor that can be used either to read out the

entries in the guest's hashed page table (HPT), or to write entries to

initialize the HPT.  The returned fd can only be written to if the

KVM_GET_HTAB_WRITE bit is set in the flags field of the argument, and

can only be read if that bit is clear.  The argument struct looks like

this:



/* For KVM_PPC_GET_HTAB_FD */

struct kvm_get_htab_fd {

	__u64	flags;

	__u64	start_index;

	__u64	reserved[2];

};



/* Values for kvm_get_htab_fd.flags */

#define KVM_GET_HTAB_BOLTED_ONLY	((__u64)0x1)

#define KVM_GET_HTAB_WRITE		((__u64)0x2)



The `start_index' field gives the index in the HPT of the entry at

which to start reading.  It is ignored when writing.



Reads on the fd will initially supply information about all

"interesting" HPT entries.  Interesting entries are those with the

bolted bit set, if the KVM_GET_HTAB_BOLTED_ONLY bit is set, otherwise

all entries.  When the end of the HPT is reached, the read() will

return.  If read() is called again on the fd, it will start again from

the beginning of the HPT, but will only return HPT entries that have

changed since they were last read.



Data read or written is structured as a header (8 bytes) followed by a

series of valid HPT entries (16 bytes) each.  The header indicates how

many valid HPT entries there are and how many invalid entries follow

the valid entries.  The invalid entries are not represented explicitly

in the stream.  The header format is:



struct kvm_get_htab_header {

	__u32	index;

	__u16	n_valid;

	__u16	n_invalid;

};



Writes to the fd create HPT entries starting at the index given in the

header; first `n_valid' valid entries with contents from the data

written, then `n_invalid' invalid entries, invalidating any previously

valid entries found.





5. The kvm_run structure

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

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4253,6 +4253,7 @@ KERNEL VIRTUAL MACHINE (KVM) FOR POWERPC 
M:	Alexander Graf <agraf@suse.de>

L:	kvm-ppc@vger.kernel.org

W:	http://kvm.qumranet.com

T:	git git://github.com/agraf/linux-2.6.git

S:	Supported

F:	arch/powerpc/include/asm/kvm*

F:	arch/powerpc/kvm/

arch/powerpc/include/asm/kvm_book3s.h

+8 −2
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ struct kvmppc_vcpu_book3s { 
	u64 sdr1;

	u64 hior;

	u64 msr_mask;

	u64 purr_offset;

	u64 spurr_offset;

#ifdef CONFIG_PPC_BOOK3S_32

	u32 vsid_pool[VSID_POOL_SIZE];

	u32 vsid_next;
@@ -157,8 +159,12 @@ extern void *kvmppc_pin_guest_page(struct kvm *kvm, unsigned long addr, 
extern void kvmppc_unpin_guest_page(struct kvm *kvm, void *addr);

extern long kvmppc_virtmode_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,

			long pte_index, unsigned long pteh, unsigned long ptel);

extern long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,

			long pte_index, unsigned long pteh, unsigned long ptel);

extern long kvmppc_do_h_enter(struct kvm *kvm, unsigned long flags,

			long pte_index, unsigned long pteh, unsigned long ptel,

			pgd_t *pgdir, bool realmode, unsigned long *idx_ret);

extern long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,

			unsigned long pte_index, unsigned long avpn,

			unsigned long *hpret);

extern long kvmppc_hv_get_dirty_log(struct kvm *kvm,

			struct kvm_memory_slot *memslot, unsigned long *map);

arch/powerpc/include/asm/kvm_book3s_64.h

+31 −0
Original line number Diff line number Diff line
@@ -50,6 +50,15 @@ extern int kvm_hpt_order; /* order of preallocated HPTs */ 
#define HPTE_V_HVLOCK	0x40UL

#define HPTE_V_ABSENT	0x20UL



/*

 * We use this bit in the guest_rpte field of the revmap entry

 * to indicate a modified HPTE.

 */

#define HPTE_GR_MODIFIED	(1ul << 62)



/* These bits are reserved in the guest view of the HPTE */

#define HPTE_GR_RESERVED	HPTE_GR_MODIFIED



static inline long try_lock_hpte(unsigned long *hpte, unsigned long bits)

{

	unsigned long tmp, old;
@@ -237,4 +246,26 @@ static inline bool slot_is_aligned(struct kvm_memory_slot *memslot, 
	return !(memslot->base_gfn & mask) && !(memslot->npages & mask);

}



/*

 * This works for 4k, 64k and 16M pages on POWER7,

 * and 4k and 16M pages on PPC970.

 */

static inline unsigned long slb_pgsize_encoding(unsigned long psize)

{

	unsigned long senc = 0;



	if (psize > 0x1000) {

		senc = SLB_VSID_L;

		if (psize == 0x10000)

			senc |= SLB_VSID_LP_01;

	}

	return senc;

}



static inline int is_vrma_hpte(unsigned long hpte_v)

{

	return (hpte_v & ~0xffffffUL) ==

		(HPTE_V_1TB_SEG | (VRMA_VSID << (40 - 16)));

}



#endif /* __ASM_KVM_BOOK3S_64_H__ */

arch/powerpc/include/asm/kvm_booke_hv_asm.h

+25 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 * there are no exceptions for which we fall through directly to

 * the normal host handler.

 *

 * 32-bit host

 * Expected inputs (normal exceptions):

 *   SCRATCH0 = saved r10

 *   r10 = thread struct
@@ -33,6 +34,30 @@ 
 *   *(r8 + GPR9) = saved r9

 *   *(r8 + GPR10) = saved r10 (r10 not yet clobbered)

 *   *(r8 + GPR11) = saved r11

 *

 * 64-bit host

 * Expected inputs (GEN/GDBELL/DBG/MC exception types):

 *  r10 = saved CR

 *  r13 = PACA_POINTER

 *  *(r13 + PACA_EX##type + EX_R10) = saved r10

 *  *(r13 + PACA_EX##type + EX_R11) = saved r11

 *  SPRN_SPRG_##type##_SCRATCH = saved r13

 *

  * Expected inputs (CRIT exception type):

 *  r10 = saved CR

 *  r13 = PACA_POINTER

 *  *(r13 + PACA_EX##type + EX_R10) = saved r10

 *  *(r13 + PACA_EX##type + EX_R11) = saved r11

 *  *(r13 + PACA_EX##type + EX_R13) = saved r13

 *

 * Expected inputs (TLB exception type):

 *  r10 = saved CR

 *  r13 = PACA_POINTER

 *  *(r13 + PACA_EX##type + EX_TLB_R10) = saved r10

 *  *(r13 + PACA_EX##type + EX_TLB_R11) = saved r11

 *  SPRN_SPRG_GEN_SCRATCH = saved r13

 *

 * Only the bolted version of TLB miss exception handlers is supported now.

 */

.macro DO_KVM intno srr1

#ifdef CONFIG_KVM_BOOKE_HV