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

Commit 25e531a9 authored by Avi Kivity's avatar Avi Kivity
Browse files

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

Alex says:

"Changes this time include:

  - Generalize KVM_GUEST support to overall ePAPR code
  - Fix reset for Book3S HV
  - Fix machine check deferral when CONFIG_KVM_GUEST=y
  - Add support for BookE register DECAR"

* 'for-upstream' of git://github.com/agraf/linux-2.6

:
  KVM: PPC: Not optimizing MSR_CE and MSR_ME with paravirt.
  KVM: PPC: booke: Added DECAR support
  KVM: PPC: Book3S HV: Make the guest hash table size configurable
  KVM: PPC: Factor out guest epapr initialization

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parents 79f702a6 d35b1075

Documentation/virtual/kvm/api.txt

+36 −0
Original line number Diff line number Diff line
@@ -1930,6 +1930,42 @@ The "pte_enc" field provides a value that can OR'ed into the hash 
PTE's RPN field (ie, it needs to be shifted left by 12 to OR it

into the hash PTE second double word).





4.75 KVM_PPC_ALLOCATE_HTAB



Capability: KVM_CAP_PPC_ALLOC_HTAB

Architectures: powerpc

Type: vm ioctl

Parameters: Pointer to u32 containing hash table order (in/out)

Returns: 0 on success, -1 on error



This requests the host kernel to allocate an MMU hash table for a

guest using the PAPR paravirtualization interface.  This only does

anything if the kernel is configured to use the Book 3S HV style of

virtualization.  Otherwise the capability doesn't exist and the ioctl

returns an ENOTTY error.  The rest of this description assumes Book 3S

HV.



There must be no vcpus running when this ioctl is called; if there

are, it will do nothing and return an EBUSY error.



The parameter is a pointer to a 32-bit unsigned integer variable

containing the order (log base 2) of the desired size of the hash

table, which must be between 18 and 46.  On successful return from the

ioctl, it will have been updated with the order of the hash table that

was allocated.



If no hash table has been allocated when any vcpu is asked to run

(with the KVM_RUN ioctl), the host kernel will allocate a

default-sized hash table (16 MB).



If this ioctl is called when a hash table has already been allocated,

the kernel will clear out the existing hash table (zero all HPTEs) and

return the hash table order in the parameter.  (If the guest is using

the virtualized real-mode area (VRMA) facility, the kernel will

re-create the VMRA HPTEs on the next KVM_RUN of any vcpu.)





5. The kvm_run structure

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

Documentation/virtual/kvm/ppc-pv.txt

+0 −2
Original line number Diff line number Diff line
@@ -109,8 +109,6 @@ The following bits are safe to be set inside the guest: 


  MSR_EE

  MSR_RI

  MSR_CR

  MSR_ME



If any other bit changes in the MSR, please still use mtmsr(d).

arch/powerpc/include/asm/epapr_hcalls.h

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,8 @@ 
#define EV_HCALL_CLOBBERS2 EV_HCALL_CLOBBERS3, "r5"

#define EV_HCALL_CLOBBERS1 EV_HCALL_CLOBBERS2, "r4"



extern bool epapr_paravirt_enabled;

extern u32 epapr_hypercall_start[];



/*

 * We use "uintptr_t" to define a register because it's guaranteed to be a

arch/powerpc/include/asm/kvm_book3s_64.h

+2 −5
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu) 
#define SPAPR_TCE_SHIFT		12



#ifdef CONFIG_KVM_BOOK3S_64_HV

/* For now use fixed-size 16MB page table */

#define HPT_ORDER	24

#define HPT_NPTEG	(1ul << (HPT_ORDER - 7))	/* 128B per pteg */

#define HPT_NPTE	(HPT_NPTEG << 3)		/* 8 PTEs per PTEG */

#define HPT_HASH_MASK	(HPT_NPTEG - 1)

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

extern int kvm_hpt_order;		/* order of preallocated HPTs */

#endif



#define VRMA_VSID	0x1ffffffUL	/* 1TB VSID reserved for VRMA */

arch/powerpc/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -237,6 +237,10 @@ struct kvm_arch { 
	unsigned long vrma_slb_v;

	int rma_setup_done;

	int using_mmu_notifiers;

	u32 hpt_order;

	atomic_t vcpus_running;

	unsigned long hpt_npte;

	unsigned long hpt_mask;

	spinlock_t slot_phys_lock;

	unsigned long *slot_phys[KVM_MEM_SLOTS_NUM];

	int slot_npages[KVM_MEM_SLOTS_NUM];
@@ -414,7 +418,9 @@ struct kvm_vcpu_arch { 
	ulong mcsrr1;

	ulong mcsr;

	u32 dec;

#ifdef CONFIG_BOOKE

	u32 decar;

#endif

	u32 tbl;

	u32 tbu;

	u32 tcr;