From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Mar 2016 16:55:35 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10dc3747661bea9215417b659449bb7b8ed3df2c;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'for-linus' of git://git./virt/kvm/kvm

Pull KVM updates from Paolo Bonzini:
 "One of the largest releases for KVM...  Hardly any generic
  changes, but lots of architecture-specific updates.

  ARM:
   - VHE support so that we can run the kernel at EL2 on ARMv8.1 systems
   - PMU support for guests
   - 32bit world switch rewritten in C
   - various optimizations to the vgic save/restore code.

  PPC:
   - enabled KVM-VFIO integration ("VFIO device")
   - optimizations to speed up IPIs between vcpus
   - in-kernel handling of IOMMU hypercalls
   - support for dynamic DMA windows (DDW).

  s390:
   - provide the floating point registers via sync regs;
   - separated instruction vs.  data accesses
   - dirty log improvements for huge guests
   - bugfixes and documentation improvements.

  x86:
   - Hyper-V VMBus hypercall userspace exit
   - alternative implementation of lowest-priority interrupts using
     vector hashing (for better VT-d posted interrupt support)
   - fixed guest debugging with nested virtualizations
   - improved interrupt tracking in the in-kernel IOAPIC
   - generic infrastructure for tracking writes to guest
     memory - currently its only use is to speedup the legacy shadow
     paging (pre-EPT) case, but in the future it will be used for
     virtual GPUs as well
   - much cleanup (LAPIC, kvmclock, MMU, PIT), including ubsan fixes"

* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (217 commits)
  KVM: x86: remove eager_fpu field of struct kvm_vcpu_arch
  KVM: x86: disable MPX if host did not enable MPX XSAVE features
  arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit
  arm64: KVM: vgic-v3: Reset LRs at boot time
  arm64: KVM: vgic-v3: Do not save an LR known to be empty
  arm64: KVM: vgic-v3: Save maintenance interrupt state only if required
  arm64: KVM: vgic-v3: Avoid accessing ICH registers
  KVM: arm/arm64: vgic-v2: Make GICD_SGIR quicker to hit
  KVM: arm/arm64: vgic-v2: Only wipe LRs on vcpu exit
  KVM: arm/arm64: vgic-v2: Reset LRs at boot time
  KVM: arm/arm64: vgic-v2: Do not save an LR known to be empty
  KVM: arm/arm64: vgic-v2: Move GICH_ELRSR saving to its own function
  KVM: arm/arm64: vgic-v2: Save maintenance interrupt state only if required
  KVM: arm/arm64: vgic-v2: Avoid accessing GICH registers
  KVM: s390: allocate only one DMA page per VM
  KVM: s390: enable STFLE interpretation only if enabled for the guest
  KVM: s390: wake up when the VCPU cpu timer expires
  KVM: s390: step the VCPU timer while in enabled wait
  KVM: s390: protect VCPU cpu timer with a seqcount
  KVM: s390: step VCPU cpu timer during kvm_run ioctl
  ...
---

10dc3747661bea9215417b659449bb7b8ed3df2c
diff --cc drivers/clocksource/arm_arch_timer.c
index f0dd9d42bc7b,ffe9d1c6b588..5152b3898155
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@@ -271,16 -263,20 +271,22 @@@ static void __arch_timer_setup(unsigne
  		clk->name = "arch_sys_timer";
  		clk->rating = 450;
  		clk->cpumask = cpumask_of(smp_processor_id());
- 		if (arch_timer_use_virtual) {
- 			clk->irq = arch_timer_ppi[VIRT_PPI];
+ 		clk->irq = arch_timer_ppi[arch_timer_uses_ppi];
+ 		switch (arch_timer_uses_ppi) {
+ 		case VIRT_PPI:
  			clk->set_state_shutdown = arch_timer_shutdown_virt;
 +			clk->set_state_oneshot_stopped = arch_timer_shutdown_virt;
  			clk->set_next_event = arch_timer_set_next_event_virt;
- 		} else {
- 			clk->irq = arch_timer_ppi[PHYS_SECURE_PPI];
+ 			break;
+ 		case PHYS_SECURE_PPI:
+ 		case PHYS_NONSECURE_PPI:
+ 		case HYP_PPI:
  			clk->set_state_shutdown = arch_timer_shutdown_phys;
 +			clk->set_state_oneshot_stopped = arch_timer_shutdown_phys;
  			clk->set_next_event = arch_timer_set_next_event_phys;
+ 			break;
+ 		default:
+ 			BUG();
  		}
  	} else {
  		clk->features |= CLOCK_EVT_FEAT_DYNIRQ;
diff --cc virt/kvm/kvm_main.c
index 5af50c3ddd53,1eae05236347..7ba1d10ffed2
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@@ -1942,18 -1946,16 +1945,19 @@@ EXPORT_SYMBOL_GPL(kvm_vcpu_mark_page_di
  
  static void grow_halt_poll_ns(struct kvm_vcpu *vcpu)
  {
- 	int old, val;
+ 	unsigned int old, val, grow;
  
  	old = val = vcpu->halt_poll_ns;
+ 	grow = READ_ONCE(halt_poll_ns_grow);
  	/* 10us base */
- 	if (val == 0 && halt_poll_ns_grow)
+ 	if (val == 0 && grow)
  		val = 10000;
  	else
- 		val *= halt_poll_ns_grow;
+ 		val *= grow;
  
 +	if (val > halt_poll_ns)
 +		val = halt_poll_ns;
 +
  	vcpu->halt_poll_ns = val;
  	trace_kvm_halt_poll_ns_grow(vcpu->vcpu_id, val, old);
  }