Commit f4b10bc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

* 'kvm-updates/2.6.40' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (131 commits)
  KVM: MMU: Use ptep_user for cmpxchg_gpte()
  KVM: Fix kvm mmu_notifier initialization order
  KVM: Add documentation for KVM_CAP_NR_VCPUS
  KVM: make guest mode entry to be rcu quiescent state
  KVM: x86 emulator: Make jmp far emulation into a separate function
  KVM: x86 emulator: Rename emulate_grpX() to em_grpX()
  KVM: x86 emulator: Remove unused arg from emulate_pop()
  KVM: x86 emulator: Remove unused arg from writeback()
  KVM: x86 emulator: Remove unused arg from read_descriptor()
  KVM: x86 emulator: Remove unused arg from seg_override()
  KVM: Validate userspace_addr of memslot when registered
  KVM: MMU: Clean up gpte reading with copy_from_user()
  KVM: PPC: booke: add sregs support
  KVM: PPC: booke: save/restore VRSAVE (a.k.a. USPRG0)
  KVM: PPC: use ticks, not usecs, for exit timing
  KVM: PPC: fix exit accounting for SPRs, tlbwe, tlbsx
  KVM: PPC: e500: emulate SVR
  KVM: VMX: Cache vmcs segment fields
  KVM: x86 emulator: consolidate segment accessors
  KVM: VMX: Avoid reading %rip unnecessarily when handling exceptions
  ...
parents 53ee7569 c8cfbb55

Documentation/virtual/kvm/api.txt

+31 −3
Original line number Diff line number Diff line
@@ -175,7 +175,10 @@ Parameters: vcpu id (apic id on x86) 
Returns: vcpu fd on success, -1 on error



This API adds a vcpu to a virtual machine.  The vcpu id is a small integer

in the range [0, max_vcpus).

in the range [0, max_vcpus).  You can use KVM_CAP_NR_VCPUS of the

KVM_CHECK_EXTENSION ioctl() to determine the value for max_vcpus at run-time.

If the KVM_CAP_NR_VCPUS does not exist, you should assume that max_vcpus is 4

cpus max.



4.8 KVM_GET_DIRTY_LOG (vm ioctl)
@@ -261,7 +264,7 @@ See KVM_GET_REGS for the data structure. 
4.13 KVM_GET_SREGS



Capability: basic

Architectures: x86

Architectures: x86, ppc

Type: vcpu ioctl

Parameters: struct kvm_sregs (out)

Returns: 0 on success, -1 on error
@@ -279,6 +282,8 @@ struct kvm_sregs { 
	__u64 interrupt_bitmap[(KVM_NR_INTERRUPTS + 63) / 64];

};



/* ppc -- see arch/powerpc/include/asm/kvm.h */



interrupt_bitmap is a bitmap of pending external interrupts.  At most

one bit may be set.  This interrupt has been acknowledged by the APIC

but not yet injected into the cpu core.
@@ -286,7 +291,7 @@ but not yet injected into the cpu core. 
4.14 KVM_SET_SREGS



Capability: basic

Architectures: x86

Architectures: x86, ppc

Type: vcpu ioctl

Parameters: struct kvm_sregs (in)

Returns: 0 on success, -1 on error
@@ -1263,6 +1268,29 @@ struct kvm_assigned_msix_entry { 
	__u16 padding[3];

};



4.54 KVM_SET_TSC_KHZ



Capability: KVM_CAP_TSC_CONTROL

Architectures: x86

Type: vcpu ioctl

Parameters: virtual tsc_khz

Returns: 0 on success, -1 on error



Specifies the tsc frequency for the virtual machine. The unit of the

frequency is KHz.



4.55 KVM_GET_TSC_KHZ



Capability: KVM_CAP_GET_TSC_KHZ

Architectures: x86

Type: vcpu ioctl

Parameters: none

Returns: virtual tsc-khz on success, negative value on error



Returns the tsc frequency of the guest. The unit of the return value is

KHz. If the host has unstable tsc this ioctl returns -EIO instead as an

error.



5. The kvm_run structure



Application code obtains a pointer to the kvm_run structure by

arch/ia64/kvm/vti.h

+13 −13
Original line number Diff line number Diff line
@@ -83,13 +83,13 @@ 
union vac {

	unsigned long value;

	struct {

		int a_int:1;

		int a_from_int_cr:1;

		int a_to_int_cr:1;

		int a_from_psr:1;

		int a_from_cpuid:1;

		int a_cover:1;

		int a_bsw:1;

		unsigned int a_int:1;

