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

Commit 55065bc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'kvm-updates/2.6.38' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (142 commits)
  KVM: Initialize fpu state in preemptible context
  KVM: VMX: when entering real mode align segment base to 16 bytes
  KVM: MMU: handle 'map_writable' in set_spte() function
  KVM: MMU: audit: allow audit more guests at the same time
  KVM: Fetch guest cr3 from hardware on demand
  KVM: Replace reads of vcpu->arch.cr3 by an accessor
  KVM: MMU: only write protect mappings at pagetable level
  KVM: VMX: Correct asm constraint in vmcs_load()/vmcs_clear()
  KVM: MMU: Initialize base_role for tdp mmus
  KVM: VMX: Optimize atomic EFER load
  KVM: VMX: Add definitions for more vm entry/exit control bits
  KVM: SVM: copy instruction bytes from VMCB
  KVM: SVM: implement enhanced INVLPG intercept
  KVM: SVM: enhance mov DR intercept handler
  KVM: SVM: enhance MOV CR intercept handler
  KVM: SVM: add new SVM feature bit names
  KVM: cleanup emulate_instruction
  KVM: move complete_insn_gp() into x86.c
  KVM: x86: fix CR8 handling
  KVM guest: Fix kvm clock initialization when it's configured out
  ...
parents 008d23e4 e5c30142

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1705,6 +1705,9 @@ and is between 256 and 4096 characters. It is defined in the file 


	no-kvmclock	[X86,KVM] Disable paravirtualized KVM clock driver



	no-kvmapf	[X86,KVM] Disable paravirtualized asynchronous page

			fault handling.



	nolapic		[X86-32,APIC] Do not enable or use the local APIC.



	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.

Documentation/kvm/api.txt

+178 −0
Original line number Diff line number Diff line
@@ -1085,6 +1085,184 @@ of 4 instructions that make up a hypercall. 
If any additional field gets added to this structure later on, a bit for that

additional piece of information will be set in the flags bitmap.



4.47 KVM_ASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_ASSIGNMENT

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_pci_dev (in)

Returns: 0 on success, -1 on error



Assigns a host PCI device to the VM.



struct kvm_assigned_pci_dev {

	__u32 assigned_dev_id;

	__u32 busnr;

	__u32 devfn;

	__u32 flags;

	__u32 segnr;

	union {

		__u32 reserved[11];

	};

};



The PCI device is specified by the triple segnr, busnr, and devfn.

Identification in succeeding service requests is done via assigned_dev_id. The

following flags are specified:



/* Depends on KVM_CAP_IOMMU */

#define KVM_DEV_ASSIGN_ENABLE_IOMMU	(1 << 0)



4.48 KVM_DEASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_DEASSIGNMENT

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_pci_dev (in)

Returns: 0 on success, -1 on error



Ends PCI device assignment, releasing all associated resources.



See KVM_CAP_DEVICE_ASSIGNMENT for the data structure. Only assigned_dev_id is

used in kvm_assigned_pci_dev to identify the device.



4.49 KVM_ASSIGN_DEV_IRQ



Capability: KVM_CAP_ASSIGN_DEV_IRQ

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_irq (in)

Returns: 0 on success, -1 on error



Assigns an IRQ to a passed-through device.



struct kvm_assigned_irq {

	__u32 assigned_dev_id;

	__u32 host_irq;

	__u32 guest_irq;

	__u32 flags;

	union {

		struct {

			__u32 addr_lo;

			__u32 addr_hi;

			__u32 data;

		} guest_msi;

		__u32 reserved[12];

	};

};



The following flags are defined:



#define KVM_DEV_IRQ_HOST_INTX    (1 << 0)

#define KVM_DEV_IRQ_HOST_MSI     (1 << 1)

#define KVM_DEV_IRQ_HOST_MSIX    (1 << 2)



#define KVM_DEV_IRQ_GUEST_INTX   (1 << 8)

#define KVM_DEV_IRQ_GUEST_MSI    (1 << 9)

#define KVM_DEV_IRQ_GUEST_MSIX   (1 << 10)



It is not valid to specify multiple types per host or guest IRQ. However, the

IRQ type of host and guest can differ or can even be null.



4.50 KVM_DEASSIGN_DEV_IRQ



Capability: KVM_CAP_ASSIGN_DEV_IRQ

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_irq (in)

Returns: 0 on success, -1 on error



Ends an IRQ assignment to a passed-through device.



See KVM_ASSIGN_DEV_IRQ for the data structure. The target device is specified

by assigned_dev_id, flags must correspond to the IRQ type specified on

KVM_ASSIGN_DEV_IRQ. Partial deassignment of host or guest IRQ is allowed.



4.51 KVM_SET_GSI_ROUTING



Capability: KVM_CAP_IRQ_ROUTING

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_irq_routing (in)

Returns: 0 on success, -1 on error



Sets the GSI routing table entries, overwriting any previously set entries.



struct kvm_irq_routing {

	__u32 nr;

	__u32 flags;

	struct kvm_irq_routing_entry entries[0];

};



No flags are specified so far, the corresponding field must be set to zero.



struct kvm_irq_routing_entry {

