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

Commit 1bc87b00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm 

* 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm: (75 commits)
  KVM: SVM: Keep intercepting task switching with NPT enabled
  KVM: s390: implement sigp external call
  KVM: s390: fix register setting
  KVM: s390: fix return value of kvm_arch_init_vm
  KVM: s390: check cpu_id prior to using it
  KVM: emulate lapic tsc deadline timer for guest
  x86: TSC deadline definitions
  KVM: Fix simultaneous NMIs
  KVM: x86 emulator: convert push %sreg/pop %sreg to direct decode
  KVM: x86 emulator: switch lds/les/lss/lfs/lgs to direct decode
  KVM: x86 emulator: streamline decode of segment registers
  KVM: x86 emulator: simplify OpMem64 decode
  KVM: x86 emulator: switch src decode to decode_operand()
  KVM: x86 emulator: qualify OpReg inhibit_byte_regs hack
  KVM: x86 emulator: switch OpImmUByte decode to decode_imm()
  KVM: x86 emulator: free up some flag bits near src, dst
  KVM: x86 emulator: switch src2 to generic decode_operand()
  KVM: x86 emulator: expand decode flags to 64 bits
  KVM: x86 emulator: split dst decode to a generic decode_operand()
  KVM: x86 emulator: move memop, memopp into emulation context
  ...
parents acff987d f1c1da2b

Documentation/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -1201,6 +1201,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			[KVM,Intel] Disable FlexPriority feature (TPR shadow).

			Default is 1 (enabled)



	kvm-intel.nested=

			[KVM,Intel] Enable VMX nesting (nVMX).

			Default is 0 (disabled)



	kvm-intel.unrestricted_guest=

			[KVM,Intel] Disable unrestricted guest feature

			(virtualized real and unpaged mode) on capable

Documentation/virtual/kvm/api.txt

+69 −2
Original line number Diff line number Diff line
@@ -175,10 +175,30 @@ 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).  You can use KVM_CAP_NR_VCPUS of the

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

in the range [0, max_vcpus).



The recommended max_vcpus value can be retrieved using the KVM_CAP_NR_VCPUS of

the KVM_CHECK_EXTENSION ioctl() at run-time.

The maximum possible value for max_vcpus can be retrieved using the

KVM_CAP_MAX_VCPUS of the KVM_CHECK_EXTENSION ioctl() at run-time.



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

cpus max.

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

same as the value returned from KVM_CAP_NR_VCPUS.



On powerpc using book3s_hv mode, the vcpus are mapped onto virtual

threads in one or more virtual CPU cores.  (This is because the

hardware requires all the hardware threads in a CPU core to be in the

same partition.)  The KVM_CAP_PPC_SMT capability indicates the number

of vcpus per virtual core (vcore).  The vcore id is obtained by

dividing the vcpu id by the number of vcpus per vcore.  The vcpus in a

given vcore will always be in the same physical core as each other

(though that might be a different physical core from time to time).

Userspace can control the threading (SMT) mode of the guest by its

allocation of vcpu ids.  For example, if userspace wants

single-threaded guest vcpus, it should make all vcpu ids be a multiple

of the number of vcpus per vcore.



On powerpc using book3s_hv mode, the vcpus are mapped onto virtual

threads in one or more virtual CPU cores.  (This is because the
@@ -1633,3 +1653,50 @@ developer registration required to access it). 
		char padding[256];

	};

};



6. Capabilities that can be enabled



There are certain capabilities that change the behavior of the virtual CPU when

enabled. To enable them, please see section 4.37. Below you can find a list of

capabilities and what their effect on the vCPU is when enabling them.



The following information is provided along with the description:



  Architectures: which instruction set architectures provide this ioctl.

      x86 includes both i386 and x86_64.



  Parameters: what parameters are accepted by the capability.



  Returns: the return value.  General error numbers (EBADF, ENOMEM, EINVAL)

      are not detailed, but errors with specific meanings are.



6.1 KVM_CAP_PPC_OSI



Architectures: ppc

Parameters: none

Returns: 0 on success; -1 on error



This capability enables interception of OSI hypercalls that otherwise would

be treated as normal system calls to be injected into the guest. OSI hypercalls

were invented by Mac-on-Linux to have a standardized communication mechanism

between the guest and the host.



When this capability is enabled, KVM_EXIT_OSI can occur.



6.2 KVM_CAP_PPC_PAPR



Architectures: ppc

Parameters: none

Returns: 0 on success; -1 on error



This capability enables interception of PAPR hypercalls. PAPR hypercalls are

done using the hypercall instruction "sc 1".



It also sets the guest privilege level to "supervisor" mode. Usually the guest

runs in "hypervisor" privilege mode with a few missing features.



In addition to the above, it changes the semantics of SDR1. In this mode, the

HTAB address part of SDR1 contains an HVA instead of a GPA, as PAPR keeps the

HTAB invisible to the guest.



