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

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

Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull KVM updates from Gleb Natapov:
 "The highlights of the release are nested EPT and pv-ticketlocks
  support (hypervisor part, guest part, which is most of the code, goes
  through tip tree).  Apart of that there are many fixes for all arches"

Fix up semantic conflicts as discussed in the pull request thread..

* 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (88 commits)
  ARM: KVM: Add newlines to panic strings
  ARM: KVM: Work around older compiler bug
  ARM: KVM: Simplify tracepoint text
  ARM: KVM: Fix kvm_set_pte assignment
  ARM: KVM: vgic: Bump VGIC_NR_IRQS to 256
  ARM: KVM: Bugfix: vgic_bytemap_get_reg per cpu regs
  ARM: KVM: vgic: fix GICD_ICFGRn access
  ARM: KVM: vgic: simplify vgic_get_target_reg
  KVM: MMU: remove unused parameter
  KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
  KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
  KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
  KVM: x86: update masterclock when kvmclock_offset is calculated (v2)
  KVM: PPC: Book3S: Fix compile error in XICS emulation
  KVM: PPC: Book3S PR: return appropriate error when allocation fails
  arch: powerpc: kvm: add signed type cast for comparation
  KVM: x86: add comments where MMIO does not return to the emulator
  KVM: vmx: count exits to userspace during invalid guest emulation
  KVM: rename __kvm_io_bus_sort_cmp to kvm_io_bus_cmp
  kvm: optimize away THP checks in kvm_is_mmio_pfn()
  ...
parents cf39c8e5 6b9e4fa0

Documentation/virtual/kvm/cpuid.txt

+4 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ KVM_FEATURE_CLOCKSOURCE2 || 3 || kvmclock available at msrs 
KVM_FEATURE_ASYNC_PF               ||     4 || async pf can be enabled by

                                   ||       || writing to msr 0x4b564d02

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

KVM_FEATURE_PV_UNHALT              ||     7 || guest checks this feature bit

                                   ||       || before enabling paravirtualized

                                   ||       || spinlock support.

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

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

                                   ||       || per-cpu warps are expected in

                                   ||       || kvmclock.

Documentation/virtual/kvm/hypercalls.txt

+14 −0
Original line number Diff line number Diff line
@@ -64,3 +64,17 @@ Purpose: To enable communication between the hypervisor and guest there is a 
shared page that contains parts of supervisor visible register state.

The guest can map this shared page to access its supervisor register through

memory using this hypercall.



5. KVM_HC_KICK_CPU

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

Architecture: x86

Status: active

Purpose: Hypercall used to wakeup a vcpu from HLT state

Usage example : A vcpu of a paravirtualized guest that is busywaiting in guest

kernel mode for an event to occur (ex: a spinlock to become available) can

execute HLT instruction once it has busy-waited for more than a threshold

time-interval. Execution of HLT instruction would cause the hypervisor to put

the vcpu to sleep until occurence of an appropriate event. Another vcpu of the

same guest can wakeup the sleeping vcpu by issuing KVM_HC_KICK_CPU hypercall,

specifying APIC ID (a1) of the vcpu to be woken up. An additional argument (a0)

is used in the hypercall for future use.

arch/arm/configs/keystone_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ CONFIG_IP_SCTP=y 
CONFIG_VLAN_8021Q=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CMA=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y

CONFIG_MTD_CMDLINE_PARTS=y

CONFIG_MTD_BLOCK=y

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ CONFIG_MAC80211_RC_PID=y 
CONFIG_MAC80211_RC_DEFAULT_PID=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_CMA=y

CONFIG_DMA_CMA=y

CONFIG_CONNECTOR=y

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y

arch/arm/configs/tegra_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ CONFIG_DEVTMPFS=y 
CONFIG_DEVTMPFS_MOUNT=y

# CONFIG_FIRMWARE_IN_KERNEL is not set

CONFIG_CMA=y

CONFIG_DMA_CMA=y

CONFIG_MTD=y

CONFIG_MTD_M25P80=y

CONFIG_PROC_DEVICETREE=y