Commit 66dcff86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM update from Paolo Bonzini:
 "3.19 changes for KVM:

   - spring cleaning: removed support for IA64, and for hardware-
     assisted virtualization on the PPC970

   - ARM, PPC, s390 all had only small fixes

  For x86:
   - small performance improvements (though only on weird guests)
   - usual round of hardware-compliancy fixes from Nadav
   - APICv fixes
   - XSAVES support for hosts and guests.  XSAVES hosts were broken
     because the (non-KVM) XSAVES patches inadvertently changed the KVM
     userspace ABI whenever XSAVES was enabled; hence, this part is
     going to stable.  Guest support is just a matter of exposing the
     feature and CPUID leaves support"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (179 commits)
  KVM: move APIC types to arch/x86/
  KVM: PPC: Book3S: Enable in-kernel XICS emulation by default
  KVM: PPC: Book3S HV: Improve H_CONFER implementation
  KVM: PPC: Book3S HV: Fix endianness of instruction obtained from HEIR register
  KVM: PPC: Book3S HV: Remove code for PPC970 processors
  KVM: PPC: Book3S HV: Tracepoints for KVM HV guest interactions
  KVM: PPC: Book3S HV: Simplify locking around stolen time calculations
  arch: powerpc: kvm: book3s_paired_singles.c: Remove unused function
  arch: powerpc: kvm: book3s_pr.c: Remove unused function
  arch: powerpc: kvm: book3s.c: Remove some unused functions
  arch: powerpc: kvm: book3s_32_mmu.c: Remove unused function
  KVM: PPC: Book3S HV: Check wait conditions before sleeping in kvmppc_vcore_blocked
  KVM: PPC: Book3S HV: ptes are big endian
  KVM: PPC: Book3S HV: Fix inaccuracies in ICP emulation for H_IPI
  KVM: PPC: Book3S HV: Fix KSM memory corruption
  KVM: PPC: Book3S HV: Fix an issue where guest is paused on receiving HMI
  KVM: PPC: Book3S HV: Fix computation of tlbie operand
  KVM: PPC: Book3S HV: Add missing HPTE unlock
  KVM: PPC: BookE: Improve irq inject tracepoint
  arm/arm64: KVM: Require in-kernel vgic for the arch timers
  ...
parents 91ed9e8a 2c4aa55a

Documentation/ia64/kvm.txt

deleted100644 → 0
+0 −83
Original line number Diff line number Diff line 
Currently, kvm module is in EXPERIMENTAL stage on IA64. This means that

interfaces are not stable enough to use. So, please don't run critical

applications in virtual machine.

We will try our best to improve it in future versions!



				Guide: How to boot up guests on kvm/ia64



This guide is to describe how to enable kvm support for IA-64 systems.



1. Get the kvm source from git.kernel.org.

	Userspace source:

		git clone git://git.kernel.org/pub/scm/virt/kvm/kvm-userspace.git

	Kernel Source:

		git clone git://git.kernel.org/pub/scm/linux/kernel/git/xiantao/kvm-ia64.git



2. Compile the source code.

	2.1 Compile userspace code:

		(1)cd ./kvm-userspace

		(2)./configure

		(3)cd kernel

		(4)make sync LINUX= $kernel_dir (kernel_dir is the directory of kernel source.)

		(5)cd ..

		(6)make qemu

		(7)cd qemu; make install



	2.2 Compile kernel source code:

		(1) cd ./$kernel_dir

		(2) Make menuconfig

		(3) Enter into virtualization option, and choose kvm.

		(4) make

		(5) Once (4) done, make modules_install

		(6) Make initrd, and use new kernel to reboot up host machine.

		(7) Once (6) done, cd $kernel_dir/arch/ia64/kvm

		(8) insmod kvm.ko; insmod kvm-intel.ko



Note: For step 2, please make sure that host page size == TARGET_PAGE_SIZE of qemu, otherwise, may fail.



3. Get Guest Firmware named as Flash.fd, and put it under right place:

	(1) If you have the guest firmware (binary) released by Intel Corp for Xen, use it directly.



	(2) If you have no firmware at hand, Please download its source from

		hg clone http://xenbits.xensource.com/ext/efi-vfirmware.hg

	    you can get the firmware's binary in the directory of efi-vfirmware.hg/binaries.



	(3) Rename the firmware you owned to Flash.fd, and copy it to /usr/local/share/qemu



4. Boot up Linux or Windows guests:

	4.1 Create or install a image for guest boot. If you have xen experience, it should be easy.



	4.2 Boot up guests use the following command.

		/usr/local/bin/qemu-system-ia64 -smp xx -m 512 -hda $your_image

		(xx is the number of virtual processors for the guest, now the maximum value is 4)



5. Known possible issue on some platforms with old Firmware.