When this capability is enabled, KVM_EXIT_PAPR_HCALL can occur.

arch/powerpc/include/asm/kvm.h

+13 −0
Original line number Diff line number Diff line
@@ -148,6 +148,12 @@ struct kvm_regs { 
#define KVM_SREGS_E_UPDATE_DEC		(1 << 2)

#define KVM_SREGS_E_UPDATE_DBSR		(1 << 3)



/*

 * Book3S special bits to indicate contents in the struct by maintaining

 * backwards compatibility with older structs. If adding a new field,

 * please make sure to add a flag for that new field */

#define KVM_SREGS_S_HIOR		(1 << 0)



/*

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

 * previous KVM_GET_REGS.
@@ -173,6 +179,8 @@ struct kvm_sregs { 
				__u64 ibat[8]; 

				__u64 dbat[8]; 

			} ppc32;

			__u64 flags; /* KVM_SREGS_S_ */

			__u64 hior;

		} s;

		struct {

			union {
@@ -276,6 +284,11 @@ struct kvm_guest_debug_arch { 
#define KVM_INTERRUPT_UNSET	-2U

#define KVM_INTERRUPT_SET_LEVEL	-3U



#define KVM_CPU_440		1

#define KVM_CPU_E500V2		2

#define KVM_CPU_3S_32		3

#define KVM_CPU_3S_64		4



/* for KVM_CAP_SPAPR_TCE */

struct kvm_create_spapr_tce {

	__u64 liobn;

arch/powerpc/include/asm/kvm_book3s.h

+37 −3
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ struct kvmppc_vcpu_book3s { 
#endif

	int context_id[SID_CONTEXTS];



	bool hior_sregs;		/* HIOR is set by SREGS, not PVR */



	struct hlist_head hpte_hash_pte[HPTEG_HASH_NUM_PTE];

	struct hlist_head hpte_hash_pte_long[HPTEG_HASH_NUM_PTE_LONG];

	struct hlist_head hpte_hash_vpte[HPTEG_HASH_NUM_VPTE];
@@ -139,15 +141,14 @@ extern void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr); 
extern int kvmppc_emulate_paired_single(struct kvm_run *run, struct kvm_vcpu *vcpu);

extern pfn_t kvmppc_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn);



extern void kvmppc_handler_lowmem_trampoline(void);

extern void kvmppc_handler_trampoline_enter(void);

extern void kvmppc_rmcall(ulong srr0, ulong srr1);

extern void kvmppc_entry_trampoline(void);

extern void kvmppc_hv_entry_trampoline(void);

extern void kvmppc_load_up_fpu(void);

extern void kvmppc_load_up_altivec(void);

extern void kvmppc_load_up_vsx(void);

extern u32 kvmppc_alignment_dsisr(struct kvm_vcpu *vcpu, unsigned int inst);

extern ulong kvmppc_alignment_dar(struct kvm_vcpu *vcpu, unsigned int inst);

extern int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd);



static inline struct kvmppc_vcpu_book3s *to_book3s(struct kvm_vcpu *vcpu)

{
@@ -382,6 +383,39 @@ static inline bool kvmppc_critical_section(struct kvm_vcpu *vcpu) 
}

#endif



static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,

					     unsigned long pte_index)

{

	unsigned long rb, va_low;



	rb = (v & ~0x7fUL) << 16;		/* AVA field */

	va_low = pte_index >> 3;

	if (v & HPTE_V_SECONDARY)

		va_low = ~va_low;

	/* xor vsid from AVA */

	if (!(v & HPTE_V_1TB_SEG))

		va_low ^= v >> 12;

	else

		va_low ^= v >> 24;

	va_low &= 0x7ff;

	if (v & HPTE_V_LARGE) {

		rb |= 1;			/* L field */

		if (cpu_has_feature(CPU_FTR_ARCH_206) &&

		    (r & 0xff000)) {

			/* non-16MB large page, must be 64k */

			/* (masks depend on page size) */

			rb |= 0x1000;		/* page encoding in LP field */

			rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */

			rb |= (va_low & 0xfe);	/* AVAL field (P7 doesn't seem to care) */

		}

	} else {

		/* 4kB page */

		rb |= (va_low & 0x7ff) << 12;	/* remaining 11b of VA */

	}

	rb |= (v >> 54) & 0x300;		/* B field */

	return rb;

}



/* Magic register values loaded into r3 and r4 before the 'sc' assembly

 * instruction for the OSI hypercalls */

#define OSI_SC_MAGIC_R3			0x113724FA

arch/powerpc/include/asm/kvm_book3s_asm.h

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ struct kvmppc_host_state { 
	ulong scratch0;

	ulong scratch1;

	u8 in_guest;

	u8 restore_hid5;

	u8 napping;



#ifdef CONFIG_KVM_BOOK3S_64_HV

	struct kvm_vcpu *kvm_vcpu;