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

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

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

* 'kvm-updates/2.6.33' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (84 commits)
  KVM: VMX: Fix comparison of guest efer with stale host value
  KVM: s390: Fix prefix register checking in arch/s390/kvm/sigp.c
  KVM: Drop user return notifier when disabling virtualization on a cpu
  KVM: VMX: Disable unrestricted guest when EPT disabled
  KVM: x86 emulator: limit instructions to 15 bytes
  KVM: s390: Make psw available on all exits, not just a subset
  KVM: x86: Add KVM_GET/SET_VCPU_EVENTS
  KVM: VMX: Report unexpected simultaneous exceptions as internal errors
  KVM: Allow internal errors reported to userspace to carry extra data
  KVM: Reorder IOCTLs in main kvm.h
  KVM: x86: Polish exception injection via KVM_SET_GUEST_DEBUG
  KVM: only clear irq_source_id if irqchip is present
  KVM: x86: disallow KVM_{SET,GET}_LAPIC without allocated in-kernel lapic
  KVM: x86: disallow multiple KVM_CREATE_IRQCHIP
  KVM: VMX: Remove vmx->msr_offset_efer
  KVM: MMU: update invlpg handler comment
  KVM: VMX: move CR3/PDPTR update to vmx_set_cr3
  KVM: remove duplicated task_switch check
  KVM: powerpc: Fix BUILD_BUG_ON condition
  KVM: VMX: Use shared msr infrastructure
  ...

Trivial conflicts due to new Kconfig options in arch/Kconfig and kernel/Makefile
parents d7fc02c7 d5696725

Documentation/kvm/api.txt

+109 −0
Original line number Diff line number Diff line
@@ -593,6 +593,115 @@ struct kvm_irqchip { 
	} chip;

};



4.27 KVM_XEN_HVM_CONFIG



Capability: KVM_CAP_XEN_HVM

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_xen_hvm_config (in)

Returns: 0 on success, -1 on error



Sets the MSR that the Xen HVM guest uses to initialize its hypercall

page, and provides the starting address and size of the hypercall

blobs in userspace.  When the guest writes the MSR, kvm copies one

page of a blob (32- or 64-bit, depending on the vcpu mode) to guest

memory.



struct kvm_xen_hvm_config {

	__u32 flags;

	__u32 msr;

	__u64 blob_addr_32;

	__u64 blob_addr_64;

	__u8 blob_size_32;

	__u8 blob_size_64;

	__u8 pad2[30];

};



4.27 KVM_GET_CLOCK



Capability: KVM_CAP_ADJUST_CLOCK

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_clock_data (out)

Returns: 0 on success, -1 on error



Gets the current timestamp of kvmclock as seen by the current guest. In

conjunction with KVM_SET_CLOCK, it is used to ensure monotonicity on scenarios

such as migration.



struct kvm_clock_data {

	__u64 clock;  /* kvmclock current value */

	__u32 flags;

	__u32 pad[9];

};



4.28 KVM_SET_CLOCK



Capability: KVM_CAP_ADJUST_CLOCK

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_clock_data (in)

Returns: 0 on success, -1 on error



Sets the current timestamp of kvmclock to the valued specific in its parameter.

In conjunction with KVM_GET_CLOCK, it is used to ensure monotonicity on scenarios

such as migration.



struct kvm_clock_data {

	__u64 clock;  /* kvmclock current value */

	__u32 flags;

	__u32 pad[9];

};



4.29 KVM_GET_VCPU_EVENTS



Capability: KVM_CAP_VCPU_EVENTS

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_vcpu_event (out)

Returns: 0 on success, -1 on error



Gets currently pending exceptions, interrupts, and NMIs as well as related

states of the vcpu.



struct kvm_vcpu_events {

	struct {

		__u8 injected;

		__u8 nr;

		__u8 has_error_code;

		__u8 pad;

		__u32 error_code;

	} exception;

	struct {

		__u8 injected;

		__u8 nr;

		__u8 soft;

		__u8 pad;

	} interrupt;

	struct {

		__u8 injected;

		__u8 pending;

		__u8 masked;

		__u8 pad;

	} nmi;

	__u32 sipi_vector;

	__u32 flags;   /* must be zero */

};



4.30 KVM_SET_VCPU_EVENTS



Capability: KVM_CAP_VCPU_EVENTS

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_vcpu_event (in)

Returns: 0 on success, -1 on error



Set pending exceptions, interrupts, and NMIs as well as related states of the

vcpu.



See KVM_GET_VCPU_EVENTS for the data structure.





5. The kvm_run structure



Application code obtains a pointer to the kvm_run structure by

arch/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,13 @@ config KRETPROBES 
	def_bool y

	depends on KPROBES && HAVE_KRETPROBES



config USER_RETURN_NOTIFIER

	bool

	depends on HAVE_USER_RETURN_NOTIFIER

	help

	  Provide a kernel-internal notification when a cpu is about to

	  switch to user mode.



config HAVE_IOREMAP_PROT

	bool
@@ -132,5 +139,7 @@ config HAVE_HW_BREAKPOINT 
	select ANON_INODES

	select PERF_EVENTS



config HAVE_USER_RETURN_NOTIFIER

	bool



source "kernel/gcov/Kconfig"

arch/ia64/include/asm/kvm.h

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct kvm_ioapic_state { 
#define KVM_IRQCHIP_PIC_MASTER   0

#define KVM_IRQCHIP_PIC_SLAVE    1

#define KVM_IRQCHIP_IOAPIC       2

#define KVM_NR_IRQCHIPS          3



#define KVM_CONTEXT_SIZE	8*1024

arch/ia64/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -475,7 +475,6 @@ struct kvm_arch { 
	struct list_head assigned_dev_head;

	struct iommu_domain *iommu_domain;

	int iommu_flags;

	struct hlist_head irq_ack_notifier_list;



	unsigned long irq_sources_bitmap;

	unsigned long irq_states[KVM_IOAPIC_NUM_PINS];

arch/ia64/kvm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ EXTRA_CFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/



common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o irq_comm.o)

		coalesced_mmio.o irq_comm.o assigned-dev.o)



ifeq ($(CONFIG_IOMMU_API),y)

common-objs += $(addprefix ../../../virt/kvm/, iommu.o)