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

Commit b9085bcb 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:
 "Fairly small update, but there are some interesting new features.

  Common:
     Optional support for adding a small amount of polling on each HLT
     instruction executed in the guest (or equivalent for other
     architectures).  This can improve latency up to 50% on some
     scenarios (e.g. O_DSYNC writes or TCP_RR netperf tests).  This
     also has to be enabled manually for now, but the plan is to
     auto-tune this in the future.

  ARM/ARM64:
     The highlights are support for GICv3 emulation and dirty page
     tracking

  s390:
     Several optimizations and bugfixes.  Also a first: a feature
     exposed by KVM (UUID and long guest name in /proc/sysinfo) before
     it is available in IBM's hypervisor! :)

  MIPS:
     Bugfixes.

  x86:
     Support for PML (page modification logging, a new feature in
     Broadwell Xeons that speeds up dirty page tracking), nested
     virtualization improvements (nested APICv---a nice optimization),
     usual round of emulation fixes.

     There is also a new option to reduce latency of the TSC deadline
     timer in the guest; this needs to be tuned manually.

     Some commits are common between this pull and Catalin's; I see you
     have already included his tree.

  Powerpc:
     Nothing yet.

     The KVM/PPC changes will come in through the PPC maintainers,
     because I haven't received them yet and I might end up being
     offline for some part of next week"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (130 commits)
  KVM: ia64: drop kvm.h from installed user headers
  KVM: x86: fix build with !CONFIG_SMP
  KVM: x86: emulate: correct page fault error code for NoWrite instructions
  KVM: Disable compat ioctl for s390
  KVM: s390: add cpu model support
  KVM: s390: use facilities and cpu_id per KVM
  KVM: s390/CPACF: Choose crypto control block format
  s390/kernel: Update /proc/sysinfo file with Extended Name and UUID
  KVM: s390: reenable LPP facility
  KVM: s390: floating irqs: fix user triggerable endless loop
  kvm: add halt_poll_ns module parameter
  kvm: remove KVM_MMIO_SIZE
  KVM: MIPS: Don't leak FPU/DSP to guest
  KVM: MIPS: Disable HTW while in guest
  KVM: nVMX: Enable nested posted interrupt processing
  KVM: nVMX: Enable nested virtual interrupt delivery
  KVM: nVMX: Enable nested apic register virtualization
  KVM: nVMX: Make nested control MSRs per-cpu
  KVM: nVMX: Enable nested virtualize x2apic mode
  KVM: nVMX: Prepare for using hardware MSR bitmap
  ...
parents c7d7b986 6557bada

Documentation/virtual/kvm/api.txt

+29 −6
Original line number Diff line number Diff line
@@ -612,11 +612,14 @@ Type: vm ioctl 
Parameters: none

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 ARM/arm64, a GIC is

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

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 ARM/arm64, a GICv2 is created. Any other GIC versions require the usage of

KVM_CREATE_DEVICE, which also supports creating a GICv2.  Using

KVM_CREATE_DEVICE is preferred over KVM_CREATE_IRQCHIP for GICv2.

On s390, a dummy irq routing table is created.



Note that on s390 the KVM_CAP_S390_IRQCHIP vm capability needs to be enabled