In the event of strange host crash issues, try to solve it through either of the following ways:



(1): Upgrade your Firmware to the latest one.



(2): Applying the below patch to kernel source.

diff --git a/arch/ia64/kernel/pal.S b/arch/ia64/kernel/pal.S

index 0b53344..f02b0f7 100644

--- a/arch/ia64/kernel/pal.S

+++ b/arch/ia64/kernel/pal.S

@@ -84,7 +84,8 @@ GLOBAL_ENTRY(ia64_pal_call_static)

	mov ar.pfs = loc1

	mov rp = loc0

	;;

-	srlz.d				// serialize restoration of psr.l

+	srlz.i			// serialize restoration of psr.l

+	;;

	br.ret.sptk.many b0

 END(ia64_pal_call_static)



6. Bug report:

	If you found any issues when use kvm/ia64, Please post the bug info to kvm-ia64-devel mailing list.

	https://lists.sourceforge.net/lists/listinfo/kvm-ia64-devel/



Thanks for your interest! Let's work together, and make kvm/ia64 stronger and stronger!





								Xiantao Zhang <xiantao.zhang@intel.com>

											2008.3.10

Documentation/virtual/kvm/api.txt

+71 −31
Original line number Diff line number Diff line
@@ -68,9 +68,12 @@ description: 


  Capability: which KVM extension provides this ioctl.  Can be 'basic',

      which means that is will be provided by any kernel that supports

      API version 12 (see section 4.1), or a KVM_CAP_xyz constant, which

      API version 12 (see section 4.1), a KVM_CAP_xyz constant, which

      means availability needs to be checked with KVM_CHECK_EXTENSION

      (see section 4.4).

      (see section 4.4), or 'none' which means that while not all kernels

      support this ioctl, there's no capability bit to check its

      availability: for kernels that don't support the ioctl,

      the ioctl returns -ENOTTY.



  Architectures: which instruction set architectures provide this ioctl.

      x86 includes both i386 and x86_64.
@@ -604,7 +607,7 @@ struct kvm_fpu { 
4.24 KVM_CREATE_IRQCHIP



Capability: KVM_CAP_IRQCHIP, KVM_CAP_S390_IRQCHIP (s390)

Architectures: x86, ia64, ARM, arm64, s390

Architectures: x86, ARM, arm64, s390

Type: vm ioctl

Parameters: none

Returns: 0 on success, -1 on error
@@ -612,7 +615,7 @@ Returns: 0 on success, -1 on error 
Creates an interrupt controller model in the kernel.  On x86, creates a virtual

ioapic, a virtual PIC (two PICs, nested), and sets up future vcpus to have a

local APIC.  IRQ routing for GSIs 0-15 is set to both PIC and IOAPIC; GSI 16-23

only go to the IOAPIC.  On ia64, a IOSAPIC is created. On ARM/arm64, a GIC is

only go to the IOAPIC.  On ARM/arm64, a GIC is

created. On s390, a dummy irq routing table is created.



Note that on s390 the KVM_CAP_S390_IRQCHIP vm capability needs to be enabled
@@ -622,7 +625,7 @@ before KVM_CREATE_IRQCHIP can be used. 
4.25 KVM_IRQ_LINE



Capability: KVM_CAP_IRQCHIP

Architectures: x86, ia64, arm, arm64

Architectures: x86, arm, arm64

Type: vm ioctl

Parameters: struct kvm_irq_level

Returns: 0 on success, -1 on error
@@ -676,7 +679,7 @@ struct kvm_irq_level { 
4.26 KVM_GET_IRQCHIP



Capability: KVM_CAP_IRQCHIP

Architectures: x86, ia64

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_irqchip (in/out)

Returns: 0 on success, -1 on error
@@ -698,7 +701,7 @@ struct kvm_irqchip { 
4.27 KVM_SET_IRQCHIP



Capability: KVM_CAP_IRQCHIP

Architectures: x86, ia64

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_irqchip (in)

Returns: 0 on success, -1 on error
@@ -991,7 +994,7 @@ for vm-wide capabilities. 
4.38 KVM_GET_MP_STATE



Capability: KVM_CAP_MP_STATE

Architectures: x86, ia64, s390

Architectures: x86, s390

Type: vcpu ioctl

Parameters: struct kvm_mp_state (out)

Returns: 0 on success; -1 on error
@@ -1005,16 +1008,15 @@ uniprocessor guests). 


Possible values are:



 - KVM_MP_STATE_RUNNABLE:        the vcpu is currently running [x86, ia64]

 - KVM_MP_STATE_RUNNABLE:        the vcpu is currently running [x86]

 - KVM_MP_STATE_UNINITIALIZED:   the vcpu is an application processor (AP)

                                 which has not yet received an INIT signal [x86,

                                 ia64]

                                 which has not yet received an INIT signal [x86]

 - KVM_MP_STATE_INIT_RECEIVED:   the vcpu has received an INIT signal, and is

                                 now ready for a SIPI [x86, ia64]

                                 now ready for a SIPI [x86]

 - KVM_MP_STATE_HALTED:          the vcpu has executed a HLT instruction and

                                 is waiting for an interrupt [x86, ia64]

                                 is waiting for an interrupt [x86]

 - KVM_MP_STATE_SIPI_RECEIVED:   the vcpu has just received a SIPI (vector

                                 accessible via KVM_GET_VCPU_EVENTS) [x86, ia64]

                                 accessible via KVM_GET_VCPU_EVENTS) [x86]

 - KVM_MP_STATE_STOPPED:         the vcpu is stopped [s390]

 - KVM_MP_STATE_CHECK_STOP:      the vcpu is in a special error state [s390]

 - KVM_MP_STATE_OPERATING:       the vcpu is operating (running or halted)
@@ -1022,7 +1024,7 @@ Possible values are: 
 - KVM_MP_STATE_LOAD:            the vcpu is in a special load/startup state

                                 [s390]



On x86 and ia64, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an

On x86, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an

in-kernel irqchip, the multiprocessing state must be maintained by userspace on

these architectures.
@@ -1030,7 +1032,7 @@ these architectures. 
4.39 KVM_SET_MP_STATE



Capability: KVM_CAP_MP_STATE

Architectures: x86, ia64, s390

Architectures: x86, s390

Type: vcpu ioctl

Parameters: struct kvm_mp_state (in)

Returns: 0 on success; -1 on error
@@ -1038,7 +1040,7 @@ Returns: 0 on success; -1 on error 
Sets the vcpu's current "multiprocessing state"; see KVM_GET_MP_STATE for

arguments.



On x86 and ia64, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an

On x86, this ioctl is only useful after KVM_CREATE_IRQCHIP. Without an

in-kernel irqchip, the multiprocessing state must be maintained by userspace on

these architectures.
@@ -1065,7 +1067,7 @@ documentation when it pops into existence). 
4.41 KVM_SET_BOOT_CPU_ID