	__u32 gsi;

	__u32 type;

	__u32 flags;

	__u32 pad;

	union {

		struct kvm_irq_routing_irqchip irqchip;

		struct kvm_irq_routing_msi msi;

		__u32 pad[8];

	} u;

};



/* gsi routing entry types */

#define KVM_IRQ_ROUTING_IRQCHIP 1

#define KVM_IRQ_ROUTING_MSI 2



No flags are specified so far, the corresponding field must be set to zero.



struct kvm_irq_routing_irqchip {

	__u32 irqchip;

	__u32 pin;

};



struct kvm_irq_routing_msi {

	__u32 address_lo;

	__u32 address_hi;

	__u32 data;

	__u32 pad;

};



4.52 KVM_ASSIGN_SET_MSIX_NR



Capability: KVM_CAP_DEVICE_MSIX

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_msix_nr (in)

Returns: 0 on success, -1 on error



Set the number of MSI-X interrupts for an assigned device. This service can

only be called once in the lifetime of an assigned device.



struct kvm_assigned_msix_nr {

	__u32 assigned_dev_id;

	__u16 entry_nr;

	__u16 padding;

};



#define KVM_MAX_MSIX_PER_DEV		256



4.53 KVM_ASSIGN_SET_MSIX_ENTRY



Capability: KVM_CAP_DEVICE_MSIX

Architectures: x86 ia64

Type: vm ioctl

Parameters: struct kvm_assigned_msix_entry (in)

Returns: 0 on success, -1 on error



Specifies the routing of an MSI-X assigned device interrupt to a GSI. Setting

the GSI vector to zero means disabling the interrupt.



struct kvm_assigned_msix_entry {

	__u32 assigned_dev_id;

	__u32 gsi;

	__u16 entry; /* The index of entry in the MSI-X table */

	__u16 padding[3];

};



5. The kvm_run structure



Application code obtains a pointer to the kvm_run structure by

Documentation/kvm/cpuid.txt

+3 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ KVM_FEATURE_MMU_OP || 2 || deprecated. 
KVM_FEATURE_CLOCKSOURCE2           ||     3 || kvmclock available at msrs

                                   ||       || 0x4b564d00 and 0x4b564d01

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

KVM_FEATURE_ASYNC_PF               ||     4 || async pf can be enabled by

                                   ||       || writing to msr 0x4b564d02

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

KVM_FEATURE_CLOCKSOURCE_STABLE_BIT ||    24 || host will warn if no guest-side

                                   ||       || per-cpu warps are expected in

                                   ||       || kvmclock.

Documentation/kvm/msr.txt

+35 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ Glauber Costa <glommer@redhat.com>, Red Hat Inc, 2010 
=====================================================



KVM makes use of some custom MSRs to service some requests.

At present, this facility is only used by kvmclock.



Custom MSRs have a range reserved for them, that goes from

0x4b564d00 to 0x4b564dff. There are MSRs outside this area,
@@ -151,3 +150,38 @@ MSR_KVM_SYSTEM_TIME: 0x12 
			return PRESENT;

		} else

			return NON_PRESENT;



MSR_KVM_ASYNC_PF_EN: 0x4b564d02

	data: Bits 63-6 hold 64-byte aligned physical address of a

	64 byte memory area which must be in guest RAM and must be

	zeroed. Bits 5-2 are reserved and should be zero. Bit 0 is 1

	when asynchronous page faults are enabled on the vcpu 0 when

	disabled. Bit 2 is 1 if asynchronous page faults can be injected

	when vcpu is in cpl == 0.



	First 4 byte of 64 byte memory location will be written to by

	the hypervisor at the time of asynchronous page fault (APF)

	injection to indicate type of asynchronous page fault. Value

	of 1 means that the page referred to by the page fault is not

	present. Value 2 means that the page is now available. Disabling

	interrupt inhibits APFs. Guest must not enable interrupt

	before the reason is read, or it may be overwritten by another

	APF. Since APF uses the same exception vector as regular page

	fault guest must reset the reason to 0 before it does

	something that can generate normal page fault.  If during page

	fault APF reason is 0 it means that this is regular page

	fault.



	During delivery of type 1 APF cr2 contains a token that will

	be used to notify a guest when missing page becomes

	available. When page becomes available type 2 APF is sent with

	cr2 set to the token associated with the page. There is special

	kind of token 0xffffffff which tells vcpu that it should wake

	up all processes waiting for APFs and no individual type 2 APFs

	will be sent.



	If APF is disabled while there are outstanding APFs, they will

	not be delivered.



	Currently type 2 APF will be always delivered on the same vcpu as

	type 1 was, but guest should not rely on that.

arch/ia64/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -590,6 +590,10 @@ int kvm_emulate_halt(struct kvm_vcpu *vcpu); 
int kvm_pal_emul(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);

void kvm_sal_emul(struct kvm_vcpu *vcpu);



#define __KVM_HAVE_ARCH_VM_ALLOC 1

struct kvm *kvm_arch_alloc_vm(void);

void kvm_arch_free_vm(struct kvm *kvm);



#endif /* __ASSEMBLY__*/



#endif