before KVM_CREATE_IRQCHIP can be used.
@@ -2312,7 +2315,7 @@ struct kvm_s390_interrupt { 


type can be one of the following:



KVM_S390_SIGP_STOP (vcpu) - sigp restart

KVM_S390_SIGP_STOP (vcpu) - sigp stop; optional flags in parm

KVM_S390_PROGRAM_INT (vcpu) - program check; code in parm

KVM_S390_SIGP_SET_PREFIX (vcpu) - sigp set prefix; prefix address in parm

KVM_S390_RESTART (vcpu) - restart
@@ -3225,3 +3228,23 @@ userspace from doing that. 
If the hcall number specified is not one that has an in-kernel

implementation, the KVM_ENABLE_CAP ioctl will fail with an EINVAL

error.



7.2 KVM_CAP_S390_USER_SIGP



Architectures: s390

Parameters: none



This capability controls which SIGP orders will be handled completely in user

space. With this capability enabled, all fast orders will be handled completely

in the kernel:

- SENSE

- SENSE RUNNING

- EXTERNAL CALL

- EMERGENCY SIGNAL

- CONDITIONAL EMERGENCY SIGNAL



All other orders will be handled completely in user space.



Only privileged operation exceptions will be checked for in the kernel (or even

in the hardware prior to interception). If this capability is not enabled, the

old way of handling SIGP orders is used (partially in kernel and user space).

Documentation/virtual/kvm/devices/arm-vgic.txt

+35 −2
Original line number Diff line number Diff line
@@ -3,22 +3,42 @@ ARM Virtual Generic Interrupt Controller (VGIC) 


Device types supported:

  KVM_DEV_TYPE_ARM_VGIC_V2     ARM Generic Interrupt Controller v2.0

  KVM_DEV_TYPE_ARM_VGIC_V3     ARM Generic Interrupt Controller v3.0



Only one VGIC instance may be instantiated through either this API or the

legacy KVM_CREATE_IRQCHIP api.  The created VGIC will act as the VM interrupt

controller, requiring emulated user-space devices to inject interrupts to the

VGIC instead of directly to CPUs.



Creating a guest GICv3 device requires a host GICv3 as well.

GICv3 implementations with hardware compatibility support allow a guest GICv2

as well.



Groups:

  KVM_DEV_ARM_VGIC_GRP_ADDR

  Attributes:

    KVM_VGIC_V2_ADDR_TYPE_DIST (rw, 64-bit)

      Base address in the guest physical address space of the GIC distributor

      register mappings.

      register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.

      This address needs to be 4K aligned and the region covers 4 KByte.



    KVM_VGIC_V2_ADDR_TYPE_CPU (rw, 64-bit)

      Base address in the guest physical address space of the GIC virtual cpu

      interface register mappings.

      interface register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V2.

      This address needs to be 4K aligned and the region covers 4 KByte.



    KVM_VGIC_V3_ADDR_TYPE_DIST (rw, 64-bit)

      Base address in the guest physical address space of the GICv3 distributor

      register mappings. Only valid for KVM_DEV_TYPE_ARM_VGIC_V3.

      This address needs to be 64K aligned and the region covers 64 KByte.



    KVM_VGIC_V3_ADDR_TYPE_REDIST (rw, 64-bit)

      Base address in the guest physical address space of the GICv3

      redistributor register mappings. There are two 64K pages for each

      VCPU and all of the redistributor pages are contiguous.

      Only valid for KVM_DEV_TYPE_ARM_VGIC_V3.

      This address needs to be 64K aligned.





  KVM_DEV_ARM_VGIC_GRP_DIST_REGS

  Attributes:
@@ -36,6 +56,7 @@ Groups: 
    the register.

  Limitations:

    - Priorities are not implemented, and registers are RAZ/WI

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

    -ENODEV: Getting or setting this register is not yet supported

    -EBUSY: One or more VCPUs are running
@@ -68,6 +89,7 @@ Groups: 


  Limitations:

    - Priorities are not implemented, and registers are RAZ/WI

    - Currently only implemented for KVM_DEV_TYPE_ARM_VGIC_V2.

  Errors:

    -ENODEV: Getting or setting this register is not yet supported

    -EBUSY: One or more VCPUs are running
@@ -81,3 +103,14 @@ Groups: 
    -EINVAL: Value set is out of the expected range

    -EBUSY: Value has already be set, or GIC has already been initialized

            with default values.



  KVM_DEV_ARM_VGIC_GRP_CTRL

  Attributes:

    KVM_DEV_ARM_VGIC_CTRL_INIT

      request the initialization of the VGIC, no additional parameter in

      kvm_device_attr.addr.

  Errors:

    -ENXIO: VGIC not properly configured as required prior to calling

     this attribute

    -ENODEV: no online VCPU

    -ENOMEM: memory shortage when allocating vgic internal data

Documentation/virtual/kvm/devices/vm.txt

+59 −0
Original line number Diff line number Diff line
@@ -24,3 +24,62 @@ Returns: 0 


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

as unused are again used any may not be reclaimed by the host.



1.3. ATTRIBUTE KVM_S390_VM_MEM_LIMIT_SIZE

Parameters: in attr->addr the address for the new limit of guest memory

Returns: -EFAULT if the given address is not accessible

         -EINVAL if the virtual machine is of type UCONTROL

         -E2BIG if the given guest memory is to big for that machine

         -EBUSY if a vcpu is already defined

         -ENOMEM if not enough memory is available for a new shadow guest mapping

          0 otherwise



Allows userspace to query the actual limit and set a new limit for

the maximum guest memory size. The limit will be rounded up to

2048 MB, 4096 GB, 8192 TB respectively, as this limit is governed by

the number of page table levels.



2. GROUP: KVM_S390_VM_CPU_MODEL

Architectures: s390



2.1. ATTRIBUTE: KVM_S390_VM_CPU_MACHINE (r/o)



Allows user space to retrieve machine and kvm specific cpu related information:



struct kvm_s390_vm_cpu_machine {

       __u64 cpuid;           # CPUID of host

       __u32 ibc;             # IBC level range offered by host

       __u8  pad[4];

       __u64 fac_mask[256];   # set of cpu facilities enabled by KVM

       __u64 fac_list[256];   # set of cpu facilities offered by host

}



Parameters: address of buffer to store the machine related cpu data

            of type struct kvm_s390_vm_cpu_machine*

Returns:    -EFAULT if the given address is not accessible from kernel space

	    -ENOMEM if not enough memory is available to process the ioctl

	    0 in case of success



2.2. ATTRIBUTE: KVM_S390_VM_CPU_PROCESSOR (r/w)



Allows user space to retrieve or request to change cpu related information for a vcpu:



struct kvm_s390_vm_cpu_processor {

       __u64 cpuid;           # CPUID currently (to be) used by this vcpu

       __u16 ibc;             # IBC level currently (to be) used by this vcpu

       __u8  pad[6];

       __u64 fac_list[256];   # set of cpu facilities currently (to be) used

                              # by this vcpu

}



KVM does not enforce or limit the cpu model data in any form. Take the information

retrieved by means of KVM_S390_VM_CPU_MACHINE as hint for reasonable configuration

setups. Instruction interceptions triggered by additionally set facilitiy bits that

are not handled by KVM need to by imlemented in the VM driver code.



Parameters: address of buffer to store/set the processor related cpu

	    data of type struct kvm_s390_vm_cpu_processor*.

Returns:    -EBUSY in case 1 or more vcpus are already activated (only in write case)

	    -EFAULT if the given address is not accessible from kernel space

	    -ENOMEM if not enough memory is available to process the ioctl

	    0 in case of success

arch/arm/include/asm/kvm_asm.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ extern char __kvm_hyp_code_end[]; 


extern void __kvm_flush_vm_context(void);

extern void __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa);

extern void __kvm_tlb_flush_vmid(struct kvm *kvm);



extern int __kvm_vcpu_run(struct kvm_vcpu *vcpu);

#endif

arch/arm/include/asm/kvm_emulate.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/kvm_asm.h>

#include <asm/kvm_mmio.h>

#include <asm/kvm_arm.h>

#include <asm/cputype.h>



unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);

unsigned long *vcpu_spsr(struct kvm_vcpu *vcpu);
@@ -177,9 +178,9 @@ static inline u32 kvm_vcpu_hvc_get_imm(struct kvm_vcpu *vcpu) 
	return kvm_vcpu_get_hsr(vcpu) & HSR_HVC_IMM_MASK;

}



static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu)

static inline unsigned long kvm_vcpu_get_mpidr_aff(struct kvm_vcpu *vcpu)

{

	return vcpu->arch.cp15[c0_MPIDR];

	return vcpu->arch.cp15[c0_MPIDR] & MPIDR_HWID_BITMASK;

}



static inline void kvm_vcpu_set_be(struct kvm_vcpu *vcpu)