Capability: KVM_CAP_SET_BOOT_CPU_ID

Architectures: x86, ia64

Architectures: x86

Type: vm ioctl

Parameters: unsigned long vcpu_id

Returns: 0 on success, -1 on error
@@ -1257,8 +1259,8 @@ The flags bitmap is defined as: 


4.48 KVM_ASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_ASSIGNMENT

Architectures: x86 ia64

Capability: none

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_assigned_pci_dev (in)

Returns: 0 on success, -1 on error
@@ -1298,25 +1300,36 @@ Only PCI header type 0 devices with PCI BAR resources are supported by 
device assignment.  The user requesting this ioctl must have read/write

access to the PCI sysfs resource files associated with the device.



Errors:

  ENOTTY: kernel does not support this ioctl



  Other error conditions may be defined by individual device types or

  have their standard meanings.





4.49 KVM_DEASSIGN_PCI_DEVICE



Capability: KVM_CAP_DEVICE_DEASSIGNMENT

Architectures: x86 ia64

Capability: none

Architectures: x86

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

See KVM_ASSIGN_PCI_DEVICE for the data structure. Only assigned_dev_id is

used in kvm_assigned_pci_dev to identify the device.



Errors:

  ENOTTY: kernel does not support this ioctl



  Other error conditions may be defined by individual device types or

  have their standard meanings.



4.50 KVM_ASSIGN_DEV_IRQ



Capability: KVM_CAP_ASSIGN_DEV_IRQ

Architectures: x86 ia64

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_assigned_irq (in)

Returns: 0 on success, -1 on error
@@ -1346,11 +1359,17 @@ The following flags are defined: 
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.



Errors:

  ENOTTY: kernel does not support this ioctl



  Other error conditions may be defined by individual device types or

  have their standard meanings.





4.51 KVM_DEASSIGN_DEV_IRQ



Capability: KVM_CAP_ASSIGN_DEV_IRQ

Architectures: x86 ia64

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_assigned_irq (in)

Returns: 0 on success, -1 on error
@@ -1365,7 +1384,7 @@ KVM_ASSIGN_DEV_IRQ. Partial deassignment of host or guest IRQ is allowed. 
4.52 KVM_SET_GSI_ROUTING



Capability: KVM_CAP_IRQ_ROUTING

Architectures: x86 ia64 s390

Architectures: x86 s390

Type: vm ioctl

Parameters: struct kvm_irq_routing (in)

Returns: 0 on success, -1 on error
@@ -1423,8 +1442,8 @@ struct kvm_irq_routing_s390_adapter { 


4.53 KVM_ASSIGN_SET_MSIX_NR



Capability: KVM_CAP_DEVICE_MSIX

Architectures: x86 ia64

Capability: none

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_assigned_msix_nr (in)

Returns: 0 on success, -1 on error
@@ -1445,8 +1464,8 @@ struct kvm_assigned_msix_nr { 


4.54 KVM_ASSIGN_SET_MSIX_ENTRY



Capability: KVM_CAP_DEVICE_MSIX

Architectures: x86 ia64

Capability: none

Architectures: x86

Type: vm ioctl

Parameters: struct kvm_assigned_msix_entry (in)

Returns: 0 on success, -1 on error
@@ -1461,6 +1480,12 @@ struct kvm_assigned_msix_entry { 
	__u16 padding[3];

};



Errors:

  ENOTTY: kernel does not support this ioctl



  Other error conditions may be defined by individual device types or

  have their standard meanings.





4.55 KVM_SET_TSC_KHZ
@@ -2453,9 +2478,15 @@ return ENOEXEC for that vcpu. 
Note that because some registers reflect machine topology, all vcpus

should be created before this ioctl is invoked.



Userspace can call this function multiple times for a given vcpu, including

after the vcpu has been run. This will reset the vcpu to its initial

state. All calls to this function after the initial call must use the same

target and same set of feature flags, otherwise EINVAL will be returned.



Possible features:

	- KVM_ARM_VCPU_POWER_OFF: Starts the CPU in a power-off state.

	  Depends on KVM_CAP_ARM_PSCI.

	  Depends on KVM_CAP_ARM_PSCI.  If not set, the CPU will be powered on

	  and execute guest code when KVM_RUN is called.

	- KVM_ARM_VCPU_EL1_32BIT: Starts the CPU in a 32bit mode.

	  Depends on KVM_CAP_ARM_EL1_32BIT (arm64 only).

	- KVM_ARM_VCPU_PSCI_0_2: Emulate PSCI v0.2 for the CPU.
@@ -2951,6 +2982,15 @@ HVC instruction based PSCI call from the vcpu. The 'type' field describes 
the system-level event type. The 'flags' field describes architecture

specific flags for the system-level event.



Valid values for 'type' are:

  KVM_SYSTEM_EVENT_SHUTDOWN -- the guest has requested a shutdown of the

   VM. Userspace is not obliged to honour this, and if it does honour

   this does not need to destroy the VM synchronously (ie it may call

   KVM_RUN again before shutdown finally occurs).

  KVM_SYSTEM_EVENT_RESET -- the guest has requested a reset of the VM.

   As with SHUTDOWN, userspace can choose to ignore the request, or

   to schedule the reset to occur in the future and may call KVM_RUN again.



		/* Fix the size of the union. */

		char padding[256];

	};

Documentation/virtual/kvm/devices/vm.txt

+5 −5
Original line number Diff line number Diff line
@@ -12,14 +12,14 @@ specific. 
1. GROUP: KVM_S390_VM_MEM_CTRL

Architectures: s390



1.1. ATTRIBUTE: KVM_S390_VM_MEM_CTRL

1.1. ATTRIBUTE: KVM_S390_VM_MEM_ENABLE_CMMA

Parameters: none

Returns: -EBUSY if already a vcpus is defined, otherwise 0

Returns: -EBUSY if a vcpu is already defined, otherwise 0



Enables CMMA for the virtual machine

Enables Collaborative Memory Management Assist (CMMA) for the virtual machine.



1.2. ATTRIBUTE: KVM_S390_VM_CLR_CMMA

Parameteres: none

1.2. ATTRIBUTE: KVM_S390_VM_MEM_CLR_CMMA

Parameters: none

Returns: 0



Clear the CMMA status for all guest pages, so any pages the guest marked

Documentation/virtual/kvm/msr.txt

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ MSR_KVM_ASYNC_PF_EN: 0x4b564d02 
	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

	disabled. Bit 1 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

MAINTAINERS

+0 −9
Original line number Diff line number Diff line
@@ -5495,15 +5495,6 @@ S: Supported 
F:	arch/powerpc/include/asm/kvm*

F:	arch/powerpc/kvm/



KERNEL VIRTUAL MACHINE For Itanium (KVM/IA64)

M:	Xiantao Zhang <xiantao.zhang@intel.com>

L:	kvm-ia64@vger.kernel.org

W:	http://kvm.qumranet.com

S:	Supported

F:	Documentation/ia64/kvm.txt

F:	arch/ia64/include/asm/kvm*

F:	arch/ia64/kvm/



KERNEL VIRTUAL MACHINE for s390 (KVM/s390)

M:	Christian Borntraeger <borntraeger@de.ibm.com>

M:	Cornelia Huck <cornelia.huck@de.ibm.com>

CRA Git | Maintained and supported by SUSTech CRA and CCSE