		unsigned int a_from_int_cr:1;

		unsigned int a_to_int_cr:1;

		unsigned int a_from_psr:1;

		unsigned int a_from_cpuid:1;

		unsigned int a_cover:1;

		unsigned int a_bsw:1;

		long reserved:57;

	};

};
@@ -97,12 +97,12 @@ union vac { 
union vdc {

	unsigned long value;

	struct {

		int d_vmsw:1;

		int d_extint:1;

		int d_ibr_dbr:1;

		int d_pmc:1;

		int d_to_pmd:1;

		int d_itm:1;

		unsigned int d_vmsw:1;

		unsigned int d_extint:1;

		unsigned int d_ibr_dbr:1;

		unsigned int d_pmc:1;

		unsigned int d_to_pmd:1;

		unsigned int d_itm:1;

		long reserved:58;

	};

};

arch/powerpc/include/asm/kvm.h

+184 −0
Original line number Diff line number Diff line
@@ -45,6 +45,114 @@ struct kvm_regs { 
	__u64 gpr[32];

};



#define KVM_SREGS_E_IMPL_NONE	0

#define KVM_SREGS_E_IMPL_FSL	1



#define KVM_SREGS_E_FSL_PIDn	(1 << 0) /* PID1/PID2 */



/*

 * Feature bits indicate which sections of the sregs struct are valid,

 * both in KVM_GET_SREGS and KVM_SET_SREGS.  On KVM_SET_SREGS, registers

 * corresponding to unset feature bits will not be modified.  This allows

 * restoring a checkpoint made without that feature, while keeping the

 * default values of the new registers.

 *

 * KVM_SREGS_E_BASE contains:

 * CSRR0/1 (refers to SRR2/3 on 40x)

 * ESR

 * DEAR

 * MCSR

 * TSR

 * TCR

 * DEC

 * TB

 * VRSAVE (USPRG0)

 */

#define KVM_SREGS_E_BASE		(1 << 0)



/*

 * KVM_SREGS_E_ARCH206 contains:

 *

 * PIR

 * MCSRR0/1

 * DECAR

 * IVPR

 */

#define KVM_SREGS_E_ARCH206		(1 << 1)



/*

 * Contains EPCR, plus the upper half of 64-bit registers

 * that are 32-bit on 32-bit implementations.

 */

#define KVM_SREGS_E_64			(1 << 2)



#define KVM_SREGS_E_SPRG8		(1 << 3)

#define KVM_SREGS_E_MCIVPR		(1 << 4)



/*

 * IVORs are used -- contains IVOR0-15, plus additional IVORs

 * in combination with an appropriate feature bit.

 */

#define KVM_SREGS_E_IVOR		(1 << 5)



/*

 * Contains MAS0-4, MAS6-7, TLBnCFG, MMUCFG.

 * Also TLBnPS if MMUCFG[MAVN] = 1.

 */

#define KVM_SREGS_E_ARCH206_MMU		(1 << 6)



/* DBSR, DBCR, IAC, DAC, DVC */

#define KVM_SREGS_E_DEBUG		(1 << 7)



/* Enhanced debug -- DSRR0/1, SPRG9 */

#define KVM_SREGS_E_ED			(1 << 8)



/* Embedded Floating Point (SPE) -- IVOR32-34 if KVM_SREGS_E_IVOR */

#define KVM_SREGS_E_SPE			(1 << 9)



/* External Proxy (EXP) -- EPR */

#define KVM_SREGS_EXP			(1 << 10)



/* External PID (E.PD) -- EPSC/EPLC */

#define KVM_SREGS_E_PD			(1 << 11)



/* Processor Control (E.PC) -- IVOR36-37 if KVM_SREGS_E_IVOR */

#define KVM_SREGS_E_PC			(1 << 12)



/* Page table (E.PT) -- EPTCFG */

#define KVM_SREGS_E_PT			(1 << 13)



/* Embedded Performance Monitor (E.PM) -- IVOR35 if KVM_SREGS_E_IVOR */

#define KVM_SREGS_E_PM			(1 << 14)



/*

 * Special updates:

 *

 * Some registers may change even while a vcpu is not running.

 * To avoid losing these changes, by default these registers are

 * not updated by KVM_SET_SREGS.  To force an update, set the bit

 * in u.e.update_special corresponding to the register to be updated.

 *

 * The update_special field is zero on return from KVM_GET_SREGS.

 *

 * When restoring a checkpoint, the caller can set update_special

 * to 0xffffffff to ensure that everything is restored, even new features

 * that the caller doesn't know about.

 */

#define KVM_SREGS_E_UPDATE_MCSR		(1 << 0)

#define KVM_SREGS_E_UPDATE_TSR		(1 << 1)

#define KVM_SREGS_E_UPDATE_DEC		(1 << 2)

#define KVM_SREGS_E_UPDATE_DBSR		(1 << 3)



/*

 * In KVM_SET_SREGS, reserved/pad fields must be left untouched from a

 * previous KVM_GET_REGS.

 *

 * Unless otherwise indicated, setting any register with KVM_SET_SREGS

 * directly sets its value.  It does not trigger any special semantics such

 * as write-one-to-clear.  Calling KVM_SET_SREGS on an unmodified struct

 * just received from KVM_GET_SREGS is always a no-op.

 */

struct kvm_sregs {

	__u32 pvr;

	union {
@@ -62,6 +170,82 @@ struct kvm_sregs { 
				__u64 dbat[8]; 

			} ppc32;

		} s;

		struct {

			union {

				struct { /* KVM_SREGS_E_IMPL_FSL */

					__u32 features; /* KVM_SREGS_E_FSL_ */

					__u32 svr;

					__u64 mcar;

					__u32 hid0;



					/* KVM_SREGS_E_FSL_PIDn */

					__u32 pid1, pid2;

				} fsl;

				__u8 pad[256];

			} impl;



			__u32 features; /* KVM_SREGS_E_ */

			__u32 impl_id;	/* KVM_SREGS_E_IMPL_ */

			__u32 update_special; /* KVM_SREGS_E_UPDATE_ */

			__u32 pir;	/* read-only */

			__u64 sprg8;

			__u64 sprg9;	/* E.ED */

			__u64 csrr0;

			__u64 dsrr0;	/* E.ED */

			__u64 mcsrr0;

			__u32 csrr1;

			__u32 dsrr1;	/* E.ED */

			__u32 mcsrr1;

			__u32 esr;

			__u64 dear;

			__u64 ivpr;

			__u64 mcivpr;

			__u64 mcsr;	/* KVM_SREGS_E_UPDATE_MCSR */



			__u32 tsr;	/* KVM_SREGS_E_UPDATE_TSR */

			__u32 tcr;

			__u32 decar;

			__u32 dec;	/* KVM_SREGS_E_UPDATE_DEC */



			/*

			 * Userspace can read TB directly, but the

			 * value reported here is consistent with "dec".

			 *

			 * Read-only.

			 */

			__u64 tb;



			__u32 dbsr;	/* KVM_SREGS_E_UPDATE_DBSR */

			__u32 dbcr[3];

			__u32 iac[4];

			__u32 dac[2];

			__u32 dvc[2];

			__u8 num_iac;	/* read-only */

			__u8 num_dac;	/* read-only */

			__u8 num_dvc;	/* read-only */

			__u8 pad;



			__u32 epr;	/* EXP */

			__u32 vrsave;	/* a.k.a. USPRG0 */

			__u32 epcr;	/* KVM_SREGS_E_64 */



			__u32 mas0;

			__u32 mas1;

			__u64 mas2;

			__u64 mas7_3;

			__u32 mas4;

			__u32 mas6;



			__u32 ivor_low[16]; /* IVOR0-15 */

			__u32 ivor_high[18]; /* IVOR32+, plus room to expand */



			__u32 mmucfg;	/* read-only */

			__u32 eptcfg;	/* E.PT, read-only */

			__u32 tlbcfg[4];/* read-only */

			__u32 tlbps[4]; /* read-only */



			__u32 eplc, epsc; /* E.PD */

		} e;

		__u8 pad[1020];

	} u;

};

arch/powerpc/include/asm/kvm_44x.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ static inline struct kvmppc_vcpu_44x *to_44x(struct kvm_vcpu *vcpu) 
	return container_of(vcpu, struct kvmppc_vcpu_44x, vcpu);

}



void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 new_pid);

void kvmppc_44x_tlb_put(struct kvm_vcpu *vcpu);

void kvmppc_44x_tlb_load(struct kvm_vcpu *vcpu);

arch/powerpc/include/asm/kvm_e500.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct kvmppc_vcpu_e500 { 


	u32 host_pid[E500_PID_NUM];

	u32 pid[E500_PID_NUM];

	u32 svr;



	u32 mas0;

	u32 mas1;
@@ -58,6 +59,7 @@ struct kvmppc_vcpu_e500 { 
	u32 hid1;

	u32 tlb0cfg;

	u32 tlb1cfg;

	u64 mcar;



	struct kvm_vcpu vcpu;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE