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

Commit b357bf60 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 updates from Paolo Bonzini:
 "Small update for KVM:

  ARM:
   - lazy context-switching of FPSIMD registers on arm64
   - "split" regions for vGIC redistributor

  s390:
   - cleanups for nested
   - clock handling
   - crypto
   - storage keys
   - control register bits

  x86:
   - many bugfixes
   - implement more Hyper-V super powers
   - implement lapic_timer_advance_ns even when the LAPIC timer is
     emulated using the processor's VMX preemption timer.
   - two security-related bugfixes at the top of the branch"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (79 commits)
  kvm: fix typo in flag name
  kvm: x86: use correct privilege level for sgdt/sidt/fxsave/fxrstor access
  KVM: x86: pass kvm_vcpu to kvm_read_guest_virt and kvm_write_guest_virt_system
  KVM: x86: introduce linear_{read,write}_system
  kvm: nVMX: Enforce cpl=0 for VMX instructions
  kvm: nVMX: Add support for "VMWRITE to any supported field"
  kvm: nVMX: Restrict VMX capability MSR changes
  KVM: VMX: Optimize tscdeadline timer latency
  KVM: docs: nVMX: Remove known limitations as they do not exist now
  KVM: docs: mmu: KVM support exposing SLAT to guests
  kvm: no need to check return value of debugfs_create functions
  kvm: Make VM ioctl do valloc for some archs
  kvm: Change return type to vm_fault_t
  KVM: docs: mmu: Fix link to NPT presentation from KVM Forum 2008
  kvm: x86: Amend the KVM_GET_SUPPORTED_CPUID API documentation
  KVM: x86: hyperv: declare KVM_CAP_HYPERV_TLBFLUSH capability
  KVM: x86: hyperv: simplistic HVCALL_FLUSH_VIRTUAL_ADDRESS_{LIST,SPACE}_EX implementation
  KVM: x86: hyperv: simplistic HVCALL_FLUSH_VIRTUAL_ADDRESS_{LIST,SPACE} implementation
  KVM: introduce kvm_make_vcpus_request_mask() API
  KVM: x86: hyperv: do rep check for each hypercall separately
  ...
parents 0725d4e1 766d3571

Documentation/virtual/kvm/api.txt

+21 −6
Original line number Diff line number Diff line
@@ -1269,12 +1269,18 @@ struct kvm_cpuid_entry2 { 
	__u32 padding[3];

};



This ioctl returns x86 cpuid features which are supported by both the hardware

and kvm.  Userspace can use the information returned by this ioctl to

construct cpuid information (for KVM_SET_CPUID2) that is consistent with

hardware, kernel, and userspace capabilities, and with user requirements (for

example, the user may wish to constrain cpuid to emulate older hardware,

or for feature consistency across a cluster).

This ioctl returns x86 cpuid features which are supported by both the

hardware and kvm in its default configuration.  Userspace can use the

information returned by this ioctl to construct cpuid information (for

KVM_SET_CPUID2) that is consistent with hardware, kernel, and

userspace capabilities, and with user requirements (for example, the

user may wish to constrain cpuid to emulate older hardware, or for

feature consistency across a cluster).



Note that certain capabilities, such as KVM_CAP_X86_DISABLE_EXITS, may

expose cpuid features (e.g. MONITOR) which are not supported by kvm in

its default configuration. If userspace enables such capabilities, it

is responsible for modifying the results of this ioctl appropriately.



Userspace invokes KVM_GET_SUPPORTED_CPUID by passing a kvm_cpuid2 structure

with the 'nent' field indicating the number of entries in the variable-size
@@ -4603,3 +4609,12 @@ Architectures: s390 
This capability indicates that kvm will implement the interfaces to handle

reset, migration and nested KVM for branch prediction blocking. The stfle

facility 82 should not be provided to the guest without this capability.



8.14 KVM_CAP_HYPERV_TLBFLUSH



Architectures: x86



This capability indicates that KVM supports paravirtualized Hyper-V TLB Flush

hypercalls:

HvFlushVirtualAddressSpace, HvFlushVirtualAddressSpaceEx,

HvFlushVirtualAddressList, HvFlushVirtualAddressListEx.

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

+28 −2
Original line number Diff line number Diff line
@@ -27,16 +27,42 @@ Groups: 
      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_VGIC_V3_ADDR_TYPE_REDIST_REGION (rw, 64-bit)

      The attribute data pointed to by kvm_device_attr.addr is a __u64 value:

      bits:     | 63   ....  52  |  51   ....   16 | 15 - 12  |11 - 0

      values:   |     count      |       base      |  flags   | index

      - index encodes the unique redistributor region index

      - flags: reserved for future use, currently 0

      - base field encodes bits [51:16] of the guest physical base address

        of the first redistributor in the region.

      - count encodes the number of redistributors in the region. Must be

        greater than 0.

      There are two 64K pages for each redistributor in the region and

      redistributors are laid out contiguously within the region. Regions

      are filled with redistributors in the index order. The sum of all

      region count fields must be greater than or equal to the number of

      VCPUs. Redistributor regions must be registered in the incremental

      index order, starting from index 0.

      The characteristics of a specific redistributor region can be read

      by presetting the index field in the attr data.

      Only valid for KVM_DEV_TYPE_ARM_VGIC_V3.



  It is invalid to mix calls with KVM_VGIC_V3_ADDR_TYPE_REDIST and

  KVM_VGIC_V3_ADDR_TYPE_REDIST_REGION attributes.



  Errors:

    -E2BIG:  Address outside of addressable IPA range

    -EINVAL: Incorrectly aligned address

    -EINVAL: Incorrectly aligned address, bad redistributor region

             count/index, mixed redistributor region attribute usage

    -EEXIST: Address already configured

    -ENOENT: Attempt to read the characteristics of a non existing

             redistributor region

    -ENXIO:  The group or attribute is unknown/unsupported for this device

             or hardware support is missing.

    -EFAULT: Invalid user pointer for attr->addr.







  KVM_DEV_ARM_VGIC_GRP_DIST_REGS

  KVM_DEV_ARM_VGIC_GRP_REDIST_REGS

  Attributes:

Documentation/virtual/kvm/mmu.txt

+3 −3
Original line number Diff line number Diff line
@@ -49,8 +49,8 @@ The mmu supports first-generation mmu hardware, which allows an atomic switch 
of the current paging mode and cr3 during guest entry, as well as

two-dimensional paging (AMD's NPT and Intel's EPT).  The emulated hardware

it exposes is the traditional 2/3/4 level x86 mmu, with support for global

pages, pae, pse, pse36, cr0.wp, and 1GB pages.  Work is in progress to support

exposing NPT capable hardware on NPT capable hosts.

pages, pae, pse, pse36, cr0.wp, and 1GB pages. Emulated hardware also

able to expose NPT capable hardware on NPT capable hosts.



Translation

===========
@@ -465,5 +465,5 @@ Further reading 
===============



- NPT presentation from KVM Forum 2008

  http://www.linux-kvm.org/wiki/images/c/c8/KvmForum2008%24kdf2008_21.pdf

  http://www.linux-kvm.org/images/c/c8/KvmForum2008%24kdf2008_21.pdf

Documentation/virtual/kvm/nested-vmx.txt

+0 −11
Original line number Diff line number Diff line
@@ -31,17 +31,6 @@ L0, the guest hypervisor, which we call L1, and its nested guest, which we 
call L2.





Known limitations

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



The current code supports running Linux guests under KVM guests.

Only 64-bit guest hypervisors are supported.



Additional patches for running Windows under guest KVM, and Linux under

guest VMware server, and support for nested EPT, are currently running in

the lab, and will be sent as follow-on patchsets.





Running nested VMX

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

arch/arm/include/asm/kvm_host.h

+12 −2
Original line number Diff line number Diff line
@@ -281,6 +281,7 @@ void kvm_mmu_wp_memory_region(struct kvm *kvm, int slot); 


struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr);



static inline bool kvm_arch_check_sve_has_vhe(void) { return true; }

static inline void kvm_arch_hardware_unsetup(void) {}

static inline void kvm_arch_sync_events(struct kvm *kvm) {}

static inline void kvm_arch_vcpu_uninit(struct kvm_vcpu *vcpu) {}
@@ -304,8 +305,13 @@ int kvm_arm_vcpu_arch_get_attr(struct kvm_vcpu *vcpu, 
int kvm_arm_vcpu_arch_has_attr(struct kvm_vcpu *vcpu,

			       struct kvm_device_attr *attr);



/* All host FP/SIMD state is restored on guest exit, so nothing to save: */

static inline void kvm_fpsimd_flush_cpu_state(void) {}

/*

 * VFP/NEON switching is all done by the hyp switch code, so no need to

 * coordinate with host context handling for this state:

 */

static inline void kvm_arch_vcpu_load_fp(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_ctxsync_fp(struct kvm_vcpu *vcpu) {}

static inline void kvm_arch_vcpu_put_fp(struct kvm_vcpu *vcpu) {}



static inline void kvm_arm_vhe_guest_enter(void) {}

static inline void kvm_arm_vhe_guest_exit(void) {}
@@ -340,4 +346,8 @@ static inline int kvm_arm_have_ssbd(void) 
static inline void kvm_vcpu_load_sysregs(struct kvm_vcpu *vcpu) {}

static inline void kvm_vcpu_put_sysregs(struct kvm_vcpu *vcpu) {}



#define __KVM_HAVE_ARCH_VM_ALLOC

struct kvm *kvm_arch_alloc_vm(void);

void kvm_arch_free_vm(struct kvm *kvm);



#endif /* __ARM_KVM_HOST_H__ */